Commit graph

1578 commits

Author SHA1 Message Date
Rien Maertens
719059988d
Try to fix travis' submodule problem 2018-12-28 19:17:28 +01:00
redfast00
35a91b473d
Merge pull request #306 from ZeusWPI/coffee2js
Coffee2js
2018-12-19 22:07:49 +01:00
6612637c62 Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into coffee2js 2018-12-19 22:29:42 +01:00
092c54ab0c replaced quote.coffee with quote.js 2018-12-19 22:22:49 +01:00
b7cb6f2591 replaced message.coffee with message.js 2018-12-19 22:19:59 +01:00
7027c4ea12 replaced search.coffee with search.js 2018-12-19 22:15:56 +01:00
3929fc3fd8 replaced gamification.coffee with gamification.js 2018-12-19 22:06:35 +01:00
MaxLeyman
ea106fbc5e SlotmachIIn project (#300)
* add slotmachIIn to projects

* Second attempt at adding slotmachiin.md

* add slotmachiin logo

* Gemfile.lock revert
2018-12-14 11:05:04 +01:00
b2b1d9594b updated cammie_down.svg image, now has text 2018-12-14 02:50:25 +01:00
c6fd939391 fixed cammis_down.svg location in cammie.js 2018-12-14 02:41:19 +01:00
875dc90a6e show a message when cammie is down 2018-12-14 02:28:35 +01:00
Rien
65ffabbd2a
Merge pull request #305 from ZeusWPI/feature/cammie-error
Feature/cammie error
2018-12-14 01:57:51 +01:00
233477e937 Converted cammie.coffee to cammie.js 2018-12-14 01:48:29 +01:00
Rien Maertens
631985d9e6
Add drive as a submodule, symlink report folder 2018-12-06 00:06:56 +01:00
Rien Maertens
8fec0141f6
Remove report directory 2018-12-05 23:58:23 +01:00
lorin
f9a34b0bd7
Merge pull request #297 from ZeusWPI/about_page_osm
Replaced Google maps embed on about:contact page with openstreetmap
2018-12-05 13:13:54 +01:00
lorin
2d5f5dab12
Merge pull request #299 from ZeusWPI/mozaic_link_fix
Fixes #262 fix faulty redirect to mozaic github
2018-12-05 13:13:04 +01:00
ajuvercr
ce4babf261 fix faulty redirect to mozaic github 2018-12-04 22:53:48 +01:00
hannes-kl
0dada8f805 fixed bugs : Google Maps to OSM 2018-12-04 20:46:14 +01:00
hannes-kl
cbd50d9310 Moved css and js links to _map.erb 2018-12-04 20:12:03 +01:00
hannes-kl
484f784d88 changed google maps to OSM 2018-12-04 19:15:29 +01:00
hannes-kl
8b073f7054 move leaflet map to partial 2018-11-28 21:36:02 +01:00
Wout Schellaert
515248405a
Add PnJ codenight (#295)
* Add PnJ codenight

* Very professional banner

* Suggestions
2018-11-23 23:08:33 +01:00
Rien
f5ff123727 OSM Workshop 2 (#296)
* OSM Workshop 2

* Specify that development tools are not needed
2018-11-23 13:18:27 +01:00
isasebrechts
a1c6f3c92f add Tab 2018-11-20 16:04:34 +01:00
isasebrechts
bf67c326fa add slotmachien (happy purps w/ goatie) 2018-11-20 16:04:34 +01:00
Wout Schellaert
81b100ccf7
Update latex les location
The photon API has some trouble with 'plateau', this was the most accurate thing I found.
2018-11-11 13:26:08 +01:00
redfast00
e0b328abc9
Also remove url in 2018 edition 2018-11-11 13:24:26 +01:00
redfast00
a46b830df6
Even less third parties 2018-11-11 13:08:38 +01:00
redfast00
5d8b2518a4
Uploaded image to our own servers, security++ 2018-11-11 12:10:05 +01:00
Rien Maertens
f5088d007c
Extend OSM description 2018-11-10 09:53:59 +01:00
Rien
276edf3ec8
Merge pull request #293 from ZeusWPI/osm-workshop
OSM Workshop Event
2018-11-09 14:18:01 +01:00
Rien Maertens
f8304f0712
Add facebook link to OSM event 2018-11-09 14:02:41 +01:00
Rien Maertens
898855c502
OSM-Workshop 2018-11-09 13:57:33 +01:00
redfast00
93df9d87d4
Merge pull request #292 from ZeusWPI/add_logos
Added logos
2018-11-08 18:46:39 +01:00
Hannes
22dd53dd47
fixed forgotten extension 2018-11-07 00:59:46 +01:00
hannes-kl
5547aa2de2 Added logos 2018-11-06 23:16:04 +01:00
Wout Schellaert
e08844f9b3 Add latex les 2018-11-06 21:27:57 +01:00
239421ac94 uiversiteit -> universiteit 2018-10-29 19:46:30 +01:00
9ab85c6015 Changed Slack link to Mattermost link (#289)
* Changed Slack link to Mattermost link

I have not been able to run it on my system, but I didn't really change anything other than text.

* Use HTTPS by default
2018-10-29 19:45:36 +01:00
Rien Maertens
3b543786da
Empty commit for fun 2018-10-24 23:02:14 +02:00
Rien Maertens
d22130e1a1
Update datacenter link 2018-10-24 22:48:34 +02:00
Rien Maertens
7010b1998c
Remove link to chat.zeus.gent to avoid confusion 2018-10-24 22:33:19 +02:00
Robbe Van Herck
ae028aae34
Merge pull request #284 from ZeusWPI/blog/chat2
Chat blogpost 2
2018-10-24 22:17:10 +02:00
Rien Maertens
1c517b23d1
More remarks 2018-10-24 22:08:57 +02:00
Lorin Werthen
24c400bc8d
firefox sucks 2018-10-24 21:19:46 +02:00
Lorin Werthen
98c58ec322
fix shitty firefox shit 2018-10-24 20:05:07 +02:00
Wout Schellaert
e23ded9cef
New datacenter visit date 2018-10-24 19:47:26 +02:00
Wout Schellaert
7da2485a4a
Add FB link 2018-10-23 16:45:08 +02:00
Lorin Werthen
083add6b90
move dependencies 2018-10-21 00:08:18 +02:00