Projects/nettsiden
Projects
/
nettsiden
8
2
Fork 0
Code Issues 15 Pull Requests 2 Activity
447 Commits 11 Branches 4 Tags 13 MiB
Commit Graph

447 Commits

Author SHA1 Message Date
Peder Bergebakken Sundt 728f8a6179 Woa, testing a PR on windows was fun 2021-09-08 22:38:17 +02:00
Peder Bergebakken Sundt 8fd03c9824
Merge pull request #15 from Programvareverkstedet/doorsensor 
Uploaded door sensor
 2021-09-08 22:23:37 +02:00
Felix Albrigtsen fdbbaee175 Handled suggestions -pullrequestreview-749376540 2021-09-08 21:29:36 +02:00
Felix Albrigtsen 9dad49738c Uploaded door sensor 2021-09-04 14:56:48 +02:00
Eirik Witterso 0336236fda Removed recurring events for now 2021-08-17 18:38:31 +02:00
Peder Bergebakken Sundt 9a5e444041 mobile layout 2021-08-13 14:15:54 +02:00
Eirik Witterso cfeba9f8da fixed cache issue 2021-08-12 22:35:50 +02:00
Eirik Witterso 9691433917 Put video on homepage 2021-08-12 22:33:09 +02:00
Peder Bergebakken Sundt db6af95063 Bugfix 2021-08-12 13:44:47 +02:00
Peder Bergebakken Sundt cd1792c130 Add instructions for adding yourself as admin 2021-08-12 13:44:22 +02:00
Peder Bergebakken Sundt dc99df21c2 add .gitattributes 2021-08-12 12:50:01 +02:00
Peder Bergebakken Sundt ecf40334e4 Update dependencies 2021-08-11 22:29:06 +02:00
Peder Bergebakken Sundt e1686cd8c5 Add dockerfile for local development 2021-08-11 22:28:48 +02:00
dependabot[bot] 06bfa81d6e Bump phpmailer/phpmailer from 6.1.6 to 6.5.0 
Bumps phpmailer/phpmailer from 6.1.6 to 6.5.0.

---
updated-dependencies:
- dependency-name: phpmailer/phpmailer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-24 15:37:53 +02:00
Torstein Nordgård-Hansen 5ade47f6dd
Merge pull request #13 from Programvareverkstedet/driftkveld 
Fast driftkveld i kalender
 2021-03-16 21:13:42 +01:00
Torstein Nordgård-Hansen 7b237f1656 WIP: Fikset typo i include 2021-03-16 21:09:28 +01:00
Peder Bergebakken Sundt 80198d0d98 Make dev.sh download gitmodules 
Untested, it'll probably work
 2021-03-16 20:49:36 +01:00
Torstein Nordgård-Hansen 3c24435688 WIP: driftkveld i kalenderen 2021-03-16 20:26:38 +01:00
Peder Bergebakken Sundt b50a4a7ad4 Improve readme even more 2021-03-16 20:07:56 +01:00
Peder Bergebakken Sundt 523b30d6f5 Fix dev.sh 2021-03-16 20:00:47 +01:00
Peder Bergebakken Sundt 06e530061d Update readme 2021-03-16 20:00:02 +01:00
Peder Bergebakken Sundt c0c324217c
Merge pull request #12 from Programvareverkstedet/dependabot/composer/symfony/http-kernel-4.4.13 
Bump symfony/http-kernel from 4.4.7 to 4.4.13
 2020-09-04 23:59:08 +02:00
Sondre Haugen Elgaaen 9b3735ea75 edit "veibeskrivelse" link 2020-09-03 21:25:43 +02:00
Sondre Haugen Elgaaen 9997b8fca9 Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden 2020-09-03 20:39:58 +02:00
Sondre Haugen Elgaaen 27986e0b1d Update room location and animekveld information 2020-09-03 20:37:55 +02:00
Emma Lu Eikemo fe129fe1b0 updated veibeskrivelse to new location at oppredning/gruvedrift 2020-09-03 20:01:01 +02:00
Emma Lu Eikemo e08b23be05 updated veibeskrivelse to new location at oppredning/gruvedrift 2020-09-03 19:46:34 +02:00
dependabot[bot] 089b34833b
Bump symfony/http-kernel from 4.4.7 to 4.4.13 
Bumps [symfony/http-kernel](https://github.com/symfony/http-kernel) from 4.4.7 to 4.4.13.
- [Release notes](https://github.com/symfony/http-kernel/releases)
- [Changelog](https://github.com/symfony/http-kernel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-kernel/compare/v4.4.7...v4.4.13)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-03 09:11:16 +00:00
dependabot[bot] 995b8d7ae7 Bump phpmailer/phpmailer from 6.1.5 to 6.1.6 
Bumps [phpmailer/phpmailer](https://github.com/PHPMailer/PHPMailer) from 6.1.5 to 6.1.6.
- [Release notes](https://github.com/PHPMailer/PHPMailer/releases)
- [Changelog](https://github.com/PHPMailer/PHPMailer/blob/master/changelog.md)
- [Commits](https://github.com/PHPMailer/PHPMailer/compare/v6.1.5...v6.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-05-28 16:07:46 +02:00
Peder Bergebakken Sundt d248c94a3d
Merge pull request #10 from Programvareverkstedet/dependabot/composer/simplesamlphp/simplesamlphp-1.18.6 
Bump simplesamlphp/simplesamlphp from 1.18.4 to 1.18.6
 2020-04-24 18:47:29 +02:00
dependabot[bot] d3584dae44
Bump simplesamlphp/simplesamlphp from 1.18.4 to 1.18.6 
Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 1.18.4 to 1.18.6.
- [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases)
- [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v1.18.6/docs/simplesamlphp-changelog.md)
- [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v1.18.4...v1.18.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-22 21:01:55 +00:00
Peder Bergebakken Sundt a45eaab050
Merge pull request #9 from Programvareverkstedet/dependabot/composer/symfony/http-foundation-4.4.7 
Bump symfony/http-foundation from 4.4.3 to 4.4.7
 2020-04-03 13:35:19 +02:00
dependabot[bot] c6795dc1bf
Bump symfony/http-foundation from 4.4.3 to 4.4.7 
Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.4.3 to 4.4.7.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v4.4.3...v4.4.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-31 15:09:04 +00:00
Peder Bergebakken Sundt d1734e8762 Broen er oppe 2020-02-28 16:26:57 +01:00
dependabot[bot] 69582db88f Bump simplesamlphp/simplesamlphp from 1.15.4 to 1.18.4 
Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 1.15.4 to 1.18.4.
- [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases)
- [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/master/docs/simplesamlphp-changelog.md)
- [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v1.15.4...v1.18.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-01-29 15:54:39 +01:00
dependabot[bot] 66eb6f0907 Bump robrichards/xmlseclibs from 3.0.1 to 3.0.4 
Bumps [robrichards/xmlseclibs](https://github.com/robrichards/xmlseclibs) from 3.0.1 to 3.0.4.
- [Release notes](https://github.com/robrichards/xmlseclibs/releases)
- [Changelog](https://github.com/robrichards/xmlseclibs/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/robrichards/xmlseclibs/compare/3.0.1...3.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-19 11:19:09 +01:00
Peder Bergebakken Sundt 74e86ded33 Add Afterlogic Lite mail 2019-09-02 17:42:24 +02:00
Peder Bergebakken Sundt ea7c33cb8e Add git.pvv.ntnu.no to the website 2019-04-08 19:34:31 +02:00
Peder Bergebakken Sundt 5ad772fc26 Add white rasterized logo 2019-04-01 19:36:19 +02:00
Peder Bergebakken Sundt 39126936b0 Fix bug with single digit dates 2018-10-25 00:32:04 +02:00
Peder Bergebakken Sundt c549890b7e Add info on Aktive, and some links pointing to the wiki 2018-09-21 19:39:54 +02:00
Peder Bergebakken Sundt 09d5ebc249 Update kontaktinformasjon to point towards the wiki 2018-09-09 17:46:09 +02:00
Peder Bergebakken Sundt ead8f3a19c Add payment info to /paamelding/ 2018-09-06 13:31:54 +02:00
Peder Bergebakken Sundt c3ada63c69 Whoops 
I really feel like doing a commit ammend with force push...
 2018-08-29 19:18:22 +02:00
Peder Bergebakken Sundt eb39821f20 Fix some cases of overflowing hendelse text breaking styles here and there 2018-08-29 19:12:39 +02:00
Peder Bergebakken Sundt 59463ebdfb Fix bug where days with string length 1 would break mysql 2018-08-29 19:03:05 +02:00
Peder Bergebakken Sundt d1612e2804 Fix utf8 and JSON issues resulting from MYSQL being weird 2018-08-24 13:53:18 +02:00
Peder Bergebakken Sundt 07c1a90845 Whoops again 2018-08-24 13:24:42 +02:00
Peder Bergebakken Sundt d0613a8734 Whoops 2018-08-24 12:41:28 +02:00
Peder Bergebakken Sundt dd2ca22bba Add door sensor REST api 
We have yet to add the door states to the frontpage or something
 2018-08-24 12:28:06 +02:00