Commit Graph

329 Commits

Author SHA1 Message Date
Markus Wang Halvorsen c7d4c6c524 Fix admin interface hrefs 2017-10-22 13:46:19 +02:00
Peder Bergebakken Sundt 2be094c905 Fix link to /kontakt/ in navbar 2017-10-22 13:34:53 +02:00
Markus Wang Halvorsen 1abb7813a8 Add event editing to admin interface 2017-10-12 00:38:28 +02:00
Markus Wang Halvorsen d8f5dd4ad9 Split activities into pages in the admin interface
and other trivial fixes
2017-10-08 03:33:42 +02:00
Markus Wang Halvorsen 56f71eb9ab Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden 2017-10-07 23:13:39 +02:00
Markus Wang Halvorsen 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
Markus Wang Halvorsen 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
Markus Wang Halvorsen e6ad3fb47a Remove ticker 2017-10-07 23:05:40 +02:00
Yorin Anne De Jong 34e09667e5 Let "aktiviteter" also show events from database 2017-10-07 22:21:30 +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
John Chen a3c68c3c79 add feide authentication 2017-10-07 21:25:44 +02:00
John Chen 3d2f07418d Merge branch 'master' of github.com:Programvareverkstedet/nettsiden 2017-10-07 19:42:18 +02:00
John Chen c885e71ba0 New registration page, move some info from the old page to a separate 'om' page 2017-10-07 19:22:22 +02:00
Yorin Anne De Jong acad759bb0 Move sosiale pictures back, fix regression 2017-10-07 17:34:27 +02:00
Yorin Anne De Jong faff3a2a8d Better alignment of date/time for today 2017-10-07 16:58:27 +02:00
Yorin Anne De Jong 0a2c08eb9b Move date to the right 2017-10-07 16:42:11 +02:00
Yorin Anne De Jong 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
Fredrik Lindberg Strupe 8feb9cc1ad Remove duplicate file 2016-09-30 15:18:45 +02:00
Fredrik Lindberg Strupe d0577fe62c s/kommunikasjon/kontakt/g 2016-09-29 18:27:28 +02:00
Fredrik Lindberg Strupe 2fccac4f2d Add comm tab to some more pages 2016-09-02 14:54:14 +02:00
Fredrik Lindberg Strupe c0a892789e Use common date formatter in sosiale page 2016-09-02 14:49:48 +02:00
Fredrik Lindberg Strupe 980d4018c2 Communication tab/page 2016-09-02 14:41:32 +02:00
Fredrik Lindberg 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
Yorin Anne De Jong 871ffc9182 Move navigation down in code, add ul element. 2016-08-29 19:37:49 +02:00
Yorin Anne De Jong c7b297eeb9 Make headers appear black, even when they are links. 2016-08-29 18:30:07 +02:00
Yorin Anne De Jong 9ffaf26f1d Remove "Remind Me" buttons. 2016-08-29 18:29:33 +02:00
Yorin Anne De Jong db2ade9da0 Read kurs from database. 2016-08-29 18:27:31 +02:00
Yorin Anne De Jong 60cadc9284 Make description in HTML. 2016-08-29 18:24:21 +02:00
Yorin Anne De Jong 399d54b1c3 Make today activities green. 2016-08-27 00:14:12 +02:00
Yorin Anne De Jong b8f71db554 Add image for brettspillkveld 2016-08-27 00:13:58 +02:00
Yorin Anne De Jong d9ff461877 Remove redundant PHP close tag. 2016-08-26 23:56:06 +02:00
Yorin Anne De Jong d19bd1d08b Update links so that they can point to PHP files. 2016-08-26 23:54:58 +02:00
Fredrik Lindberg Strupe 1543363b10 Use tabs to make Yorn happy 2016-08-26 23:46:41 +02:00
Fredrik Lindberg Strupe d56dfcab46 Fetch event description from event class 2016-08-26 23:31:44 +02:00
Yorin Anne De Jong 9d7a0d686f Improve limit calculation for Social page. 2016-08-26 23:30:32 +02:00
Yorin Anne De Jong ee000d2d67 Perfectionism. 2016-08-26 23:19:27 +02:00
Yorin Anne De Jong b1266aa448 Set social activity text through class functions. 2016-08-26 23:18:14 +02:00
Fredrik Lindberg Strupe f39389ead4 Global date formatting function 2016-08-26 23:14:46 +02:00
Fredrik Lindberg Strupe a4787387dd Show date status for nerdepitsa & animekveld 2016-08-26 22:58:20 +02:00
Fredrik Lindberg Strupe a92f0af57a Add brettspill page 2016-08-26 22:52:59 +02:00
Fredrik Lindberg Strupe 3e4c2d0ab1 Dynamic dates for animekveld page 2016-08-26 22:35:39 +02:00
Fredrik Lindberg Strupe f83384d15f Dynamic date on nerdepitsa event page 2016-08-26 22:23:58 +02:00
Peder Bergebakken Sundt d7885ddfe6 Updated ticker to support multible events a day 2016-08-26 18:39:36 +02:00
Peder Bergebakken Sundt e0fcf5f265 Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden 2016-08-26 17:49:53 +02:00
Peder Bergebakken Sundt fab5827ebb Fixed title in soek/ and added dev.bat 2016-08-26 17:49:29 +02:00
Yorin Anne De Jong 963973bc6b Show upcoming activity in the header on the main page. 2016-08-26 17:29:09 +02:00
Yorin Anne De Jong 328a2a31e6 Add URL property to events. 2016-08-26 17:22:11 +02:00
Yorin Anne De Jong 8519c00a57 Show more relevant times in upcoming activities. 2016-08-26 17:05:19 +02:00
Yorin Anne De Jong 6c3ac94804 Remove macOS cruft. 2016-08-20 00:00:49 +02:00
Liang Zhu b14c37c22b added paamelding page 2016-08-19 23:47:48 +02:00
Liang Zhu 29f0afa31f added brettspillkvled event 2016-08-19 23:46:30 +02:00
Yorin Anne De Jong 10fdc27b2b New style for dates in "upcoming events". 2016-08-19 22:03:15 +02:00
Yorin Anne De Jong 2c1bc0a2cb Add "next week" and show relative dates. 2016-08-19 22:01:25 +02:00
Yorin Anne De Jong 70db345b12 Remove duplicate PHP close tag. 2016-08-19 22:00:46 +02:00
Yorin Anne De Jong 3655883c9f Write database configuration through dev-script. 2016-08-18 23:17:24 +02:00
Yorin Anne De Jong 72b3a1f535 Add PDO-activity for reading events from database. 2016-08-18 22:43:48 +02:00
Aleksander Gustaw Wasaznik 2949aba2bb Autohyphenate <p>
Add hyphens:auto to <p> to remove the ugly gaps introduced by
text-align: justified. This may cause some unwanted hyphenation on e.g.
email addresses. We should strive to not have long unbreakable words.

For record; command for adding html tag to all relevant files:
$ find -type f -exec sed -i '/DOCTYPE/ a <html lang="no">' {} +
2016-08-18 09:45:30 +02:00
Liang Zhu 8ac5b801ef added bli medlem page. updated sosiale page 2016-08-18 00:30:59 +02:00
Yorin Anne De Jong 2b5c561369 Add timezone statement to accommodate older PHP servers. 2016-08-18 00:00:34 +02:00
Yorin Anne De Jong f91d62e69f Remove merge cruft. 2016-08-17 23:58:54 +02:00
Yorin Anne De Jong a4181b98ac Fix typo. 2016-08-17 23:57:15 +02:00
Yorin Anne De Jong b6970d3f03 Add automatic agenda on front page. 2016-08-17 23:57:15 +02:00
Fredrik Lindberg Strupe e4e8b0972b Dynamic event dates 2016-08-15 21:55:50 +02:00
Liang Zhu 6922cbeb23 Animekveld. 2016-08-15 21:12:30 +02:00
Karl August Høivik 4ac73d0113 Merge branch 'master' of github.com:Programvareverkstedet/nettsiden 2016-08-15 19:57:45 +02:00
Karl August Høivik 28397845a0 Event-getter classes 2016-08-15 19:57:27 +02:00
Peder Bergebakken Sundt 66c160ec40 Fikset wiki link, la til WIP søkeside 2016-08-15 19:30:45 +02:00
Karl August Høivik 2fc2dc4da5 PHP events start 2016-08-15 18:19:41 +02:00
Yorin Anne De Jong a1a3d12409 Initial hacking. 2016-08-15 17:43:41 +02:00