nettsiden

Projects/nettsiden

Fork 0

Commit Graph

Select branches

Hide Pull Requests

local-dev-idp

main

move-to-postgres

readd-webmail

revamp-projects

www2-www-fixes

#1

#10

#11

#117

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#23

#25

#26

#27

#28

#29

#29

#30

#31

#32

#33

#34

#35

#36

#37

#38

#38

#39

#41

#42

#43

#44

#45

#46

#47

#48

#49

#50

#50

#53

#54

#55

#56

#57

#60

#61

#63

#68

#7

#71

#73

#75

#78

#79

#8

#83

#84

#85

#86

#87

#88

#89

#9

#90

#92

1.1

1.2

v1.0

v1.1

0a2c08eb9b Move date to the right Jørn Åne 2017-10-07 16:42:11 +02:00
cd150d73c5 Cleanup code Jørn Åne 2017-10-07 16:41:50 +02:00
8c8af74783 Move sosiale to aktiviteter Peder Bergebakken Sundt 2017-10-07 15:16:22 +02:00
980e5ba9ac Update title in prosjekter after its previous move Peder Bergebakken Sundt 2017-10-07 15:05:11 +02:00
434d25cac5 Rename aktiviterer to prosjekter and hide prosjekter Peder Bergebakken Sundt 2017-10-07 14:49:20 +02:00
615b66da39 Use UTF8 Jørn Åne 2017-10-07 14:19:43 +02:00
8feb9cc1ad Remove duplicate file Fredrik Strupe 2016-09-30 15:18:45 +02:00
d0577fe62c s/kommunikasjon/kontakt/g Fredrik Strupe 2016-09-29 18:27:28 +02:00
2fccac4f2d Add comm tab to some more pages Fredrik Strupe 2016-09-02 14:54:14 +02:00
c0a892789e Use common date formatter in sosiale page Fredrik Strupe 2016-09-02 14:49:48 +02:00
980d4018c2 Communication tab/page Fredrik Strupe 2016-09-02 14:41:32 +02:00
bc573a53c7 Image at brettspill page Fredrik Strupe 2016-08-31 18:34:45 +02:00
4f1d3ee6b3 Updated navbar, added aktiviteter, deleted soek, made the ticker into an include Peder Bergebakken Sundt 2016-08-30 18:13:31 +02:00
cbe73d9505 Add description field in sqlite. Jørn Åne 2016-08-29 20:14:23 +02:00
bfee784bc4 Added documentation from outdated repo. Covers alot of the wishes for the new website for the uninformed. Kristoffer Venæs Monsen 2016-08-29 19:46:52 +02:00
871ffc9182 Move navigation down in code, add ul element. Jørn Åne 2016-08-29 19:37:49 +02:00
6e8c8b22c2 Add instructions about PHP installation. Jørn Åne 2016-08-29 18:50:24 +02:00
c7b297eeb9 Make headers appear black, even when they are links. Jørn Åne 2016-08-29 18:30:07 +02:00
9ffaf26f1d Remove "Remind Me" buttons. Jørn Åne 2016-08-29 18:29:33 +02:00
db2ade9da0 Read kurs from database. Jørn Åne 2016-08-29 18:27:31 +02:00
60cadc9284 Make description in HTML. Jørn Åne 2016-08-29 18:24:21 +02:00
772dd62a55 Make development script only listen on localhost. Jørn Åne 2016-08-29 18:23:05 +02:00
399d54b1c3 Make today activities green. Jørn Åne 2016-08-27 00:14:12 +02:00
b8f71db554 Add image for brettspillkveld Jørn Åne 2016-08-27 00:13:58 +02:00
305b4e7064 Remove empty events from Agenda::getNextOfEach Jørn Åne 2016-08-27 00:13:28 +02:00
d9ff461877 Remove redundant PHP close tag. Jørn Åne 2016-08-26 23:56:06 +02:00
d19bd1d08b Update links so that they can point to PHP files. Jørn Åne 2016-08-26 23:54:52 +02:00
1543363b10 Use tabs to make Yorn happy Fredrik Strupe 2016-08-26 23:46:41 +02:00
d56dfcab46 Fetch event description from event class Fredrik Strupe 2016-08-26 23:31:09 +02:00
9d7a0d686f Improve limit calculation for Social page. Jørn Åne 2016-08-26 23:30:32 +02:00
5a241a84a5 Fix regression, placeholders for database events. Jørn Åne 2016-08-26 23:23:57 +02:00
ee000d2d67 Perfectionism. Jørn Åne 2016-08-26 23:17:59 +02:00
b1266aa448 Set social activity text through class functions. Jørn Åne 2016-08-26 23:16:51 +02:00
1650328ccd Add Agenda::getNextOfEach() Jørn Åne 2016-08-26 22:56:52 +02:00
f39389ead4 Global date formatting function Fredrik Strupe 2016-08-26 23:14:46 +02:00
a4787387dd Show date status for nerdepitsa & animekveld Fredrik Strupe 2016-08-26 22:58:20 +02:00
a92f0af57a Add brettspill page Fredrik Strupe 2016-08-26 22:52:59 +02:00
07d3e47735 Add import for DateInterval. Jørn Åne 2016-08-26 22:47:20 +02:00
3e4c2d0ab1 Dynamic dates for animekveld page Fredrik Strupe 2016-08-26 22:35:39 +02:00
f83384d15f Dynamic date on nerdepitsa event page Fredrik Strupe 2016-08-26 22:16:50 +02:00
4cd3f90459 Add getRelativeDate() in Event. Jørn Åne 2016-08-26 22:16:54 +02:00
6d1bf247c5 Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden Peder Bergebakken Sundt 2016-08-26 18:39:48 +02:00
d7885ddfe6 Updated ticker to support multible events a day Peder Bergebakken Sundt 2016-08-26 18:39:21 +02:00
5b5023e696 Rename OnceEvent to SimpleEvent, fix regression. Jørn Åne 2016-08-26 17:58:43 +02:00
0ea3b934dd Make dev script Linux compatible. Jørn Åne 2016-08-26 17:54:50 +02:00
e0fcf5f265 Merge branch 'master' of https://github.com/Programvareverkstedet/nettsiden Peder Bergebakken Sundt 2016-08-26 17:49:53 +02:00
fab5827ebb Fixed title in soek/ and added dev.bat Peder Bergebakken Sundt 2016-08-26 17:49:29 +02:00
963973bc6b Show upcoming activity in the header on the main page. Jørn Åne 2016-08-26 17:29:09 +02:00
328a2a31e6 Add URL property to events. Jørn Åne 2016-08-26 17:22:11 +02:00
8519c00a57 Show more relevant times in upcoming activities. Jørn Åne 2016-08-26 17:04:49 +02:00
66114f36f9 Simplify class structure. Jørn Åne 2016-08-26 17:04:20 +02:00
6c3ac94804 Remove macOS cruft. Jørn Åne 2016-08-20 00:00:49 +02:00
b14c37c22b added paamelding page helliio 2016-08-19 23:47:48 +02:00
29f0afa31f added brettspillkvled event helliio 2016-08-19 23:46:30 +02:00
10fdc27b2b New style for dates in "upcoming events". Jørn Åne 2016-08-19 22:03:15 +02:00
2c1bc0a2cb Add "next week" and show relative dates. Jørn Åne 2016-08-19 22:01:25 +02:00
70db345b12 Remove duplicate PHP close tag. Jørn Åne 2016-08-19 22:00:46 +02:00
3655883c9f Write database configuration through dev-script. Jørn Åne 2016-08-18 23:17:24 +02:00
32c6721ff0 Add development instruction. Jørn Åne 2016-08-18 23:08:31 +02:00
1f13604613 Add script for starting dev server with SQLite. Jørn Åne 2016-08-18 22:49:58 +02:00
72b3a1f535 Add PDO-activity for reading events from database. Jørn Åne 2016-08-18 22:43:32 +02:00
2949aba2bb Autohyphenate <p> Aleksander Wasaznik 2016-08-18 00:25:47 +02:00
8ac5b801ef added bli medlem page. updated sosiale page helliio 2016-08-18 00:30:59 +02:00
2b5c561369 Add timezone statement to accommodate older PHP servers. Jørn Åne 2016-08-18 00:00:34 +02:00
f91d62e69f Remove merge cruft. Jørn Åne 2016-08-17 23:58:54 +02:00
a4181b98ac Fix typo. Jørn Åne 2016-08-17 23:54:59 +02:00
b6970d3f03 Add automatic agenda on front page. Jørn Åne 2016-08-17 23:53:35 +02:00
e4e8b0972b Dynamic event dates Fredrik Strupe 2016-08-15 21:55:50 +02:00
c18b49e992 Fix endless loop in AnimekveldActivity. Jørn Åne 2016-08-15 21:30:16 +02:00
6922cbeb23 Animekveld. helliio 2016-08-15 21:04:16 +02:00
41f72b647f Merge branch 'master' of github.com:Programvareverkstedet/nettsiden Karl August Hoivik 2016-08-15 20:58:47 +02:00
9653716ff5 Get all events from MySQL DB Karl August Hoivik 2016-08-15 20:56:24 +02:00
2aa0839120 Fix but that may cause an endless loop. Jørn Åne 2016-08-15 20:37:25 +02:00
fdf6e29990 Add classes for social activities. Jørn Åne 2016-08-15 20:03:13 +02:00
b19ef0e25b Use immutable date/time objects. Jørn Åne 2016-08-15 20:03:00 +02:00
4ac73d0113 Merge branch 'master' of github.com:Programvareverkstedet/nettsiden Karl August Hoivik 2016-08-15 19:57:45 +02:00
28397845a0 Event-getter classes Karl August Hoivik 2016-08-15 19:57:27 +02:00
976da028e5 Merge branch 'pjuddu' Peder Bergebakken Sundt 2016-08-15 19:31:43 +02:00
66c160ec40 Fikset wiki link, la til WIP søkeside Peder Bergebakken Sundt 2016-08-15 19:30:45 +02:00
dc84fc0133 Merge branch 'master' of github.com:Programvareverkstedet/nettsiden Karl August Hoivik 2016-08-15 18:50:35 +02:00
89ffb4cd12 Add boilerplate and initial interfaces. Jørn Åne 2016-08-15 18:48:02 +02:00
e6657a95cd Add boilerplate and initial activity classes. Jørn Åne 2016-08-15 18:47:07 +02:00
2fc2dc4da5 PHP events start Karl August Hoivik 2016-08-15 18:19:41 +02:00
a1a3d12409 Initial hacking. Jørn Åne 2016-08-15 17:43:41 +02:00
b570a9e332 Updated some minor settings 1.2 Kasper Rynning-Tønnesen 2016-07-19 16:43:26 +02:00
5865b0799e stability 1.1 Kasper Rynning-Tønnesen 2016-07-19 16:09:21 +02:00
3393af9ff5 Removed type v1.1 Kasper Rynning-Tønnesen 2016-07-19 16:01:36 +02:00
0b1683a69d Added namespace Kasper Rynning-Tønnesen 2016-07-19 15:58:46 +02:00
5049bf4c07 reverting.. Kasper Rynning-Tønnesen 2016-07-19 15:56:51 +02:00
047b843d82 Updated composer.json Kasper Rynning-Tønnesen 2016-07-19 15:56:21 +02:00
0ca901aa27 Added composer.json file v1.0 Kasper Rynning-Tønnesen 2016-07-19 15:55:00 +02:00
e278f51de9 Update README.md Kasper Rynning-Tønnesen 2016-07-01 15:37:42 +02:00
3e59131386 Updated README.md Kasper Rynning-Tønnesen 2016-07-01 15:25:07 +02:00
c7ed6513f0 Added some more checking for oauth2-client Kasper Rynning-Tønnesen 2016-07-01 15:13:45 +02:00
1b85303566 Removed unnecessary code Kasper Rynning-Tønnesen 2016-07-01 14:50:50 +02:00
85bfec7358 Some formating Kasper Rynning-Tønnesen 2016-07-01 14:49:57 +02:00
ccacff2220 Removed error with weird letter Kasper Rynning-Tønnesen 2016-07-01 11:49:00 +02:00
a1e0a7abee Update README.md Kasper Rynning-Tønnesen 2016-07-01 11:36:30 +02:00
d2a30e335c Remvoed <<<<heads Kasper Rynning-Tønnesen 2016-07-01 11:31:50 +02:00
b5e137251d Merge branch 'master' of github.com:kasperrt/OAuth2-Client Kasper Rynning-Tønnesen 2016-07-01 11:31:08 +02:00

... 3 4 5 6 7