Commit Graph

46 Commits

Author SHA1 Message Date
Felix Albrigtsen 57055c9c6f
Fix previous merge (#43)
The previous merge contained a commit and a revert, but the original change remained on master.
2023-04-27 16:05:14 +02:00
Felix Albrigtsen e364a5fee0
Stop including BrettspillActivity (#41)
Temporary until april 23
2023-04-17 01:21:15 +02:00
Felix Albrigtsen 9f45271b18 Update deprecated template syntax 2023-01-19 11:28:29 +01:00
Felix Albrigtsen a734fe6bd3 Add brettspill, drift and hack activities 2023-01-16 14:18:30 +01:00
Bjornar Orjansen Kaarevik 98da6ada23
Merge pull request #32 from Programvareverkstedet/linkdash
Added linkdash - list of our services
2022-11-29 17:26:10 +01:00
Amalie Erdal Mansaker f4407fde4a Disabled brettspillkveld and hackekveld 2022-11-19 21:23:41 +01:00
Bjornar Orjansen Kaarevik b555f915a0 Added brettspillkveld 2022-09-24 21:58:28 +02:00
Felix Albrigtsen b42214b404 Establish layout for /tjenester 2022-09-17 17:09:35 +02:00
Felix Albrigtsen 0f8b15715b Add driftkveld and hackekveld 2022-09-04 00:53:30 +02:00
Felix Albrigtsen 9fa6066724 Removed driftskveld temporarily 2022-05-26 14:08:41 +02:00
Felix Albrigtsen a80114be7a Removed hackekveld temporarily 2022-03-26 20:34:05 +01:00
Felix Albrigtsen 6070cf4bd3 Lagt til hackekveld fjerdehver uke 2022-02-17 16:04:42 +01:00
Peder Bergebakken Sundt 15c9431c10 remove nerdepitsa
no-one whent there
2022-01-29 19:34:13 +01:00
Torstein Nordgård-Hansen bbe51e702b Added biweekly driftkveld 2022-01-29 19:21:16 +01:00
Felix Albrigtsen 9e7436684c Modal view, navbar, js folder structure 2022-01-24 16:12:31 +01:00
Peder Bergebakken Sundt e7f9799285 PIIIIIITSAAAAA 2021-11-19 22:44:24 +01:00
Eirik Witterso 0336236fda Removed recurring events for now 2021-08-17 18:38:31 +02:00
Torstein Nordgård-Hansen 7b237f1656 WIP: Fikset typo i include 2021-03-16 21:09:28 +01:00
Torstein Nordgård-Hansen 3c24435688 WIP: driftkveld i kalenderen 2021-03-16 20:26:38 +01:00
Peder Bergebakken Sundt ea7c33cb8e Add git.pvv.ntnu.no to the website 2019-04-08 19:34:31 +02:00
Yorin Anne De Jong 928647e6cc Move user button before user menu, for later CSS changes 2018-08-10 22:30:01 +02:00
Peder Bergebakken Sundt 202f2ce12a Disable annoying navbar behaviour
Navbar would link to the url "#" if the buttons is "active". Being nested inside some menu is annoying when you want to return to the toplevel
2018-08-09 00:33:14 +02:00
Peder Bergebakken Sundt f5c088fdc1 Remove kalender and aktiviteter from navbar, add Hendelser. Change webmail to /mail
Finally
2018-08-06 23:34:54 +02:00
Markus Wang Halvorsen 32f9653a6d Prepare for merge 2018-02-24 16:53:17 +01:00
Peder Bergebakken Sundt f3b95fe641 Fix bug with webmail link in navbar not working
the webmail link in the  navbar didn't work properly on other pages than the frontpage, due to prepending a "../" to the external link
2018-02-19 15:48:51 +01:00
Yorin Anne De Jong 73efba625b Add a central include file 2018-02-13 19:08:41 +01:00
Yorin Anne De Jong 060d37c040 Better styling of the user menu 2018-02-13 18:44:36 +01:00
Yorin Anne De Jong 24b6af1799 Add admin button to user menu, if admin 2018-02-13 18:30:49 +01:00
Yorin Anne De Jong 528ea62f38 Set link to anchor for current page, to easily dismiss menu 2018-02-13 17:24:08 +01:00
Yorin Anne De Jong c12f38f133 No user menu when not logged in 2018-02-13 16:51:43 +01:00
Yorin Anne De Jong e7f11aee54 Improve login/logout buttons 2018-02-13 16:48:00 +01:00
Yorin Anne De Jong fe1e012db3 Add login icon 2018-02-13 16:24:16 +01:00
Yorin Anne De Jong 84b6b60a37 Use CSS tables for the navbar 2018-02-13 16:01:19 +01:00
Yorin Anne De Jong 1f2de139eb Add McDonalds menu 2018-02-13 15:24:27 +01:00
Yorin Anne De Jong 4efe0aaefa Capitalize menu items 2018-02-13 15:23:38 +01:00
Yorin Anne De Jong 0d0305cf04 Fix bug that prevented the active page from being marked in nav 2018-02-13 14:53:33 +01:00
Peder Bergebakken Sundt 9f38e2af1a Move agenda creation to single include
This is to minimize problems arizing from adding and removing recurring events
2018-02-10 18:37:02 +01:00
Markus Wang Halvorsen 32aa9e077c Show admin page link to admins 2018-02-10 15:42:01 +01:00
Markus Wang Halvorsen 1ea96f5c0d New navbar
mobile still wip
2017-11-13 23:13:24 +01:00
Peder Bergebakken Sundt 7dbce0bd24 Add webmail to navbar, add generalized navbar to /om 2017-11-13 20:35:25 +01:00
Markus Wang Halvorsen c6cd02486d Redesign navbar and landing page 2017-11-13 13:21:51 +01:00
Yorin Anne De Jong 53aec5edf5 Prevent double slashes at the end of URL 2017-11-11 15:44:23 +01:00
Yorin Anne De Jong 6574bd576e Generalize navigation and PHP configuration 2017-11-11 15:20:58 +01:00
Yorin Anne De Jong 68bba332f1 Remove BrettspilActivity from agendas 2017-10-22 17:48:58 +02:00
Yorin Anne De Jong 615b66da39 Use UTF8 2017-10-07 14:19:43 +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