Commit Graph

104 Commits

Author SHA1 Message Date
Peder Bergebakken Sundt efb0e3d711 Add submodule and Windows info to README 2017-10-11 01:51:51 +02:00
halworsen d8f5dd4ad9 Split activities into pages in the admin interface
and other trivial fixes
2017-10-08 03:33:42 +02:00
halworsen 56f71eb9ab Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden 2017-10-07 23:13:39 +02:00
halworsen 89c2a59fd6 Beginning of the admin interface 2017-10-07 23:12:10 +02:00
Peder Bergebakken Sundt b30889dcca Fix kalenderverkstedet title 2017-10-07 23:10:10 +02:00
halworsen 7cd78ac3bb Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden 2017-10-07 23:10:01 +02:00
Peder Bergebakken Sundt f7506d57da Fix some norsk 2017-10-07 23:09:04 +02:00
Peder Bergebakken Sundt aef3488c80 Make days clickable in kalender 2017-10-07 23:06:09 +02:00
halworsen e6ad3fb47a Remove ticker 2017-10-07 23:05:40 +02:00
Jørn Åne 34e09667e5 Let "aktiviteter" also show events from database 2017-10-07 22:21:30 +02:00
Jørn Åne d4794ce85f Add ID to events table 2017-10-07 22:19:43 +02:00
Peder Bergebakken Sundt 24678ffb11 Add kalender to navbar 2017-10-07 21:57:15 +02:00
Peder Bergebakken Sundt 93aaffd500 Add translation to kalender and append . to dates 2017-10-07 21:53:40 +02:00
Peder Bergebakken Sundt a2703988f0 Add calendar 2017-10-07 21:26:49 +02:00
Peder Bergebakken Sundt d89625558b Remove bad joke 2017-10-07 21:26:49 +02:00
johnche a3c68c3c79 add feide authentication 2017-10-07 21:25:44 +02:00
johnche 3d2f07418d Merge branch 'master' of github.com:Programvareverkstedet/nettsiden 2017-10-07 19:42:18 +02:00
johnche c885e71ba0 New registration page, move some info from the old page to a separate 'om' page 2017-10-07 19:22:22 +02:00
Jørn Åne acad759bb0 Move sosiale pictures back, fix regression 2017-10-07 17:34:27 +02:00
Jørn Åne faff3a2a8d Better alignment of date/time for today 2017-10-07 16:58:27 +02:00
Jørn Åne 0a2c08eb9b Move date to the right 2017-10-07 16:42:11 +02:00
Jørn Åne cd150d73c5 Cleanup code 2017-10-07 16:41:50 +02:00
Peder Bergebakken Sundt 8c8af74783 Move sosiale to aktiviteter 2017-10-07 15:16:22 +02:00
Peder Bergebakken Sundt 980e5ba9ac Update title in prosjekter after its previous move 2017-10-07 15:05:11 +02:00
Peder Bergebakken Sundt 434d25cac5 Rename aktiviterer to prosjekter and hide prosjekter 2017-10-07 14:58:08 +02:00
Jørn Åne 615b66da39 Use UTF8 2017-10-07 14:19:43 +02:00
Fredrik Strupe 8feb9cc1ad Remove duplicate file 2016-09-30 15:18:45 +02:00
Fredrik Strupe d0577fe62c s/kommunikasjon/kontakt/g 2016-09-29 18:27:28 +02:00
Fredrik Strupe 2fccac4f2d Add comm tab to some more pages 2016-09-02 14:54:14 +02:00
Fredrik Strupe c0a892789e Use common date formatter in sosiale page 2016-09-02 14:49:48 +02:00
Fredrik Strupe 980d4018c2 Communication tab/page 2016-09-02 14:41:32 +02:00
Fredrik Strupe bc573a53c7 Image at brettspill page 2016-08-31 18:34:45 +02:00
Peder Bergebakken Sundt 4f1d3ee6b3 Updated navbar, added aktiviteter, deleted soek, made the ticker into an include 2016-08-30 18:13:31 +02:00
Jørn Åne cbe73d9505 Add description field in sqlite. 2016-08-29 20:14:34 +02:00
Kristoffer Venæs Monsen bfee784bc4 Added documentation from outdated repo. Covers alot of the wishes for the new website for the uninformed. 2016-08-29 19:46:52 +02:00
Jørn Åne 871ffc9182 Move navigation down in code, add ul element. 2016-08-29 19:37:49 +02:00
Jørn Åne 6e8c8b22c2 Add instructions about PHP installation. 2016-08-29 18:50:24 +02:00
Jørn Åne c7b297eeb9 Make headers appear black, even when they are links. 2016-08-29 18:30:07 +02:00
Jørn Åne 9ffaf26f1d Remove "Remind Me" buttons. 2016-08-29 18:29:33 +02:00
Jørn Åne db2ade9da0 Read kurs from database. 2016-08-29 18:27:31 +02:00
Jørn Åne 60cadc9284 Make description in HTML. 2016-08-29 18:24:21 +02:00
Jørn Åne 772dd62a55 Make development script only listen on localhost. 2016-08-29 18:23:05 +02:00
Jørn Åne 399d54b1c3 Make today activities green. 2016-08-27 00:14:12 +02:00
Jørn Åne b8f71db554 Add image for brettspillkveld 2016-08-27 00:13:58 +02:00
Jørn Åne 305b4e7064 Remove empty events from Agenda::getNextOfEach 2016-08-27 00:13:28 +02:00
Jørn Åne d9ff461877 Remove redundant PHP close tag. 2016-08-26 23:56:06 +02:00
Jørn Åne d19bd1d08b Update links so that they can point to PHP files. 2016-08-26 23:54:58 +02:00
Fredrik Strupe 1543363b10 Use tabs to make Yorn happy 2016-08-26 23:46:41 +02:00
Fredrik Strupe d56dfcab46 Fetch event description from event class 2016-08-26 23:31:44 +02:00
Jørn Åne 9d7a0d686f Improve limit calculation for Social page. 2016-08-26 23:30:32 +02:00