nettsiden

Projects/nettsiden

Fork 0

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

2930f9863f Reapply "Calendar: Remove recurring events for summer break 2024" master Felix Albrigtsen 2024-12-21 23:32:29 +0100
e7b66b4bc6 Revert "Calendar: Remove recurring events for summer break 2024" Felix Albrigtsen 2024-09-01 19:45:59 +0200
ed4ac6d621 Re-add and renew webmail/email info page readd-webmail Felix Albrigtsen 2024-08-21 17:01:59 +0200
903952a972 Revert "navbar: redirect webmail to modern roundcube" Felix Albrigtsen 2024-08-21 16:16:54 +0200
c62f4d4705 www/tjenester: update wiki link for hjemmesider h7x4 2024-08-21 07:25:06 +0200
814e5bc6c7 www/tjenester: move nettsiden from github to gitea h7x4 2024-08-21 07:24:46 +0200
ad5d8afcc6

composer.lock: bump bump-deps h7x4 2024-08-21 07:59:33 +0200
f57edf60c1

flake.nix: remove abundant todos h7x4 2024-08-21 07:37:08 +0200
ac134c485c

www/tjenester: update wiki link for hjemmesider h7x4 2024-08-21 07:25:06 +0200
f2d54636b6

www/tjenester: move nettsiden from github to gitea h7x4 2024-08-21 07:24:46 +0200
a29d3fe803 Err, try again Felix Albrigtsen 2024-08-17 23:59:17 +0200
8bcadd1d2d Merge pull request 'Replace deprecated functions to support php 8.3' (#68) from php83-fixes-fr-fr into master Felix Albrigtsen 2024-08-17 20:45:08 +0200
8a82e2795c Various: Replace deprecated functions to support php 8.3 Felix Albrigtsen 2024-08-17 18:26:37 +0200
4ee8b73044 nix/shell: create slideshow dir Felix Albrigtsen 2024-08-17 01:35:06 +0200
6580cfe546 Merge pull request 'treewide: flip arg order for implode()' (#63) from i-am-imploding into master Oystein Kristoffer Tveit 2024-08-04 00:08:52 +0200
a0f9e71d46

treewide: flip arg order for implode() i-am-imploding h7x4 2024-08-04 00:01:34 +0200
6e4a79ed3d Merge pull request 'Calendar: Remove recurring events for summer break 2024' (#61) from calendar-disable-events into master Oystein Kristoffer Tveit 2024-06-15 00:36:32 +0200
ce99b309f8 Calendar: Remove recurring events for summer break 2024 calendar-disable-events Felix Albrigtsen 2024-06-11 17:07:58 +0200
37445f42b5 Merge pull request 'Oppdater Matrix-server til Matrix Space™' (#50) from info-updates into master Felix Albrigtsen 2024-05-30 21:19:42 +0200
9717c11af5 Fix discord-server og matrix space Eirik Wittersø 2023-12-10 00:43:29 +0100
2cab4df4b1 Merge pull request 'fix: updated spaceapi coords' (#60) from adriangl-patch-spaceapi-coords into master Adrian Gunnar Lauterer 2024-05-19 22:25:52 +0200
18c8426246 fix: updated spaceapi coords Adrian Gunnar Lauterer 2024-05-19 22:09:37 +0200
e37785d98a update cordinates in spaceapi adriangl-patch-coordinates Adrian Gunnar Lauterer 2024-05-19 21:56:00 +0200
4890a0af04

nix/module: fix spaceapi endpoint h7x4 2024-05-18 20:54:05 +0200
9d8b14a08b

nix/module: fix spaceapi endpoint spaceapi h7x4 2024-05-18 20:54:05 +0200
7bf2c31db3 feat: adds spaceapi endpoint (#57) Felix Albrigtsen 2024-05-18 20:05:13 +0200
0542a10d03

spaceapi: Moves calendar into feeds Felix Albrigtsen 2024-05-14 19:53:35 +0200
c6df8e6ae3 nix/module: Specify json mimetype for spaceapi.php Felix Albrigtsen 2024-05-12 10:46:38 +0200
aebc14ccb5 feat: adds spaceapi endpoint Felix Albrigtsen 2024-05-12 03:36:51 +0200
13a6df92ce Merge pull request 'Gitea istedenfor gogs på tjenester-siden' (#56) from gitea-i-tjenester into master Adrian Gunnar Lauterer 2024-05-11 22:55:36 +0200
f87c6820d7

services: move gitea above github and remove trac Adrian Gunnar Lauterer 2024-05-07 15:20:14 +0200
592c6d46c4

services: replaced gogs with gitea Adrian Gunnar Lauterer 2024-05-06 21:02:19 +0200
9d9d99e6ba gallery: sort by timestamp. slideshow: fix transition bug on firefox Felix Albrigtsen 2024-04-14 00:38:14 +0200
e92ac584f2 gallery: sort by timestamp. slideshow: fix transition bug on firefox www2-www-fixes Felix Albrigtsen 2024-04-14 00:38:14 +0200
216e153f89 nix/module: correct some nginx locations directives h7x4 2024-04-11 13:19:59 +0200
d528df5f99 Merge pull request 'Fix links after moving from spikkje to bekka' (#55) from www2-www-fixes into master Felix Albrigtsen 2024-04-11 00:43:32 +0200
faf93cc45a Fix links after moving from spikkje to bekka Felix Albrigtsen 2024-04-11 00:42:12 +0200
1aa4f4fc8a Merge pull request 'Mega PR: Update deps, consolidate config, build with nix, gallery fixes, etc.' (#53) from nixify-ng into master Felix Albrigtsen 2024-04-10 21:45:10 +0200
f1958d9afc galleri: Support .thumbnails Felix Albrigtsen 2024-04-07 01:50:31 +0200
7f269f05d6 gallery: Fix usernames/paths in the gallery Felix Albrigtsen 2024-04-06 23:04:30 +0200
7e158c9fc3 Update dependencies h7x4 2024-04-08 22:11:43 +0200
d79cd3ad37 dist/pvv.sql: fix failing parts h7x4 2024-04-08 22:11:22 +0200
f5a6868301 Build new nix {module,package,flake}. Adapt to new config variables Felix Albrigtsen 2024-03-23 21:03:21 +0100
310246dd20 Update global config variables Felix Albrigtsen 2024-03-12 19:33:09 +0100
151a0d44f6 move gallery/slideshow directories Felix Albrigtsen 2024-03-12 19:31:44 +0100
10c70e89f6 Remove 'ticker', deprecated since 1da1785e46 Felix Albrigtsen 2024-03-12 18:28:13 +0100
318e9cfe6b Update dependencies, fix broken flake Felix Albrigtsen 2024-03-05 14:38:07 +0100
1f60b80b98 move sql_config.php to config.php Felix Albrigtsen 2024-02-15 22:57:03 +0100
517f39eee9 Update SimpleSamlPHP Felix Albrigtsen 2024-02-15 16:18:35 +0100
2f6553225a remove deprecated options and dependencies for dataporten/oauth Felix Albrigtsen 2024-02-15 16:17:31 +0100
1eb84eaec8 Merge pull request 'Fix navbar links' (#54) from fix-navbar-links into master Felix Albrigtsen 2024-04-10 21:38:58 +0200
3e1a21741f navbar: redirect webmail to modern roundcube h7x4 2024-04-08 23:43:32 +0200
da6c1963f8 navbar: redirect wiki to wiki.pvv.ntnu.no h7x4 2024-04-08 23:43:06 +0200
602d286924

Merge 862393995d into 0da5d44ea1 Eirik Wittersø 2023-12-10 00:44:21 +0100
862393995d Fix discord-server og matrix space Eirik Wittersø 2023-12-10 00:43:29 +0100
7712419e9b Initial nix package build. Update composer nixify Felix Albrigtsen 2023-10-01 03:33:56 +0200
0da5d44ea1

Manually cast door state to int (#49) Felix Albrigtsen 2023-09-12 20:31:14 +0200
957d057675 Manually cast door state to int Felix Albrigtsen 2023-09-12 20:23:50 +0200
133c4e269d

Re-enable recurring events for Fall 2023 (#48) Felix Albrigtsen 2023-09-02 21:25:07 +0200
9f4eb63478 Re-enable recurring events for Fall 2023 Felix Albrigtsen 2023-09-02 21:03:20 +0200
850c8da95a

Initial nix flake, automate devshell (#47) Felix Albrigtsen 2023-09-02 19:55:24 +0200
8de99cd809 Initial nix flake, automate devshell Felix Albrigtsen 2023-08-29 10:44:52 +0200
1ae6356aa5

Update contact information (#46) Eirik Wittersø 2023-08-20 01:31:53 +0200
0566ed2aee Minor fixes to contact page Felix Albrigtsen 2023-08-20 01:30:49 +0200
ff64f6064a

Update contact information Eirik Wittersø 2023-08-20 00:36:54 +0200
fa4fa9ad7d

Stop bots scraping mediawiki special pages/diffs/history (#45) Felix Albrigtsen 2023-06-14 23:26:28 +0200
134b203d92 Stop bots scraping mediawiki special pages/diffs/history Felix Albrigtsen 2023-06-14 23:24:16 +0200
d43e5faf3c

Summer break; Disable recurring events (#44) Felix Albrigtsen 2023-06-11 22:19:14 +0200
52700fc1ab Summer break; Disable recurring events Felix Albrigtsen 2023-06-11 22:12:07 +0200
57055c9c6f

Fix previous merge (#43) Felix Albrigtsen 2023-04-27 16:05:14 +0200
3f085c0638

Fix previous merge Felix Albrigtsen 2023-04-27 16:02:54 +0200
5fbc1dbc00

Re-enable brettspillkveld (#42) Felix Albrigtsen 2023-04-27 16:01:40 +0200
a826aa47c0 Re-add brettspillkveld Felix Albrigtsen 2023-04-25 14:55:31 +0200
e364a5fee0

Stop including BrettspillActivity (#41) Felix Albrigtsen 2023-04-17 01:21:15 +0200
29e8b64146 Stop including BrettspillActivity Felix Albrigtsen 2023-04-16 19:00:33 +0200
a4a6553329

Merge pull request #39 from Programvareverkstedet/add-thunderbird-autoconfig h7x4 2023-02-25 23:28:10 +0100
ae81d269fa

Add thunderbird autoconfig to .well-known h7x4 2023-02-25 19:37:22 +0100
160e5ccccb

Merge c6b0910954 into 31d9a955df dependabot[bot] 2023-02-02 10:35:19 +0000
c6b0910954

Bump symfony/http-kernel from 4.4.29 to 4.4.50 dependabot[bot] 2023-02-02 10:35:17 +0000
893f08c0ef

Merge b60d11120e into 31d9a955df dependabot[bot] 2023-01-19 12:58:14 +0000
31d9a955df

Merge pull request #37 from Programvareverkstedet/patch Felix Albrigtsen 2023-01-19 13:58:10 +0100
6bd3ce7731 Add notice on empty image gallery Felix Albrigtsen 2023-01-19 13:46:39 +0100
9f45271b18 Update deprecated template syntax Felix Albrigtsen 2023-01-19 11:28:29 +0100
567962c947 Fix admins addGroup and removeGroup, missing parameter Felix Albrigtsen 2023-01-19 11:27:48 +0100
7defd8b388 Update minor dependency changes Felix Albrigtsen 2023-01-19 11:26:56 +0100
a7f2c4f2d3

Merge pull request #36 from Programvareverkstedet/linkdash Felix Albrigtsen 2023-01-16 16:27:28 +0100
847fe67534

Merge pull request #35 from Programvareverkstedet/2023events Felix Albrigtsen 2023-01-16 16:26:01 +0100
79854aee6f Improved linkdash-minecraft-map Felix Albrigtsen 2023-01-16 16:22:53 +0100
699876405c Inverted week offset on recurring events Felix Albrigtsen 2023-01-16 16:20:54 +0100
a734fe6bd3 Add brettspill, drift and hack activities Felix Albrigtsen 2023-01-16 14:18:30 +0100
c33736a501 Fix minecraft map link Felix Albrigtsen 2023-01-16 14:09:09 +0100
3a39ca0f73

Merge pull request #34 from Programvareverkstedet/linkdash Bjørnar Ørjansen Kaarevik 2022-11-29 17:56:29 +0100
d8f8aafdd9 Add wrapper to services page, fix css and favicon Felix Albrigtsen 2022-11-29 17:52:39 +0100
79ffb1fff5

Merge pull request #33 from Programvareverkstedet/linkdash Bjørnar Ørjansen Kaarevik 2022-11-29 17:35:56 +0100
29c4c67645 Fix top margin on services Felix Albrigtsen 2022-11-29 17:31:22 +0100
98da6ada23

Merge pull request #32 from Programvareverkstedet/linkdash Bjørnar Ørjansen Kaarevik 2022-11-29 17:26:10 +0100
1c1656c3bc Added photo gallery to services list Felix Albrigtsen 2022-11-29 17:14:03 +0100
c489f303ea Add services, fix column styling Felix Albrigtsen 2022-11-29 17:07:36 +0100
fc0286c277

Merge pull request #31 from Programvareverkstedet/calenderFix amalieem 2022-11-27 10:14:21 +0100
f4407fde4a Disabled brettspillkveld and hackekveld Amalie Mansåker 2022-11-19 21:23:41 +0100