DMC/scipro
7
0
Fork 0
Code Issues 30 Pull Requests 6 Actions Projects 1 Wiki Activity
17,275 Commits 10 Branches 415 Tags
Commit Graph

6238 Commits

Author SHA1 Message Date
Andreas Svanberg
28f8f24d82 Renamed PhD to StudyPlan. 2014-02-27 15:57:48 +01:00
Emil Siverhall
14f3f25466 Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 15:54:08 +01:00
Emil Siverhall
02fee9c3d7 forum modules 2014-02-27 15:44:09 +01:00
Andreas Svanberg
58adc184b7 Added new module; Study plan. 2014-02-27 15:40:27 +01:00
Andreas Svanberg
6d191248c9 Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 15:37:01 +01:00
Andreas Svanberg
225a253c24 Sort of hooked up final seminars to the module system. 2014-02-27 15:36:55 +01:00
Andreas Svanberg
74bae16412 Nobody has delete privileges. 2014-02-27 15:35:17 +01:00
Golrokh Moattar
7dd68bf82d Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 15:24:56 +01:00
Golrokh Moattar
a4fe4a1de1 better code 2014-02-27 15:24:51 +01:00
Richard
36c88597c7 Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 15:13:21 +01:00
Andreas Svanberg
e9ea63ceb8 Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 15:12:38 +01:00
Andreas Svanberg
2178f09164 Added css class to make button more visible 2014-02-27 15:12:33 +01:00
Andreas Svanberg
d2e2faada0 Hooked up files to module settings. 2014-02-27 15:11:59 +01:00
Emil Siverhall
5ddbcac3b9 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java
 2014-02-27 15:06:28 +01:00
Andreas Svanberg
59d3091d94 Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 15:02:07 +01:00
Emil Siverhall
aa3381c062 project state module settings 2014-02-27 14:58:39 +01:00
Golrokh Moattar
35e6c6faaf Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 14:54:42 +01:00
Golrokh Moattar
326ab181f7 better code 2014-02-27 14:54:30 +01:00
Emil Siverhall
c5c5632f24 Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 14:32:01 +01:00
Emil Siverhall
391f9bc564 activity plan and some missing peer hookups 2014-02-27 14:30:07 +01:00
Richard
cfebeb7b19 Inputs and textareas on the different grading reports now shown correctly. 2014-02-27 14:28:59 +01:00
Andreas Svanberg
bd03217c4f Hooked up milestone panels and pages to the module system. 2014-02-27 14:25:14 +01:00
Emil Siverhall
0b6c5c3184 test fix 2014-02-27 14:16:32 +01:00
Andreas Svanberg
e2b4072ea6 Removed left-over if check that made checklist in-accessible by students. 2014-02-27 14:15:16 +01:00
Andreas Svanberg
1dab46900c Hooked up checklist module. Checklist templates can only be created for project types that currently have the checklist module activated. 2014-02-27 14:11:35 +01:00
Emil Siverhall
a23dc7643b Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 13:52:02 +01:00
Emil Siverhall
37138f7ba2 modules for tests 2014-02-27 13:51:48 +01:00
Emil Siverhall
83f9e5dac1 peer module hookups to new authorization strategy 2014-02-27 13:39:11 +01:00
Andreas Svanberg
3d5c3955bd Such a neat little exporter and Wicket fails :( 2014-02-27 13:18:01 +01:00
Andreas Svanberg
3b1a35f0a1 Simplified DateColumn. 2014-02-27 13:11:13 +01:00
Emil Siverhall
a536cb6adf removed abstract authorization strategy since it's only being used in the role based strategy for now 2014-02-27 12:55:58 +01:00
Emil Siverhall
23936f8afe Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 11:47:21 +01:00
Emil Siverhall
791995fd8d admin interface for editing module settings 2014-02-27 11:47:08 +01:00
fred-fri
42e099ee58 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-02-27 19:22:20 +09:00
fred-fri
9f22d4c8cb merging peer stuff 2014-02-27 19:21:43 +09:00
Emil Siverhall
e1b781b64d Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 10:38:59 +01:00
Emil Siverhall
9f5cb2a113 authorization strategy refactoring 2014-02-27 10:37:12 +01:00
fred-fri
1ff010c5f5 moving peer stuff 2014-02-27 18:33:20 +09:00
Andreas Svanberg
fbc28af5b4 Fixed generics warning. 2014-02-27 10:30:14 +01:00
Andreas Svanberg
69477d1c2d Uh? 2014-02-27 10:20:13 +01:00
Andreas Svanberg
fda6726fe7 Fixed deprecated DateMidnight 2014-02-27 10:20:08 +01:00
fred-fri
e6dde8d917 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-02-27 17:47:02 +09:00
fred-fri
bcb39b6dcf moved finalthesisreview stuff 2014-02-27 17:46:15 +09:00
Emil Siverhall
b5194be6da wait with adding new authorization strategy 2014-02-27 09:43:02 +01:00
Emil Siverhall
849c868c22 Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 09:33:53 +01:00
Emil Siverhall
b1da5e534a Merge remote-tracking branch 'origin/develop' into develop 2014-02-27 09:23:58 +01:00
fred-fri
9345b5b3c0 moving target stuff 2014-02-27 17:23:35 +09:00
Andreas Svanberg
5572c7dc86 Moved spring-web dependency to view. 2014-02-27 09:22:15 +01:00
Andreas Svanberg
9128b8c329 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	core/src/main/java/se/su/dsv/scipro/comment/CommentThread.java
	core/src/main/java/se/su/dsv/scipro/file/FileDescription.java
	core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java
	core/src/main/java/se/su/dsv/scipro/project/Project.java
	view/src/main/java/se/su/dsv/scipro/workerthreads/TurnItInCheckWorker.java
 2014-02-27 09:16:29 +01:00
Andreas Svanberg
cdcd72470b Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	core/src/main/java/se/su/dsv/scipro/comment/CommentThread.java
	core/src/main/java/se/su/dsv/scipro/file/FileDescription.java
	core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java
	core/src/main/java/se/su/dsv/scipro/project/Project.java
	view/src/main/java/se/su/dsv/scipro/workerthreads/TurnItInCheckWorker.java
 2014-02-27 09:06:18 +01:00