Golrokh Moattar
|
c9828fc37d
|
table styling
|
2014-04-15 15:55:25 +02:00 |
|
Golrokh Moattar
|
77840028ff
|
GenericDataPanel used in supervisor->all students ideas
|
2014-04-15 15:19:28 +02:00 |
|
Golrokh Moattar
|
3edcf1ff28
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 14:38:28 +02:00 |
|
Golrokh Moattar
|
3a925740d0
|
GenericDataPanel used in author->ideas
|
2014-04-15 14:34:06 +02:00 |
|
Emil Siverhall
|
f48a8b3dc6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 14:28:18 +02:00 |
|
Emil Siverhall
|
9282e8cfd2
|
activity plan uploads now counts as project files
|
2014-04-15 14:28:04 +02:00 |
|
fred-fri
|
b1e0098031
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 21:06:32 +09:00 |
|
fred-fri
|
8bd0d5c3fa
|
fixes
|
2014-04-15 21:06:16 +09:00 |
|
Golrokh Moattar
|
4a3ac4d286
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 13:52:04 +02:00 |
|
Golrokh Moattar
|
48527afcf1
|
GenericDataPanel used in Admin->Match->Keywords and Research areas->Research areas popup2
|
2014-04-15 13:50:17 +02:00 |
|
fred-fri
|
a87b850862
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 20:46:36 +09:00 |
|
fred-fri
|
bf91231a35
|
fixes
|
2014-04-15 20:46:20 +09:00 |
|
Golrokh Moattar
|
009446e012
|
fixing errors
|
2014-04-15 13:41:47 +02:00 |
|
Emil Siverhall
|
e81bc4df6d
|
FileSource.ACTIVITY_PLAN
|
2014-04-15 13:40:27 +02:00 |
|
Golrokh Moattar
|
215b0835d1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 13:35:28 +02:00 |
|
fred-fri
|
3aae6ee775
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java
|
2014-04-15 19:47:35 +09:00 |
|
fred-fri
|
4569453878
|
changed to infopanel
|
2014-04-15 19:44:46 +09:00 |
|
Golrokh Moattar
|
f657890ff3
|
GenericDataPanel used in Admin->Match->Keywords and Research areas->Research areas popup
|
2014-04-15 12:13:12 +02:00 |
|
Golrokh Moattar
|
47ed92053a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 12:00:58 +02:00 |
|
Emil Siverhall
|
ce8cd2b073
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 11:59:15 +02:00 |
|
Emil Siverhall
|
fb6563a348
|
deactivatable date picker to project management
|
2014-04-15 11:58:56 +02:00 |
|
Golrokh Moattar
|
febcdc2b0b
|
GenericDataPanel used in Admin->Match->Ideas->Match history
|
2014-04-15 11:57:17 +02:00 |
|
Golrokh Moattar
|
93d8304ab3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 11:42:52 +02:00 |
|
Golrokh Moattar
|
fdaee4a2a3
|
GenericDataPanel used in Admin->Statistics->Milestones
|
2014-04-15 11:42:03 +02:00 |
|
Emil Siverhall
|
a95ab9e615
|
date commenced -> commenced, date approved -> approved
|
2014-04-15 11:41:38 +02:00 |
|
Emil Siverhall
|
0f424bbc74
|
date created -> created
|
2014-04-15 11:34:21 +02:00 |
|
fred-fri
|
e705e7b6bf
|
changed to smartlinkmultilinelabel
|
2014-04-15 18:27:27 +09:00 |
|
Emil Siverhall
|
083fc3ddab
|
project -> title
|
2014-04-15 11:20:52 +02:00 |
|
Emil Siverhall
|
322054bcba
|
merge
|
2014-04-15 11:02:45 +02:00 |
|
Emil Siverhall
|
e38f563d44
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java
|
2014-04-15 11:02:31 +02:00 |
|
Emil Siverhall
|
c7d5150743
|
project title -> title
|
2014-04-15 11:02:12 +02:00 |
|
Golrokh Moattar
|
7bcb6dfcbb
|
Test fixed
|
2014-04-15 10:52:09 +02:00 |
|
Golrokh Moattar
|
83590db80b
|
GenericDataPanel used in Supervisor->All projects->Final seminars
|
2014-04-15 10:30:37 +02:00 |
|
Emil Siverhall
|
15a7c9d638
|
project type -> type
|
2014-04-15 10:18:04 +02:00 |
|
Emil Siverhall
|
aced12e6cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 10:15:03 +02:00 |
|
Emil Siverhall
|
7a2c0817b1
|
project type -> type
|
2014-04-15 10:14:52 +02:00 |
|
Golrokh Moattar
|
21c21e4ec6
|
Where ever we just need findAll and count, GenericDataProvider used instead of SortableDataProvider
|
2014-04-15 09:57:00 +02:00 |
|
Golrokh Moattar
|
2af033b500
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 09:51:39 +02:00 |
|
Golrokh Moattar
|
a6a7bc3309
|
GenericDataPanel used in Admin->System->Non working days
|
2014-04-15 09:51:30 +02:00 |
|
Emil Siverhall
|
c3ddd1ae43
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 09:48:31 +02:00 |
|
Emil Siverhall
|
cbdd5f8038
|
project type -> type
|
2014-04-15 09:48:21 +02:00 |
|
Emil Siverhall
|
8f3e5d250c
|
project type -> type
|
2014-04-15 09:46:28 +02:00 |
|
Emil Siverhall
|
51457f8b6d
|
project type -> type
|
2014-04-15 09:42:08 +02:00 |
|
Golrokh Moattar
|
5d93d9011f
|
GenericDataPanel used in Admin->Statistics->Ideas
|
2014-04-15 09:37:27 +02:00 |
|
Emil Siverhall
|
e2b0cfe624
|
project type -> type
|
2014-04-15 09:30:22 +02:00 |
|
fred-fri
|
848e2e6aa8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 16:24:53 +09:00 |
|
fred-fri
|
67a506ef37
|
improved error message with email
|
2014-04-15 16:24:38 +09:00 |
|
Emil Siverhall
|
06041a12ee
|
project type -> type
|
2014-04-15 09:23:26 +02:00 |
|
Emil Siverhall
|
c544cb7386
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 08:31:52 +02:00 |
|
Emil Siverhall
|
0389cc8412
|
added enclosure to hide the whole div when settings link isn't visible
|
2014-04-15 08:31:12 +02:00 |
|