6506 Commits

Author SHA1 Message Date
fred-fri
ffcb8f174c cleanup 2014-09-10 09:20:56 +09:00
fred-fri
fd1d170761 Merge branch 'importusersback' into develop 2014-09-10 09:10:29 +09:00
fred-fri
bed881739b some tests 2014-09-08 13:45:58 +09:00
fred-fri
86c6f14171 refactoring 2014-09-08 11:02:25 +09:00
fred-fri
3311567dd4 refactoring 2014-09-08 10:17:57 +09:00
fred-fri
f431c36489 refactoring 2014-09-08 09:33:37 +09:00
fred-fri
e12acbf43e refactoring 2014-09-08 09:25:28 +09:00
cf0a15caff Styled the identity selection buttons and removed faulty help text. 2014-09-05 10:51:01 +02:00
fred-fri
2d9f76fcd1 feedbcak 2014-09-05 16:50:18 +09:00
fred-fri
59d2b6d68b css 2014-09-05 15:44:47 +09:00
fred-fri
94379993c8 sort fix 2014-09-05 15:36:18 +09:00
fred-fri
c11fbfb125 what have i done II 2014-09-05 14:55:40 +09:00
fred-fri
ec212f962c what have i done 2014-09-05 12:52:21 +09:00
fred-fri
98d570c396 deleting unused local users now works. this is crude but imo better than lazy deleting (because adding lazy deleted checks everywhere simply isnt feasible) 2014-09-04 11:11:08 +09:00
fred-fri
a9beffb460 test fix 2014-09-03 12:50:27 +09:00
fred-fri
551e040962 final seminar created notification leads to projects final seminar page rather than project overview page 2014-09-03 09:53:34 +09:00
fred-fri
20e8ad63e9 bug fix 2014-09-03 09:34:27 +09:00
fred-fri
3a75d289ea sorting 2014-09-03 09:05:10 +09:00
fred-fri
4c5113d0df fixes 2014-09-03 08:21:28 +09:00
fred-fri
74e3ffaa84 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-09-03 07:07:12 +09:00
fred-fri
d1b9dee6dc fix namespace 2014-09-03 07:06:27 +09:00
cc84521277 Send email to supervisors with targets > 0 in a period 2014-09-02 13:59:31 +02:00
fred-fri
59ed4f4d0a remind match responsible to match 2014-09-02 16:16:26 +09:00
fred-fri
69e260edf8 refactor, tests fail 2014-09-02 10:43:31 +09:00
801aa8eb75 Fixed test. 2014-09-01 13:51:21 +02:00
7e2aced4e2 Merge remote-tracking branch 'origin/develop' into develop 2014-09-01 13:37:35 +02:00
e856e09363 Uploading a file to an activity in the activity plan creates a thread for discussion.
Subsequent uploads generates a reply in the same thread.
2014-09-01 13:34:10 +02:00
fred-fri
cffd6ef35b doing the round in the service seems to be the only way to make this work smoothly... 2014-09-01 17:59:08 +09:00
8f54c6499c Some restructuring. 2014-09-01 10:42:06 +02:00
fred-fri
e68741d29a moar refactor 2014-09-01 17:30:14 +09:00
e4a04279c4 DIE NULL 2014-09-01 10:29:18 +02:00
fred-fri
bdaf17dcb6 more refactor 2014-09-01 17:18:43 +09:00
fred-fri
05f5cc1cd0 refactor dat bitch 2014-09-01 16:17:33 +09:00
fred-fri
9b91ba8f72 removed projects 2014-09-01 11:22:27 +09:00
fred-fri
b2854033ce default stuff 2014-09-01 11:11:59 +09:00
fred-fri
1d03b2a7cc default project types 2014-09-01 11:03:45 +09:00
fred-fri
a773270c96 naiz url 2014-09-01 10:48:49 +09:00
fred-fri
00693a6781 language fix 2014-09-01 10:46:14 +09:00
fred-fri
1b22b2ccd3 null program other now 2014-08-29 15:45:06 +09:00
fred-fri
e1bcc4cda6 remind supervisors to add more ideas 2014-08-29 15:00:37 +09:00
fred-fri
4a1444cccc css 2014-08-29 11:02:02 +09:00
b72d306d71 entityID with capital D. 2014-08-28 15:51:50 +02:00
e0066cd546 Merge remote-tracking branch 'origin/develop' into develop 2014-08-28 09:34:34 +02:00
abcf36d034 Merged first meeting package into match. 2014-08-28 09:34:30 +02:00
fred-fri
0f94386ae7 cleanup 2014-08-28 11:53:11 +09:00
fred-fri
1edfc098b3 Merge branch 'develop2' into develop 2014-08-28 11:50:00 +09:00
fred-fri
75146bb821 added count of projects that didnt complete both milestones, cleanup 2014-08-28 11:49:03 +09:00
fred-fri
87118eecc5 added count, cleanup 2014-08-28 11:14:09 +09:00
fred-fri
ed0daaa9d2 extensive cleanup 2014-08-28 10:35:39 +09:00
55764204ac Merged applicationperiod package into match. 2014-08-27 17:08:31 +02:00