nettsiden

Commit Graph

Select branches

Hide Pull Requests

adriangl-patch-coordinates

bump-deps

calendar-disable-events

css

gallery

i-am-imploding

master

nixify

readd-webmail

spaceapi

www2-www-fixes

#1

#10

#11

#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

#8

#9

1.1

1.2

v1.0

v1.1

1bc41124c0 Replace promo video with slideshow Aleksander Knutsen 2022-11-05 19:06:22 +0100
b60d11120e

Bump twig/twig from 2.14.6 to 2.15.3 dependabot[bot] 2022-09-30 20:09:51 +0000
72fb9e9915

Merge pull request #28 from Programvareverkstedet/brettspillkveld Bjornar Orjansen Kaarevik 2022-09-24 22:05:21 +0200
b555f915a0 Added brettspillkveld Bjornar Orjansen Kaarevik 2022-09-24 21:58:28 +0200
4b9957e9c5 Add more services, make two columns Felix Albrigtsen 2022-09-18 01:24:57 +0200
b42214b404 Establish layout for /tjenester Felix Albrigtsen 2022-09-17 17:09:35 +0200
fcef05d439

Merge pull request #27 from Programvareverkstedet/calendar-changes Felix Albrigtsen 2022-09-04 00:56:41 +0200
0f8b15715b Add driftkveld and hackekveld Felix Albrigtsen 2022-09-04 00:53:30 +0200
8a79d9d016

Merge pull request #26 from Programvareverkstedet/video-embed Felix Albrigtsen 2022-08-09 21:17:18 +0200
f507b0cddd Replace old promo-video in /om/ Felix Albrigtsen 2022-08-09 20:53:24 +0200
0b25f8d54a

Merge pull request #25 from Programvareverkstedet/video-embed Felix Albrigtsen 2022-08-08 19:55:44 +0200
4f504e9456 Fix missing closing tag Felix Albrigtsen 2022-08-08 19:53:37 +0200
1f32c03d86

Merge pull request #23 from Programvareverkstedet/video-embed Felix Albrigtsen 2022-08-08 17:24:53 +0200
fc6d5d5f8e Update CSS to preserve video aspect ratio Felix Albrigtsen 2022-08-08 16:36:58 +0200
1cde0a2a93 Replace slideshow with promo video Felix Albrigtsen 2022-08-08 15:16:14 +0200
65c0bad9b0

Merge pull request #21 from Programvareverkstedet/calendarChanges Torstein Nordgård-Hansen 2022-05-26 16:16:52 +0200
9fa6066724 Removed driftskveld temporarily Felix Albrigtsen 2022-05-26 14:08:41 +0200
a506dc44cc

Merge pull request #20 from Programvareverkstedet/origin/calendarChanges Felix Albrigtsen 2022-03-26 20:39:46 +0100
a80114be7a Removed hackekveld temporarily Felix Albrigtsen 2022-03-26 20:34:05 +0100
3385f0e515 Automated fetchpics adriangl/felixalb gallery Felix Albrigtsen 2022-03-22 16:28:14 +0100
ab6edd92e1

Merge pull request #19 from Programvareverkstedet/calendarChanges Felix Albrigtsen 2022-03-15 13:11:13 +0100
6070cf4bd3 Lagt til hackekveld fjerdehver uke Felix Albrigtsen 2022-02-17 15:58:25 +0100
99cd3530b4

Bump twig/twig from 2.14.6 to 2.14.11 dependabot[bot] 2022-02-11 02:32:25 +0000
fdd1d12e9e allow uppercase file extensions Peder Bergebakken Sundt 2022-01-31 12:32:33 +0100
6cae4cb0e2 :) Peder Bergebakken Sundt 2022-01-29 22:54:52 +0100
15c9431c10 remove nerdepitsa Peder Bergebakken Sundt 2022-01-29 19:33:56 +0100
500ea63c77

Merge pull request #17 from Programvareverkstedet/AddDriftkveld Felix Albrigtsen 2022-01-29 19:33:54 +0100
bbe51e702b Added biweekly driftkveld Torstein Nordgård-Hansen 2022-01-29 19:21:16 +0100
ab1bbdd3df Forgot login Felix Albrigtsen 2022-01-25 16:23:14 +0100
893f57c9b7 Forgot to remove line Felix Albrigtsen 2022-01-25 15:08:37 +0100
184d40266b Clarify dependencies Felix Albrigtsen 2022-01-25 15:06:27 +0100
516287ee85 redo css, adaptive scaling Felix Albrigtsen 2022-01-25 15:04:00 +0100
3335f5958e Fix typos and missing gitignore Felix Albrigtsen 2022-01-25 09:19:43 +0100
a7d7ce4da0 Fix typos and missing gitignore Felix Albrigtsen 2022-01-25 09:19:43 +0100
1711ce2e5d Fix typo and missing gitignore Felix Albrigtsen 2022-01-25 09:19:43 +0100
31e104a150

Merge pull request #16 from Programvareverkstedet/gallery Felix Albrigtsen 2022-01-25 09:07:29 +0100
c57276b779 Performance, input sanitization, cleanup Felix Albrigtsen 2022-01-25 09:05:34 +0100
9e7436684c Modal view, navbar, js folder structure Felix Albrigtsen 2022-01-24 16:12:31 +0100
a500b5eecc Started visual gallery, expanded fetch-script Felix Albrigtsen 2022-01-24 00:22:14 +0100
fb5b66f12b Script for fetching pictures from home folders Felix Albrigtsen 2022-01-23 01:34:48 +0100
e7f9799285 PIIIIIITSAAAAA Peder Bergebakken Sundt 2021-11-19 22:44:24 +0100
25212940dd lib/OAuth2-Client: Update submodule Felix Albrigtsen 2021-10-25 23:09:21 +0200
a1d56570b1 Merge branch 'master' of https://github.com/programvareverkstedet/nettsiden Charlie Root 2021-10-17 05:57:17 +0200
15f2154f6a gitignore gallery photos Felix Albrigtsen 2021-10-17 05:54:47 +0200
6b81b0785f Cleaned gitignore, gallery photos Charlie Root 2021-10-17 05:52:43 +0200
6b243ad91b Added matrix serverfile Felix Albrigtsen 2021-10-17 05:43:25 +0200
63e49417a7 UU fix for door sensor Felix Albrigtsen 2021-10-13 22:15:35 +0200
6c891b3f79 New door-graph, Improved slideshow, moved video Felix Albrigtsen 2021-10-13 10:10:17 +0200
a4ce890a36 Testing door sensor graphing Felix Albrigtsen 2021-10-11 16:23:18 +0200
2ba0266fca Fix folder structure pt3 Felix Albrigtsen 2021-10-10 22:11:44 +0200
9f3812b8a5 Fix folder structure pt2 Felix Albrigtsen 2021-10-10 22:03:36 +0200
a9ee7cd6f7 Fix folder structure pt1 Felix Albrigtsen 2021-10-10 22:02:50 +0200
1c4eb5cfe4 Replaced video with slideshow Felix Albrigtsen 2021-10-10 22:01:27 +0200
9162ee70a7 Outdated banner on nerdepitsa Felix Albrigtsen 2021-10-05 18:08:19 +0200
bdbab5be9e Mobile friendly styling Felix Albrigtsen 2021-09-28 00:48:27 +0200
0d87d37c72 Oppdatert romnummer og kontaktinformasjon Felix Albrigtsen 2021-09-27 23:25:04 +0200
728f8a6179 Woa, testing a PR on windows was fun Peder Bergebakken Sundt 2021-09-08 22:38:17 +0200
8fd03c9824

Merge pull request #15 from Programvareverkstedet/doorsensor Peder Bergebakken Sundt 2021-09-08 22:23:37 +0200
fdbbaee175 Handled suggestions -pullrequestreview-749376540 Felix Albrigtsen 2021-09-08 21:29:36 +0200
9dad49738c Uploaded door sensor Felix Albrigtsen 2021-09-04 14:56:48 +0200
0336236fda Removed recurring events for now Eirik Witterso 2021-08-17 18:38:31 +0200
9a5e444041 mobile layout Peder Bergebakken Sundt 2021-08-12 22:44:18 +0200
cfeba9f8da fixed cache issue Eirik Witterso 2021-08-12 22:35:50 +0200
9691433917 Put video on homepage Eirik Witterso 2021-08-12 22:32:58 +0200
db6af95063 Bugfix Peder Bergebakken Sundt 2021-08-12 13:44:47 +0200
cd1792c130 Add instructions for adding yourself as admin Peder Bergebakken Sundt 2021-08-12 13:44:22 +0200
dc99df21c2 add .gitattributes Peder Bergebakken Sundt 2021-08-12 12:50:01 +0200
ecf40334e4 Update dependencies Peder Bergebakken Sundt 2021-08-11 22:29:06 +0200
e1686cd8c5 Add dockerfile for local development Peder Bergebakken Sundt 2021-08-11 22:28:48 +0200
06bfa81d6e Bump phpmailer/phpmailer from 6.1.6 to 6.5.0 dependabot[bot] 2021-06-22 15:39:37 +0000
4e17eeb16a

Bump phpmailer/phpmailer from 6.1.6 to 6.5.0 dependabot[bot] 2021-06-22 15:39:37 +0000
5ade47f6dd

Merge pull request #13 from Programvareverkstedet/driftkveld Torstein Nordgård-Hansen 2021-03-16 21:13:42 +0100
7b237f1656 WIP: Fikset typo i include Torstein Nordgård-Hansen 2021-03-16 21:09:28 +0100
80198d0d98 Make dev.sh download gitmodules Peder Bergebakken Sundt 2021-03-16 20:49:25 +0100
3c24435688 WIP: driftkveld i kalenderen Torstein Nordgård-Hansen 2021-03-16 20:26:38 +0100
b50a4a7ad4 Improve readme even more Peder Bergebakken Sundt 2021-03-16 20:07:56 +0100
523b30d6f5 Fix dev.sh Peder Bergebakken Sundt 2021-03-16 20:00:47 +0100
06e530061d Update readme Peder Bergebakken Sundt 2021-03-16 20:00:02 +0100
c0c324217c

Merge pull request #12 from Programvareverkstedet/dependabot/composer/symfony/http-kernel-4.4.13 Peder Bergebakken Sundt 2020-09-04 23:59:08 +0200
9b3735ea75 edit "veibeskrivelse" link Sondre Haugen Elgaaen 2020-09-03 21:25:43 +0200
9997b8fca9 Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden Sondre Haugen Elgaaen 2020-09-03 20:39:58 +0200
27986e0b1d Update room location and animekveld information Sondre Haugen Elgaaen 2020-09-03 20:37:55 +0200
fe129fe1b0 updated veibeskrivelse to new location at oppredning/gruvedrift Emma Lu Eikemo 2020-09-03 20:01:01 +0200
e08b23be05 updated veibeskrivelse to new location at oppredning/gruvedrift Emma Lu Eikemo 2020-09-03 19:46:34 +0200
089b34833b

Bump symfony/http-kernel from 4.4.7 to 4.4.13 dependabot[bot] 2020-09-03 09:11:16 +0000
995b8d7ae7 Bump phpmailer/phpmailer from 6.1.5 to 6.1.6 dependabot[bot] 2020-05-27 18:01:08 +0000
0352e306f3

Bump phpmailer/phpmailer from 6.1.5 to 6.1.6 dependabot[bot] 2020-05-27 18:01:08 +0000
d248c94a3d

Merge pull request #10 from Programvareverkstedet/dependabot/composer/simplesamlphp/simplesamlphp-1.18.6 Peder Bergebakken Sundt 2020-04-24 18:47:29 +0200
d3584dae44

Bump simplesamlphp/simplesamlphp from 1.18.4 to 1.18.6 dependabot[bot] 2020-04-22 21:01:55 +0000
a45eaab050

Merge pull request #9 from Programvareverkstedet/dependabot/composer/symfony/http-foundation-4.4.7 Peder Bergebakken Sundt 2020-04-03 13:35:19 +0200
c6795dc1bf

Bump symfony/http-foundation from 4.4.3 to 4.4.7 dependabot[bot] 2020-03-31 15:09:04 +0000
d1734e8762 Broen er oppe Peder Bergebakken Sundt 2020-02-28 16:26:57 +0100
69582db88f Bump simplesamlphp/simplesamlphp from 1.15.4 to 1.18.4 dependabot[bot] 2020-01-24 21:28:16 +0000
517cee9668

Bump simplesamlphp/simplesamlphp from 1.15.4 to 1.18.4 dependabot[bot] 2020-01-24 21:28:16 +0000
66eb6f0907 Bump robrichards/xmlseclibs from 3.0.1 to 3.0.4 dependabot[bot] 2019-11-19 08:39:32 +0000
57935913ac

Bump robrichards/xmlseclibs from 3.0.1 to 3.0.4 dependabot[bot] 2019-11-19 08:39:32 +0000
74e86ded33 Add Afterlogic Lite mail Peder Bergebakken Sundt 2019-09-02 17:42:24 +0200
ea7c33cb8e Add git.pvv.ntnu.no to the website Peder Bergebakken Sundt 2019-04-08 19:34:31 +0200
5ad772fc26 Add white rasterized logo Peder Bergebakken Sundt 2019-04-01 19:36:19 +0200
39126936b0 Fix bug with single digit dates Peder Bergebakken Sundt 2018-10-25 00:32:04 +0200