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 |
|
fred-fri
|
836e557436
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 15:31:06 +09:00 |
|
fred-fri
|
4c28e31766
|
added info about reports being visible to authors
|
2014-04-15 15:30:41 +09:00 |
|
Emil Siverhall
|
ef450c0bfc
|
removed bottom space
|
2014-04-15 08:29:31 +02:00 |
|
Emil Siverhall
|
aed9041558
|
switched sides
|
2014-04-15 08:28:49 +02:00 |
|
Emil Siverhall
|
820a1744e0
|
moved filter up a row
|
2014-04-15 08:16:13 +02:00 |
|
Golrokh Moattar
|
81c63c377a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-14 17:13:11 +02:00 |
|
Golrokh Moattar
|
2c6c20c389
|
GenericDataPanel used in Admin->Statistics->Peers (Peer requests)
|
2014-04-14 17:12:59 +02:00 |
|
Emil Siverhall
|
017031c656
|
yep
|
2014-04-14 16:47:18 +02:00 |
|
Golrokh Moattar
|
26694ffc30
|
GenericDataPanel used in Admin->Statistics->Peers (Peer reviews)
|
2014-04-14 16:39:49 +02:00 |
|
Emil Siverhall
|
e4a2d60aeb
|
yep yep
|
2014-04-14 16:38:55 +02:00 |
|
Emil Siverhall
|
d00629be98
|
supervisor change mail to specified addresses if head supervisor changed on a project
|
2014-04-14 16:29:43 +02:00 |
|
Golrokh Moattar
|
2ba0245d72
|
All data tables use class="table table-striped table-hover"
|
2014-04-14 16:13:46 +02:00 |
|
Golrokh Moattar
|
0a3cd75a53
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-14 15:45:58 +02:00 |
|
Golrokh Moattar
|
af6ac3e77b
|
GenericDataPanel used in Admin->Statistics->Supervisors ideas and projects
|
2014-04-14 15:45:48 +02:00 |
|
Emil Siverhall
|
aa6289de28
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-14 15:39:34 +02:00 |
|
Emil Siverhall
|
7ace73c133
|
minor styling changes to perform review
|
2014-04-14 15:39:21 +02:00 |
|
Golrokh Moattar
|
069b59c38e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-14 15:30:06 +02:00 |
|
Golrokh Moattar
|
8df93bcb67
|
GenericDataPanel used in Admin->Statistics->Units
|
2014-04-14 15:29:55 +02:00 |
|
Emil Siverhall
|
0c5748177d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-14 14:54:56 +02:00 |
|
Golrokh Moattar
|
bf88eb934b
|
GenericDataPanel used in Admin->Users->Roles
|
2014-04-14 14:49:08 +02:00 |
|
Emil Siverhall
|
6c8e782234
|
added auto complete filter for "from"
|
2014-04-14 14:41:35 +02:00 |
|
Emil Siverhall
|
0f9151bb03
|
replaced generic data panel on notifications tab
|
2014-04-14 14:19:00 +02:00 |
|
Richard
|
9e53116c3d
|
Removed "type" from Idea Type on admin -> match.
|
2014-04-14 12:27:43 +02:00 |
|
Richard
|
e32bd35006
|
Bootstrap help icon (questionmark) are now blue.
Added blue border around the help box.
Help box background is now white.
|
2014-04-14 12:26:33 +02:00 |
|
|
|
75f62448d3
|
Fixed so that multiple submissions are possible without reloading the page.
|
2014-04-11 14:55:31 +02:00 |
|
Richard
|
81b8099054
|
Header cleanup.
|
2014-04-11 11:11:06 +02:00 |
|
Richard
|
5dd7da2854
|
Header cleanup.
Moved role to the right.
|
2014-04-11 11:03:11 +02:00 |
|
Richard
|
c219e57541
|
Updated help text about language in peer requests and reviews.
|
2014-04-11 10:00:40 +02:00 |
|
