Emil Siverhall
|
1c4229834b
|
removed redundant container and unnecessary ajaxification from ViewChecklistTemplatePanel
|
2014-02-18 10:10:11 +01:00 |
|
|
|
8b2a27ad4c
|
Merge remote-tracking branch 'origin/develop' into improvement/files
|
2014-02-18 10:07:08 +01:00 |
|
|
|
247fa06efd
|
Jackrabbit is no more!
|
2014-02-18 10:04:41 +01:00 |
|
leosu
|
80d9b847b9
|
SeminarActiveParticipantsPanel first draft
|
2014-02-18 09:46:37 +01:00 |
|
Emil Siverhall
|
a357289a1f
|
moved checklist panels to checklists-package
|
2014-02-18 09:41:05 +01:00 |
|
|
|
8252ac2b7b
|
Removed the final dependency on jackrabbit.
|
2014-02-18 09:38:44 +01:00 |
|
|
|
3b9e257d41
|
Fixed test
|
2014-02-18 09:37:47 +01:00 |
|
Emil Siverhall
|
d158b69ce1
|
some refactoring to add checklists panel
|
2014-02-18 09:24:22 +01:00 |
|
|
|
51111fac81
|
Removed a bunch dependencies to jackrabbit.
|
2014-02-18 09:20:52 +01:00 |
|
Emil Siverhall
|
eb6439f0a8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-18 08:12:37 +01:00 |
|
fred-fri
|
6c6099a560
|
fixed test
|
2014-02-18 10:02:20 +09:00 |
|
Emil Siverhall
|
fa13118946
|
renamed ListChecklistTemplatePanel -> AddChecklistsPanel
|
2014-02-17 20:57:52 +01:00 |
|
Richard
|
71eae19a92
|
- Updated to Bootstrap 3.1.1
- Added bootstrap311.min.css.
- Minor changes to the bootstrap311.min.css file.
- Changed column size on footer.
|
2014-02-17 17:29:26 +01:00 |
|
|
|
523df0d0b4
|
Merge remote-tracking branch 'origin/develop' into improvement/files
|
2014-02-17 17:15:51 +01:00 |
|
|
|
834cc418c7
|
Files are now stored/retrieved on disk rather than in the database.
|
2014-02-17 17:14:28 +01:00 |
|
|
|
0010aa6ce9
|
Clean up.
|
2014-02-17 17:13:34 +01:00 |
|
Richard
|
269716a94c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:52:54 +01:00 |
|
Richard
|
c37c3608f5
|
Minor changes to the oppositionactiveparticipationpage.
|
2014-02-17 16:52:37 +01:00 |
|
Emil Siverhall
|
0a5f27dc14
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:43:08 +01:00 |
|
Emil Siverhall
|
71e0e8f356
|
removed checklistrole, addchecklistpanel and refactoring
|
2014-02-17 16:42:48 +01:00 |
|
leosu
|
26260441b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:25:11 +01:00 |
|
leosu
|
efb756ddb7
|
SeminarRespondentsPanel visibility logic
|
2014-02-17 16:25:02 +01:00 |
|
Golrokh Moattar
|
908b273c59
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:10:45 +01:00 |
|
Golrokh Moattar
|
53b3e93f47
|
In Internal users/Registration page, Username field removed and Email address started to be used as Username
|
2014-02-17 16:10:34 +01:00 |
|
leosu
|
dbf61fb828
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 16:08:06 +01:00 |
|
leosu
|
9709debcc0
|
SeminarRespondentsPanel feedback
|
2014-02-17 16:07:33 +01:00 |
|
Richard
|
581e0fe9dd
|
Added thesis instructions to the footer panel.
|
2014-02-17 16:06:52 +01:00 |
|
Emil Siverhall
|
b22e7207aa
|
fixed property models for ProjectPartner infoText/infotext
|
2014-02-17 16:05:12 +01:00 |
|
Emil Siverhall
|
9ada84313b
|
fixed Localizer#getString warning in TurnitinPanel
|
2014-02-17 15:55:25 +01:00 |
|
Emil Siverhall
|
532a5931b2
|
getString("upload.success")
|
2014-02-17 15:52:06 +01:00 |
|
Golrokh Moattar
|
80a8c8ed2a
|
In Internal users/Edit page, Username field removed and Email address started to use as Username
|
2014-02-17 15:41:28 +01:00 |
|
Emil Siverhall
|
426c30d0a7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 15:37:29 +01:00 |
|
leosu
|
4443f5d3b3
|
SeminarRespondentsPanel more stuff
|
2014-02-17 15:35:48 +01:00 |
|
Emil Siverhall
|
2299dfb602
|
removed old list checklist panel and implemented remove checklist properly
|
2014-02-17 15:35:18 +01:00 |
|
Emil Siverhall
|
b2baa8becb
|
allow remove checklist only if it isn't attached to an activity plan
|
2014-02-17 15:15:32 +01:00 |
|
leosu
|
09434835de
|
removed outdated test
|
2014-02-17 14:42:57 +01:00 |
|
leosu
|
1126939fe6
|
SeminarRespondentsPanel more stuff
|
2014-02-17 14:42:31 +01:00 |
|
leosu
|
17c79643e1
|
SeminarRespondentsPanel first draft
|
2014-02-17 14:35:46 +01:00 |
|
Emil Siverhall
|
b3e443f2d5
|
redirect to different view checklist page if supervisor or follower
|
2014-02-17 14:20:30 +01:00 |
|
leosu
|
00b4ca0eea
|
cleanup
|
2014-02-17 14:12:03 +01:00 |
|
Emil Siverhall
|
a42f43038b
|
author-> checklists not uses new panel to display current checklists of a project
|
2014-02-17 14:02:51 +01:00 |
|
leosu
|
cdafcc11a1
|
milestone checkbox always visible
|
2014-02-17 13:53:01 +01:00 |
|
leosu
|
5d02233345
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 13:42:38 +01:00 |
|
leosu
|
424092dca0
|
final thesis renaming
|
2014-02-17 13:42:34 +01:00 |
|
Golrokh Moattar
|
354a387ea2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-17 13:40:20 +01:00 |
|
|
|
2c35825ae8
|
Merge remote-tracking branch 'origin/develop' into improvement/files
Conflicts:
core/src/main/java/se/su/dsv/scipro/activityplan/facade/ProjectScheduleFacadeImpl.java
core/src/main/java/se/su/dsv/scipro/peer/PeerPortal.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/FileDescriptionServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/services/FileDescriptionService.java
core/src/main/java/se/su/dsv/scipro/springdata/services/FinalThesisService.java
view/src/main/java/se/su/dsv/scipro/repository/panels/AbstractFilePanel.java
|
2014-02-17 13:02:19 +01:00 |
|
fred-fri
|
7a970dfe2d
|
cleaning
|
2014-02-17 20:20:50 +09:00 |
|
fred-fri
|
5a83baa422
|
cleaning
|
2014-02-17 13:17:14 +09:00 |
|
fred-fri
|
12af6a00a1
|
refactoring to remove critical
|
2014-02-17 10:39:56 +09:00 |
|
fred-fri
|
9664ca99ee
|
refactoring to remove critical
|
2014-02-17 10:34:41 +09:00 |
|
