fred-fri
|
40625f12af
|
added pid to project pages
|
2013-06-14 11:39:55 +09:00 |
|
fred-fri
|
37f19a554d
|
added confirmations
|
2013-06-13 10:27:39 +09:00 |
|
fred-fri
|
1e97f8f1c5
|
Merge branch 'oppose_participate_links' into develop
|
2013-06-13 10:08:21 +09:00 |
|
fred-fri
|
82d91ed3ee
|
added test
|
2013-06-13 10:07:53 +09:00 |
|
fred-fri
|
cda3614efe
|
added test class
|
2013-06-13 09:47:36 +09:00 |
|
fred-fri
|
b07f46cd95
|
Merge branch 'final_seminar_rule_exemptions' into develop
|
2013-06-13 09:37:17 +09:00 |
|
fred-fri
|
d3e1ab6f3f
|
added feedbackpanel
|
2013-06-13 09:36:03 +09:00 |
|
Emil Siverhall
|
fcbc3c356e
|
Merge branch 'remove_active_participant' into develop
|
2013-06-12 15:38:14 +02:00 |
|
Emil Siverhall
|
7e589ec108
|
make sure we save seminar when removing active participants as admin
|
2013-06-12 15:36:47 +02:00 |
|
fred-fri
|
44c40386f4
|
refactoring
|
2013-06-12 14:45:50 +09:00 |
|
fred-fri
|
05d7cb36b8
|
refactoring
|
2013-06-12 14:15:58 +09:00 |
|
fred-fri
|
f4d9baa44f
|
refactoring
|
2013-06-12 13:51:04 +09:00 |
|
fred-fri
|
3087aeb8ef
|
refactoring to use service methods
|
2013-06-12 13:38:04 +09:00 |
|
fred-fri
|
c0a64313ff
|
moving methods to service
|
2013-06-12 13:17:43 +09:00 |
|
fred-fri
|
875e754a38
|
moved enabled statement into components
|
2013-06-12 12:52:08 +09:00 |
|
fred-fri
|
99ffa6d551
|
added new opposeparticipate component
|
2013-06-12 12:50:32 +09:00 |
|
fred-fri
|
09b133e11e
|
added new emptypanel
|
2013-06-12 12:03:54 +09:00 |
|
fred-fri
|
4282f72114
|
fixed params bug
|
2013-06-12 11:08:22 +09:00 |
|
fred-fri
|
9d2006e68a
|
added form test
|
2013-06-12 10:33:46 +09:00 |
|
fred-fri
|
b34e1ca8ea
|
fixed test error
|
2013-06-12 10:31:41 +09:00 |
|
fred-fri
|
f7966ae47b
|
added filtering form
|
2013-06-12 09:42:40 +09:00 |
|
fred-fri
|
8957898dd1
|
typo
|
2013-06-12 09:17:12 +09:00 |
|
fred-fri
|
7e5e1edc71
|
made it so that thesis comment can be uploaded after deleted if project is finalseminarruleexempted
|
2013-06-12 09:08:50 +09:00 |
|
fred-fri
|
8dcdb5677d
|
made it so that student can upload final seminar thesis after deadline if project is finalseminarruleexempted
|
2013-06-12 08:57:35 +09:00 |
|
fred-fri
|
999bc2d968
|
changed rules so that the final seminar delete worker and crudpanel ignores rules for exempted projects/seminars
|
2013-06-11 17:51:22 +09:00 |
|
fred-fri
|
703968ba92
|
added highlighting
|
2013-06-11 16:13:26 +09:00 |
|
fred-fri
|
3bbc08b992
|
hooked up more stuff to properties
|
2013-06-11 16:09:17 +09:00 |
|
fred-fri
|
370c969cab
|
fixed resource pointer bug
|
2013-06-11 16:06:21 +09:00 |
|
fred-fri
|
e1b5040299
|
stringresourcemodel wont work
|
2013-06-11 15:32:24 +09:00 |
|
fred-fri
|
c2d59becac
|
test for page added
|
2013-06-11 15:27:58 +09:00 |
|
fred-fri
|
6d27eea767
|
added properties file, and entity strings in project and final seminar
|
2013-06-11 15:21:57 +09:00 |
|
fred-fri
|
150cc9837b
|
added test for wrapper
|
2013-06-11 14:42:28 +09:00 |
|
fred-fri
|
e0793b3347
|
added empty constructor to ajaxcheckboxwrapper not to violate dry
|
2013-06-11 14:35:40 +09:00 |
|
fred-fri
|
f3d5793797
|
added confirmation
|
2013-06-11 14:31:48 +09:00 |
|
fred-fri
|
99225b71cc
|
some logics
|
2013-06-11 14:23:37 +09:00 |
|
fred-fri
|
7a06660d94
|
wrapper created and added
|
2013-06-11 14:10:26 +09:00 |
|
fred-fri
|
d4c10ee6bb
|
working on exemptions page, need to create wrapper panel for adding ajaxcheckbox to column
|
2013-06-11 13:54:46 +09:00 |
|
fred-fri
|
9a61973fa2
|
working on exemptions page
|
2013-06-11 13:32:19 +09:00 |
|
fred-fri
|
e37632c98d
|
added link to exemptions page
|
2013-06-11 12:27:03 +09:00 |
|
fred-fri
|
e909622131
|
added url in sciproapplication
|
2013-06-11 11:41:38 +09:00 |
|
fred-fri
|
54305a188d
|
created new final seminar rule exemption page
|
2013-06-11 11:38:28 +09:00 |
|
fred-fri
|
4142407d1e
|
minor cleanup
|
2013-06-11 11:31:41 +09:00 |
|
fred-fri
|
a0fc70a60f
|
changed phrasing of adminpanel
|
2013-06-11 11:28:51 +09:00 |
|
fred-fri
|
96161827fe
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-06-11 11:02:23 +09:00 |
|
fred-fri
|
e96b31e61d
|
changed phrasing of some notifications
|
2013-06-11 11:01:41 +09:00 |
|
Emil Siverhall
|
b4015b33d1
|
Merge branch 'milestones/advanced' into develop
|
2013-06-10 11:21:08 +02:00 |
|
Emil Siverhall
|
ee954203af
|
removed unnecessary equals/hashcode methods
|
2013-06-10 11:20:50 +02:00 |
|
Emil Siverhall
|
69da4042d6
|
Merge branch 'milestone/notifications' into develop
|
2013-06-10 11:09:36 +02:00 |
|
fred-fri
|
a67ea4c685
|
fixed date bug
|
2013-06-10 18:04:58 +09:00 |
|
Emil Siverhall
|
8ac64188d3
|
milestone notification improvements
|
2013-06-10 10:50:04 +02:00 |
|