Commit Graph

8 Commits

Author SHA1 Message Date
Li Chen
a0657ff619 Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server
Conflicts:
	onyx/include/team/exercice.php
	onyx/tpl/bootstrap/teams/exercice.tpl
2013-11-05 04:52:17 +01:00
Li Chen
0f18ed8dcf Exercice page done with submission and confirmation 2013-11-05 02:53:48 +01:00
Li Chen
097023a32a feed.sql: add some files 2013-11-05 00:35:35 +01:00
Quentin Grosyeux
33935063a4 New templates 2013-11-04 23:20:16 +01:00
Li Chen
bbe02d2367 Fixed a php error in team.php 2013-10-26 21:01:49 +02:00
Li Chen
868e49c834 Add simple tpl for each php
Change the home.css to common.css
2013-10-26 21:01:02 +02:00
Némunaire
7571c8c1b1 Move directory tpl users to teams 2013-10-26 08:56:06 +02:00
Némunaire
bed471d75a New router and associated pages 2013-10-22 08:16:02 +02:00