6440 Commits

Author SHA1 Message Date
fred-fri
94386a1544 refactoring multiple attachments 2014-10-16 17:55:59 +09:00
701030874f Simplified HTML. 2014-10-16 10:30:21 +02:00
b4bfb44662 Green button. 2014-10-16 10:25:36 +02:00
a802b1b3f9 Changed text. 2014-10-16 10:24:43 +02:00
golrokh
80e5e16bd8 Add point template to the DB 2014-10-16 10:17:56 +02:00
fd0914c036 Merge remote-tracking branch 'origin/develop' into develop 2014-10-16 10:04:02 +02:00
2431214ef7 Refactored so the boolean parameter is actually used. 2014-10-16 10:03:56 +02:00
142b91b99c Some more minor touches. 2014-10-16 09:47:39 +02:00
fred-fri
c7b66cba20 Merge branch 'develop' into attachments 2014-10-16 16:47:04 +09:00
ecad9d6a3f Removed warning suppression. 2014-10-16 09:45:44 +02:00
fred-fri
751f22cc1c test 2014-10-16 16:45:41 +09:00
51603fcfc9 Removed useless user field. Less state = better. 2014-10-16 09:43:19 +02:00
948eaca150 Removed second useless parameter. 2014-10-16 09:40:01 +02:00
aa37c37059 Removed useless parameter. 2014-10-16 09:38:27 +02:00
fred-fri
e68f4f566b removed reference to daisy in gui 2014-10-16 14:54:43 +09:00
fred-fri
17f778da27 gui 2014-10-16 14:53:39 +09:00
fred-fri
2ab4dc9aa7 multilinelabel 2014-10-16 12:57:57 +09:00
fred-fri
592c5b6d70 tables side by side 2014-10-16 12:45:03 +09:00
6d726ce21d Small presentation improvements. 2014-10-15 13:23:29 +02:00
5a2ebac64c Refactored AddActivitiesFromTemplatePanel into a straightforward panel without too much AJAX and dialog crap. Also simplified the logic for switching between list and detailed view. 2014-10-15 13:12:39 +02:00
fred-fri
c1f0dd00cd refactoring to multiple attachments 2014-10-15 18:37:23 +09:00
1f7a77ff80 Major refactoring of AddActivitiesFromTemplatePanel. 2014-10-15 11:11:12 +02:00
12451b3e45 Removed faulty Bootstrap CSS. 2014-10-15 10:35:10 +02:00
fred-fri
28cc7ba26a Merge branch 'develop' into attachments 2014-10-15 16:47:20 +09:00
fred-fri
4dee431b3c final grading report > grading report 2014-10-15 16:06:26 +09:00
fred-fri
e08e8cffbb clarify 2014-10-15 16:02:23 +09:00
fred-fri
8dab2bcb1a clarify 2014-10-15 16:00:42 +09:00
fred-fri
cb56a3b173 e-mail instead of username 2014-10-15 15:57:34 +09:00
fred-fri
7d6002d5a8 improved opposition and participation gui 2014-10-15 14:46:58 +09:00
fred-fri
5247359421 stupid dates 2014-10-15 13:36:15 +09:00
fred-fri
55ff5ce76e dunno why injections doesnt work 2014-10-15 13:17:30 +09:00
fred-fri
7d43b92534 removed unused declarations 2014-10-15 10:25:20 +09:00
8638f20a70 Clean up forum create and reply panels 3 2014-10-14 17:14:15 +02:00
4a88d51e7c More bootstrap linting. 2014-10-14 15:20:34 +02:00
6e1552e2cf More bootstrap linting. 2014-10-14 14:55:41 +02:00
2be8ec30b0 More bootstrap linting. 2014-10-14 14:53:44 +02:00
e5acc0ceae More bootstrap linting. 2014-10-14 14:45:14 +02:00
0dde8e6815 Bootstrap linting. 2014-10-14 14:33:08 +02:00
4128e5195e Merge remote-tracking branch 'origin/develop' into develop 2014-10-14 14:21:04 +02:00
dabecd107c Fixed spacing of ActivityPlanPanel buttons when they wrap. 2014-10-14 14:20:51 +02:00
fred-fri
4966c869ab these should be there 2014-10-14 15:31:51 +09:00
fred-fri
feb96fd706 moving methods 2014-10-14 12:52:23 +09:00
fred-fri
cb9c12232a moving methods 2014-10-14 12:11:09 +09:00
fred-fri
1784b0b934 stranger danger 2014-10-14 10:26:48 +09:00
fred-fri
a7edccdcb3 Merge branch 'movez' into develop 2014-10-14 10:19:21 +09:00
5e021725cd Removed more stupid code. 2014-10-13 14:58:41 +02:00
aaa2e1ba81 Removed close buttons on the dialogs used to move the grading report between the different states (-> reviewing, -> finalized). 2014-10-13 14:21:46 +02:00
d81fdd9ff8 Fixed visibility of individual criteria, points and grade for the reviewer grading report. 2014-10-13 14:17:56 +02:00
fred-fri
83e0ccc75b what the flip is a checklistquestionanswer 2014-10-13 14:00:27 +09:00
fred-fri
54be4509ab moving methods 2014-10-13 12:44:56 +09:00