Emil Siverhall
|
11dfbde215
|
session handles modules instead of project type
|
2014-02-26 21:31:55 +01:00 |
|
Emil Siverhall
|
59085a1645
|
no need for more than one module in annotation
|
2014-02-26 21:08:17 +01:00 |
|
Emil Siverhall
|
e6cef89338
|
abstract superclass for both our custom authorization strategies
|
2014-02-26 20:37:11 +01:00 |
|
Emil Siverhall
|
79a2648bc1
|
module based authorization strategy
|
2014-02-26 20:29:04 +01:00 |
|
Golrokh Moattar
|
82c2d1f517
|
Create first meeting ska inte visas på inaktiverade idéer
|
2014-02-26 17:45:44 +01:00 |
|
|
|
91caa31e32
|
Shuffled some annotations around to reduce dependencies
|
2014-02-26 17:16:16 +01:00 |
|
|
|
3f160abdcc
|
Updated all dependency versions.
Still stuck with Spring 3.2.8 due to Spring-data-jpa.
Hibernate introduced a bug in 4.3.* so until that is resolved we use 4.2.8.
|
2014-02-26 16:47:14 +01:00 |
|
Golrokh Moattar
|
0476a1ec46
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.html
|
2014-02-26 15:56:24 +01:00 |
|
Golrokh Moattar
|
3b3908d949
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.html
|
2014-02-26 15:43:21 +01:00 |
|
Richard
|
4eaebd55cd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 15:18:22 +01:00 |
|
Golrokh Moattar
|
e0dbbd0922
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 15:16:02 +01:00 |
|
Richard
|
23f6da0553
|
Removed link to SciPro Resources since it's now located in the footer.
|
2014-02-26 15:12:18 +01:00 |
|
Richard
|
725551a9ef
|
Added milestone information on the MileStoneOverviewPanel
|
2014-02-26 15:11:12 +01:00 |
|
Richard
|
aaa73226e6
|
Styling of the Study plan upload.
|
2014-02-26 15:07:36 +01:00 |
|
leosu
|
d6252dc01b
|
cleanup
|
2014-02-26 14:14:10 +01:00 |
|
Emil Siverhall
|
70862f99b5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 12:09:19 +01:00 |
|
Emil Siverhall
|
4221ca98da
|
panel-> generic panel + null check on idea export panel
|
2014-02-26 12:08:56 +01:00 |
|
Golrokh Moattar
|
962561fb8d
|
all titles in idea panel are clickable
|
2014-02-26 11:58:42 +01:00 |
|
leosu
|
1a58b89c21
|
better feedback and link to login page
|
2014-02-26 11:36:03 +01:00 |
|
leosu
|
9e47d4cc25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 11:04:32 +01:00 |
|
leosu
|
d81c10c8ee
|
fixed failing test
|
2014-02-26 11:04:25 +01:00 |
|
fred-fri
|
072c9aa72b
|
moving applicationperiodprojecttype stuff
|
2014-02-26 18:32:18 +09:00 |
|
fred-fri
|
1bfa14c83d
|
moving project stuff
|
2014-02-26 18:15:17 +09:00 |
|
fred-fri
|
5b7834d639
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-02-26 18:04:59 +09:00 |
|
fred-fri
|
f8c61154be
|
moving project stuff
|
2014-02-26 18:03:56 +09:00 |
|
leosu
|
ec49af8add
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 09:36:35 +01:00 |
|
leosu
|
171489f7d3
|
first time registration triggered with empty database
|
2014-02-26 09:36:22 +01:00 |
|
Golrokh Moattar
|
2a24b6b86d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-26 09:34:12 +01:00 |
|
fred-fri
|
ea33b02f0c
|
bug fixes
|
2014-02-26 12:59:11 +09:00 |
|
fred-fri
|
e82957b3f7
|
bug fixes
|
2014-02-26 12:23:18 +09:00 |
|
Golrokh Moattar
|
e14d13abb3
|
Added a link to ProjectDetailPage
|
2014-02-25 16:13:06 +01:00 |
|
leosu
|
d67aab9d01
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 15:52:34 +01:00 |
|
leosu
|
6a894afc5b
|
FirstTimeRegistrationPage
|
2014-02-25 15:52:09 +01:00 |
|
leosu
|
7ed8761a66
|
cleanup
|
2014-02-25 15:51:56 +01:00 |
|
Richard
|
769703962a
|
Reverted deletion of float:left on header div a.
|
2014-02-25 15:46:15 +01:00 |
|
Golrokh Moattar
|
098680eb25
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 14:14:19 +01:00 |
|
|
|
3981194e79
|
Removed stupid callbacks.
|
2014-02-25 14:11:51 +01:00 |
|
Golrokh Moattar
|
c898bc390e
|
Problems with AdminProjectTypePanel were fixed
|
2014-02-25 14:09:21 +01:00 |
|
leosu
|
5847d33210
|
fixed faulty test
|
2014-02-25 13:55:15 +01:00 |
|
leosu
|
738ee4be05
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 13:31:20 +01:00 |
|
leosu
|
d709d5ba30
|
fixed faulty test
|
2014-02-25 13:31:14 +01:00 |
|
|
|
3f8c5d987b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 13:26:18 +01:00 |
|
|
|
55ca5de080
|
Show feedback on delete.
|
2014-02-25 13:26:12 +01:00 |
|
|
|
8e350a8e4f
|
Switched from stale shitty model to detachable one.
|
2014-02-25 13:23:14 +01:00 |
|
|
|
060bb51a1c
|
Added workaround for Wicket and Hibernate interaction which caused setObject to never get called and the newly generated id to get cached. Now tries to fetch it on detach()
|
2014-02-25 13:18:16 +01:00 |
|
leosu
|
a2ffedf569
|
notification for activation and deactivation of project
|
2014-02-25 11:40:03 +01:00 |
|
|
|
b27089d570
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-25 11:05:44 +01:00 |
|
|
|
30ab319194
|
Sends created event when the seminar is created and change events when something changes.
|
2014-02-25 11:05:38 +01:00 |
|
|
|
4033406387
|
Shows create or update depending on if the seminar exists or not.
|
2014-02-25 10:59:19 +01:00 |
|
Golrokh Moattar
|
83f0f3dd9c
|
Suppress auto-wiring warning
|
2014-02-25 10:54:48 +01:00 |
|
