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

366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felix Albrigtsen
9e7436684c Modal view, navbar, js folder structure 2022-01-24 16:12:31 +01:00
Felix Albrigtsen
a500b5eecc Started visual gallery, expanded fetch-script 2022-01-24 00:22:14 +01:00
Felix Albrigtsen
fb5b66f12b Script for fetching pictures from home folders 2022-01-23 01:34:48 +01:00
Peder Bergebakken Sundt
e7f9799285 PIIIIIITSAAAAA 2021-11-19 22:44:24 +01:00
Felix Albrigtsen
25212940dd lib/OAuth2-Client: Update submodule 2021-10-25 23:09:21 +02:00
Charlie Root
a1d56570b1 Merge branch 'master' of https://github.com/programvareverkstedet/nettsiden 2021-10-17 05:57:17 +02:00
Felix Albrigtsen
15f2154f6a gitignore gallery photos 2021-10-17 05:54:47 +02:00
Charlie Root
6b81b0785f Cleaned gitignore, gallery photos 2021-10-17 05:52:43 +02:00
Felix Albrigtsen
6b243ad91b Added matrix serverfile 2021-10-17 05:43:25 +02:00
Felix Albrigtsen
63e49417a7 UU fix for door sensor 2021-10-13 22:15:35 +02:00
Felix Albrigtsen
6c891b3f79 New door-graph, Improved slideshow, moved video 2021-10-13 10:10:17 +02:00
Felix Albrigtsen
a4ce890a36 Testing door sensor graphing 2021-10-11 16:23:18 +02:00
Felix Albrigtsen
2ba0266fca Fix folder structure pt3 2021-10-10 22:11:44 +02:00
Felix Albrigtsen
9f3812b8a5 Fix folder structure pt2 2021-10-10 22:03:36 +02:00
Felix Albrigtsen
a9ee7cd6f7 Fix folder structure pt1 2021-10-10 22:02:50 +02:00
Felix Albrigtsen
1c4eb5cfe4 Replaced video with slideshow 2021-10-10 22:01:27 +02:00
Felix Albrigtsen
9162ee70a7 Outdated banner on nerdepitsa 2021-10-05 18:08:19 +02:00
Felix Albrigtsen
bdbab5be9e Mobile friendly styling 2021-09-28 00:48:27 +02:00
Felix Albrigtsen
0d87d37c72 Oppdatert romnummer og kontaktinformasjon 2021-09-27 23:37:10 +02:00
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
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
cfeba9f8da fixed cache issue 2021-08-12 22:35:50 +02:00
Eirik
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 N-H
5ade47f6dd
Merge pull request #13 from Programvareverkstedet/driftkveld 
Fast driftkveld i kalender
 2021-03-16 21:13:42 +01:00
Torstein N-H
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 N-H
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 B. 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
SondreElg
9b3735ea75 edit "veibeskrivelse" link 2020-09-03 21:25:43 +02:00
SondreElg
9997b8fca9 Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden 2020-09-03 20:39:58 +02:00
SondreElg
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 B. 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