Golrokh Moattar
|
62e0d8ab02
|
daisyStartDate deleted from Project class and in all over the project dateCreated used instead
|
2014-02-21 16:58:54 +01:00 |
|
leosu
|
f3e0c2ba9f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-21 16:00:06 +01:00 |
|
leosu
|
14c98366c2
|
fixed NPE
|
2014-02-21 16:00:01 +01:00 |
|
Emil Siverhall
|
06baa5a5ec
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/data/dataobjects/FileDescription.java
view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java
|
2014-02-21 15:57:01 +01:00 |
|
Emil Siverhall
|
50895db80b
|
ProjectFilePanel now uses a data table instead of list view with weird sorting.. SortOrder is now gone as well
|
2014-02-21 15:50:08 +01:00 |
|
Richard
|
23fbca731c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-21 15:25:17 +01:00 |
|
Richard
|
86e64d23ae
|
Removed "Tabindex" from Bootstrap modal since it broke the autocomplete-inputs.
Removed CSS-classes belonging to the old modals.
|
2014-02-21 15:25:05 +01:00 |
|
leosu
|
c56ce9d51c
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/data/dataobjects/FinalSeminarOpposition.java
|
2014-02-21 15:17:25 +01:00 |
|
leosu
|
a844875dde
|
added the new sub panels for SeminarPanel to SeminarPanel
|
2014-02-21 15:16:27 +01:00 |
|
|
|
ff4a9f9ab8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-21 14:57:26 +01:00 |
|
|
|
96e9f993b0
|
Changed to GenericDataPanel2 to get rows/page choice.
|
2014-02-21 14:54:35 +01:00 |
|
|
|
ee4cc67c2d
|
Created GenericDataPanel2 if you prefer to work with IDataProvider instead of abstract methods.
|
2014-02-21 14:53:54 +01:00 |
|
|
|
d74b16fb4c
|
Improved constructor arguments of AjaxDropDownChoice to be less restrictive.
|
2014-02-21 14:27:12 +01:00 |
|
Golrokh Moattar
|
d3a0aa84bb
|
URLs and Emails are clickable in the Forum page
|
2014-02-21 13:54:16 +01:00 |
|
|
|
a67ee0fba4
|
Changed default sort order.
|
2014-02-21 13:32:57 +01:00 |
|
Golrokh Moattar
|
3f74bd2ec3
|
Show Feedback message when project updated
|
2014-02-21 13:30:51 +01:00 |
|
fred-fri
|
549de8ba59
|
fixing issues
|
2014-02-21 20:05:16 +09:00 |
|
Emil Siverhall
|
b242993fb6
|
pass page parameters to setResponsePage to keep sorting..
|
2014-02-21 10:53:30 +01:00 |
|
fred-fri
|
6214ee443e
|
fixing style issues
|
2014-02-21 18:40:21 +09:00 |
|
fred-fri
|
8a670c1bb5
|
adding phd stuff
|
2014-02-21 16:29:05 +09:00 |
|
fred-fri
|
145a843674
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-21 15:56:18 +09:00 |
|
fred-fri
|
afa124ae36
|
adding phd stuff
|
2014-02-21 15:55:51 +09:00 |
|
Emil Siverhall
|
2bd88754a0
|
delete link not visible if not file uploader
|
2014-02-20 20:29:04 +01:00 |
|
Emil Siverhall
|
0a291886bc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 20:21:45 +01:00 |
|
Emil Siverhall
|
15f0f5a4f8
|
No more AbstractFilePanel
|
2014-02-20 20:21:38 +01:00 |
|
Emil Siverhall
|
b27b1a44df
|
deletable always true in WicketProjectFileUpload
|
2014-02-20 20:07:32 +01:00 |
|
Golrokh Moattar
|
fd281f81a2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 17:06:09 +01:00 |
|
Golrokh Moattar
|
a0efc43864
|
just a small change for a better code
|
2014-02-20 17:05:54 +01:00 |
|
Golrokh Moattar
|
ddf7031c3a
|
Test method for deletion added
|
2014-02-20 17:03:13 +01:00 |
|
Emil Siverhall
|
476837714f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 16:53:58 +01:00 |
|
Emil Siverhall
|
b7a17278fc
|
failing test..
|
2014-02-20 16:51:45 +01:00 |
|
Emil Siverhall
|
746be07c36
|
delete link in file list
|
2014-02-20 16:45:08 +01:00 |
|
|
|
4735114514
|
Fixed closing of dialog.
|
2014-02-20 16:23:00 +01:00 |
|
leosu
|
e74455c681
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 15:43:40 +01:00 |
|
leosu
|
077e2e2b59
|
fixed failing tests
|
2014-02-20 15:43:30 +01:00 |
|
Emil Siverhall
|
3dfa7193f0
|
files uploaded through files tab sets deletable = true
|
2014-02-20 15:23:21 +01:00 |
|
Golrokh Moattar
|
06bab82ab9
|
Test class added
|
2014-02-20 15:22:42 +01:00 |
|
Golrokh Moattar
|
4576a132f3
|
Code reviewed and fixed
|
2014-02-20 15:13:54 +01:00 |
|
Richard
|
9ab9ea077c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 15:13:41 +01:00 |
|
Richard
|
cbd1c321b3
|
Minor changes to the AdminEditChecklistTemplatePage.
Replaced "Reviewer" with "Peer review completed by:" on the ReviewPageReviewDetailsPanel
|
2014-02-20 15:13:19 +01:00 |
|
leosu
|
ad780ebcd3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 14:49:39 +01:00 |
|
leosu
|
76bddfcf88
|
ESCAPEABLE MODAL WINDOWS :D :D :D
|
2014-02-20 14:49:32 +01:00 |
|
Golrokh Moattar
|
966b391b9a
|
Code reviewed and fixed
|
2014-02-20 14:40:18 +01:00 |
|
|
|
2782ef6fe4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 14:30:50 +01:00 |
|
|
|
9dee342ded
|
Made the final dialog bootstrap.
|
2014-02-20 14:30:44 +01:00 |
|
leosu
|
e41fde1441
|
moved things being checked in view to where they belong
|
2014-02-20 13:38:35 +01:00 |
|
leosu
|
15585cc747
|
moved things being checked in view to where they belong
|
2014-02-20 12:02:14 +01:00 |
|
Golrokh Moattar
|
efba1a428c
|
SupervisorEditProjectPanel overwritten, does not use AbstractCRUD anymore
|
2014-02-20 11:53:00 +01:00 |
|
Richard
|
72c3e69db3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 11:22:13 +01:00 |
|
Richard
|
3f654ea813
|
Minor design changes to the peer-pages.
|
2014-02-20 11:21:50 +01:00 |
|
