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 |
|
Emil Siverhall
|
f0a79cb819
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 12:20:17 +01:00 |
|
Emil Siverhall
|
cafe386836
|
suppress warnings
|
2014-02-20 12:19:15 +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 |
|
leosu
|
02f8c8e38d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 11:52:09 +01:00 |
|
leosu
|
828306d655
|
formatting
|
2014-02-20 11:34:20 +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 |
|
Emil Siverhall
|
ff7ce46795
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 11:19:10 +01:00 |
|
Emil Siverhall
|
1bcb7f6c3d
|
cleanup
|
2014-02-20 11:18:44 +01:00 |
|
Golrokh Moattar
|
fdd2ae1eeb
|
1-Test cases implemented for SupervisorEditProjectPanel
2-Edit page changed, extra info deleted
|
2014-02-20 10:50:58 +01:00 |
|
Emil Siverhall
|
7c7b9b7dfe
|
removed unused service field
|
2014-02-20 10:34:38 +01:00 |
|
Golrokh Moattar
|
ac595b7b87
|
Test cases implemented for SupervisorEditProjectPage
|
2014-02-20 10:06:08 +01:00 |
|
Richard
|
ad957c1259
|
Merge remote-tracking branch 'origin/develop' into develop
release-2014-02-20_10-05-22
|
2014-02-20 09:47:01 +01:00 |
|
Richard
|
05904321aa
|
Changed default rows per page on AdminMailLogPage to 20.
|
2014-02-20 09:45:47 +01:00 |
|
Emil Siverhall
|
82dbeb8714
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 09:44:10 +01:00 |
|
Emil Siverhall
|
549f6916f4
|
distinct count on author statistics
|
2014-02-20 09:43:38 +01:00 |
|
Richard
|
0a8807c43e
|
Changed participants to authors on AdminAuthorStatisticsPage
|
2014-02-20 09:23:44 +01:00 |
|
Golrokh Moattar
|
eeba72ed27
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-20 09:04:17 +01:00 |
|
fred-fri
|
d837051fbf
|
Merge branch 'phd' into develop
|
2014-02-20 15:42:30 +09:00 |
|
fred-fri
|
7cab3a5ec3
|
refactoring
|
2014-02-20 15:41:11 +09:00 |
|
Golrokh Moattar
|
2391a3a9c4
|
Test classes created
|
2014-02-19 17:11:50 +01:00 |
|
Emil Siverhall
|
e453d8e795
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 16:57:40 +01:00 |
|
Emil Siverhall
|
52b0d45840
|
IdeaParticipation toString issues, datatables + excel exports
|
2014-02-19 16:57:25 +01:00 |
|
|
|
4056e253b8
|
Made filter save between page changes in admin mail log.
|
2014-02-19 16:39:35 +01:00 |
|
|
|
2ba6238baa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 16:31:56 +01:00 |
|
|
|
245975c242
|
Fixed display of schedule template names in drop down and made it work with a detachable model.
|
2014-02-19 16:31:51 +01:00 |
|
Emil Siverhall
|
2e58d2f953
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 16:29:02 +01:00 |
|
Emil Siverhall
|
839ed709dd
|
keyword toString issues
|
2014-02-19 16:28:45 +01:00 |
|
|
|
5773eb520d
|
Made ListAdapterModel work with any Iterable<E>
|
2014-02-19 16:24:13 +01:00 |
|
|
|
09259188c7
|
Removed circular toString which caused stack overflow.
|
2014-02-19 16:23:53 +01:00 |
|
|
|
bde47c2dad
|
Changed import from junit 3 to 4.
|
2014-02-19 15:53:59 +01:00 |
|
|
|
71284b6772
|
Removed stupid print.
|
2014-02-19 15:52:01 +01:00 |
|
leosu
|
47350bfedf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 15:50:28 +01:00 |
|
leosu
|
d74839fc00
|
fixed deleting oppositions with reports
|
2014-02-19 15:50:20 +01:00 |
|
Emil Siverhall
|
cab1baf9fc
|
changes to recipient of idea export fail mail
|
2014-02-19 15:32:50 +01:00 |
|
Emil Siverhall
|
d7733b3f79
|
removed redundant feedback panel
|
2014-02-19 15:23:53 +01:00 |
|
Emil Siverhall
|
a8573955c2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 15:22:26 +01:00 |
|
|
|
43707b2879
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-19 15:22:24 +01:00 |
|
|
|
9a9ee54b11
|
Fixed errors.
|
2014-02-19 15:22:19 +01:00 |
|
Emil Siverhall
|
a629af037a
|
sql migration scripts for removing all checklists with supervisor only connection
|
2014-02-19 15:20:54 +01:00 |
|
leosu
|
d7867cc0a7
|
download stuff
|
2014-02-19 14:55:32 +01:00 |
|
Golrokh Moattar
|
8449a8f9ec
|
Added more fields to SupervisorEditProjectPanel
|
2014-02-19 14:55:26 +01:00 |
|
leosu
|
355530924d
|
upload stuff
|
2014-02-19 14:45:11 +01:00 |
|
