Commit Graph

Select branches

Hide Pull Requests

local-dev-idp

main

move-to-postgres

readd-webmail

revamp-projects

www2-www-fixes

#1

#10

#11

#117

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#23

#25

#26

#27

#28

#29

#29

#30

#31

#32

#33

#34

#35

#36

#37

#38

#38

#39

#41

#42

#43

#44

#45

#46

#47

#48

#49

#50

#50

#53

#54

#55

#56

#57

#60

#61

#63

#68

#7

#71

#73

#75

#78

#79

#8

#83

#84

#85

#86

#87

#88

#89

#9

#90

#92

1.1

1.2

v1.0

v1.1

Mono Color

• b42214b404 Establish layout for /tjenester felixalb 2022-09-17 17:09:35 +02:00
• fcef05d439 Merge pull request #27 from Programvareverkstedet/calendar-changes felixalb 2022-09-04 00:56:41 +02:00
• 0f8b15715b Add driftkveld and hackekveld felixalb 2022-09-04 00:53:30 +02:00
• 8a79d9d016 Merge pull request #26 from Programvareverkstedet/video-embed felixalb 2022-08-09 21:17:18 +02:00
• f507b0cddd Replace old promo-video in /om/ felixalb 2022-08-09 20:53:24 +02:00
• 0b25f8d54a Merge pull request #25 from Programvareverkstedet/video-embed felixalb 2022-08-08 19:55:44 +02:00
• 4f504e9456 Fix missing closing tag felixalb 2022-08-08 19:53:37 +02:00
• 1f32c03d86 Merge pull request #23 from Programvareverkstedet/video-embed felixalb 2022-08-08 17:24:53 +02:00
• fc6d5d5f8e Update CSS to preserve video aspect ratio felixalb 2022-08-08 16:36:58 +02:00
• 1cde0a2a93 Replace slideshow with promo video felixalb 2022-08-08 15:16:14 +02:00
• 65c0bad9b0 Merge pull request #21 from Programvareverkstedet/calendarChanges torsteno 2022-05-26 16:16:52 +02:00
• 9fa6066724 Removed driftskveld temporarily felixalb 2022-05-26 14:08:41 +02:00
• a506dc44cc Merge pull request #20 from Programvareverkstedet/origin/calendarChanges felixalb 2022-03-26 20:39:46 +01:00
• a80114be7a Removed hackekveld temporarily felixalb 2022-03-26 20:34:05 +01:00
• ab6edd92e1 Merge pull request #19 from Programvareverkstedet/calendarChanges felixalb 2022-03-15 13:11:13 +01:00
• 6070cf4bd3 Lagt til hackekveld fjerdehver uke felixalb 2022-02-17 15:58:25 +01:00
• fdd1d12e9e allow uppercase file extensions pederbs 2022-01-31 12:32:33 +01:00
• 6cae4cb0e2 :) pederbs 2022-01-29 22:54:52 +01:00
• 15c9431c10 remove nerdepitsa pederbs 2022-01-29 19:33:56 +01:00
• 500ea63c77 Merge pull request #17 from Programvareverkstedet/AddDriftkveld felixalb 2022-01-29 19:33:54 +01:00
• bbe51e702b Added biweekly driftkveld torsteno 2022-01-29 19:21:16 +01:00
• ab1bbdd3df Forgot login felixalb 2022-01-25 16:23:14 +01:00
• 893f57c9b7 Forgot to remove line felixalb 2022-01-25 15:08:37 +01:00
• 184d40266b Clarify dependencies felixalb 2022-01-25 15:06:27 +01:00
• 516287ee85 redo css, adaptive scaling felixalb 2022-01-25 15:04:00 +01:00
• 3335f5958e Fix typos and missing gitignore felixalb 2022-01-25 09:19:43 +01:00
• a7d7ce4da0 Fix typos and missing gitignore felixalb 2022-01-25 09:19:43 +01:00
• 1711ce2e5d Fix typo and missing gitignore felixalb 2022-01-25 09:19:43 +01:00
• 31e104a150 Merge pull request #16 from Programvareverkstedet/gallery felixalb 2022-01-25 09:07:29 +01:00
• c57276b779 Performance, input sanitization, cleanup felixalb 2022-01-25 09:05:34 +01:00
• 9e7436684c Modal view, navbar, js folder structure felixalb 2022-01-24 16:12:31 +01:00
• a500b5eecc Started visual gallery, expanded fetch-script felixalb 2022-01-24 00:22:14 +01:00
• fb5b66f12b Script for fetching pictures from home folders felixalb 2022-01-23 01:34:48 +01:00
• e7f9799285 PIIIIIITSAAAAA pederbs 2021-11-19 22:44:24 +01:00
• 25212940dd lib/OAuth2-Client: Update submodule felixalb 2021-10-25 23:09:21 +02:00
• a1d56570b1 Merge branch 'master' of https://github.com/programvareverkstedet/nettsiden Charlie Root 2021-10-17 05:57:17 +02:00
• 15f2154f6a gitignore gallery photos felixalb 2021-10-17 05:54:47 +02:00
• 6b81b0785f Cleaned gitignore, gallery photos Charlie Root 2021-10-17 05:52:43 +02:00
• 6b243ad91b Added matrix serverfile felixalb 2021-10-17 05:43:25 +02:00
• 63e49417a7 UU fix for door sensor felixalb 2021-10-13 22:15:35 +02:00
• 6c891b3f79 New door-graph, Improved slideshow, moved video felixalb 2021-10-13 10:10:17 +02:00
• a4ce890a36 Testing door sensor graphing felixalb 2021-10-11 16:23:18 +02:00
• 2ba0266fca Fix folder structure pt3 felixalb 2021-10-10 22:11:44 +02:00
• 9f3812b8a5 Fix folder structure pt2 felixalb 2021-10-10 22:03:36 +02:00
• a9ee7cd6f7 Fix folder structure pt1 felixalb 2021-10-10 22:02:50 +02:00
• 1c4eb5cfe4 Replaced video with slideshow felixalb 2021-10-10 22:01:27 +02:00
• 9162ee70a7 Outdated banner on nerdepitsa felixalb 2021-10-05 18:08:19 +02:00
• bdbab5be9e Mobile friendly styling felixalb 2021-09-28 00:48:27 +02:00
• 0d87d37c72 Oppdatert romnummer og kontaktinformasjon felixalb 2021-09-27 23:25:04 +02:00
• 728f8a6179 Woa, testing a PR on windows was fun pederbs 2021-09-08 22:38:17 +02:00
• 8fd03c9824 Merge pull request #15 from Programvareverkstedet/doorsensor pederbs 2021-09-08 22:23:37 +02:00
• fdbbaee175 Handled suggestions -pullrequestreview-749376540 felixalb 2021-09-08 21:29:36 +02:00
• 9dad49738c Uploaded door sensor felixalb 2021-09-04 14:56:48 +02:00
• 0336236fda Removed recurring events for now eirikwit 2021-08-17 18:38:31 +02:00
• 9a5e444041 mobile layout pederbs 2021-08-12 22:44:18 +02:00
• cfeba9f8da fixed cache issue eirikwit 2021-08-12 22:35:50 +02:00
• 9691433917 Put video on homepage eirikwit 2021-08-12 22:32:58 +02:00
• db6af95063 Bugfix pederbs 2021-08-12 13:44:47 +02:00
• cd1792c130 Add instructions for adding yourself as admin pederbs 2021-08-12 13:44:22 +02:00
• dc99df21c2 add .gitattributes pederbs 2021-08-12 12:50:01 +02:00
• ecf40334e4 Update dependencies pederbs 2021-08-11 22:29:06 +02:00
• e1686cd8c5 Add dockerfile for local development pederbs 2021-08-11 22:28:48 +02:00
• 06bfa81d6e Bump phpmailer/phpmailer from 6.1.6 to 6.5.0 dependabot[bot] 2021-06-22 15:39:37 +00:00
• 5ade47f6dd Merge pull request #13 from Programvareverkstedet/driftkveld torsteno 2021-03-16 21:13:42 +01:00
• 7b237f1656 WIP: Fikset typo i include torsteno 2021-03-16 21:09:28 +01:00
• 80198d0d98 Make dev.sh download gitmodules pederbs 2021-03-16 20:49:25 +01:00
• 3c24435688 WIP: driftkveld i kalenderen torsteno 2021-03-16 20:26:38 +01:00
• b50a4a7ad4 Improve readme even more pederbs 2021-03-16 20:07:56 +01:00
• 523b30d6f5 Fix dev.sh pederbs 2021-03-16 20:00:47 +01:00
• 06e530061d Update readme pederbs 2021-03-16 20:00:02 +01:00
• c0c324217c Merge pull request #12 from Programvareverkstedet/dependabot/composer/symfony/http-kernel-4.4.13 pederbs 2020-09-04 23:59:08 +02:00
• 9b3735ea75 edit "veibeskrivelse" link sondrhel 2020-09-03 21:25:43 +02:00
• 9997b8fca9 Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden sondrhel 2020-09-03 20:39:58 +02:00
• 27986e0b1d Update room location and animekveld information sondrhel 2020-09-03 20:37:55 +02:00
• fe129fe1b0 updated veibeskrivelse to new location at oppredning/gruvedrift emmalei 2020-09-03 20:01:01 +02:00
• e08b23be05 updated veibeskrivelse to new location at oppredning/gruvedrift emmalei 2020-09-03 19:46:34 +02:00
• 089b34833b Bump symfony/http-kernel from 4.4.7 to 4.4.13 dependabot[bot] 2020-09-03 09:11:16 +00:00
• 995b8d7ae7 Bump phpmailer/phpmailer from 6.1.5 to 6.1.6 dependabot[bot] 2020-05-27 18:01:08 +00:00
• d248c94a3d Merge pull request #10 from Programvareverkstedet/dependabot/composer/simplesamlphp/simplesamlphp-1.18.6 pederbs 2020-04-24 18:47:29 +02:00
• d3584dae44 Bump simplesamlphp/simplesamlphp from 1.18.4 to 1.18.6 dependabot[bot] 2020-04-22 21:01:55 +00:00
• a45eaab050 Merge pull request #9 from Programvareverkstedet/dependabot/composer/symfony/http-foundation-4.4.7 pederbs 2020-04-03 13:35:19 +02:00
• c6795dc1bf Bump symfony/http-foundation from 4.4.3 to 4.4.7 dependabot[bot] 2020-03-31 15:09:04 +00:00
• d1734e8762 Broen er oppe pederbs 2020-02-28 16:26:57 +01:00
• 69582db88f Bump simplesamlphp/simplesamlphp from 1.15.4 to 1.18.4 dependabot[bot] 2020-01-24 21:28:16 +00:00
• 66eb6f0907 Bump robrichards/xmlseclibs from 3.0.1 to 3.0.4 dependabot[bot] 2019-11-19 08:39:32 +00:00
• 74e86ded33 Add Afterlogic Lite mail pederbs 2019-09-02 17:42:24 +02:00
• ea7c33cb8e Add git.pvv.ntnu.no to the website pederbs 2019-04-08 19:34:31 +02:00
• 5ad772fc26 Add white rasterized logo pederbs 2019-04-01 19:36:19 +02:00
• 39126936b0 Fix bug with single digit dates pederbs 2018-10-25 00:32:04 +02:00
• c549890b7e Add info on Aktive, and some links pointing to the wiki pederbs 2018-09-21 19:39:54 +02:00
• 09d5ebc249 Update kontaktinformasjon to point towards the wiki pederbs 2018-09-09 17:46:09 +02:00
• ead8f3a19c Add payment info to /paamelding/ pederbs 2018-09-06 13:31:54 +02:00
• c3ada63c69 Whoops pederbs 2018-08-29 19:18:22 +02:00
• eb39821f20 Fix some cases of overflowing hendelse text breaking styles here and there pederbs 2018-08-29 19:12:21 +02:00
• 59463ebdfb Fix bug where days with string length 1 would break mysql pederbs 2018-08-29 19:00:09 +02:00
• d1612e2804 Fix utf8 and JSON issues resulting from MYSQL being weird pederbs 2018-08-24 13:53:18 +02:00
• 07c1a90845 Whoops again pederbs 2018-08-24 13:24:42 +02:00
• d0613a8734 Whoops pederbs 2018-08-24 12:41:28 +02:00
• dd2ca22bba Add door sensor REST api pederbs 2018-08-24 12:28:06 +02:00
• 69ed1df0d1 Change casing on frontpage activities pederbs 2018-08-23 19:09:58 +02:00