|
|
41c75380de
|
Merge branch 'notifications' into develop
|
2012-12-21 11:03:30 +01:00 |
|
|
|
2d924f0de1
|
new checklist page with simple rendering test
|
2012-12-21 11:01:56 +01:00 |
|
|
|
0f60084441
|
added page parameter constant to the relevant entity
|
2012-12-21 11:00:58 +01:00 |
|
Maryam Ammouri
|
a280554604
|
Merge branch 'develop' into ny_feature
|
2012-12-21 09:42:59 +01:00 |
|
Maryam Ammouri
|
2e0ad18a4f
|
infor sista pushen?
|
2012-12-21 09:41:29 +01:00 |
|
|
|
a2d52e5fee
|
the panel can now be collapsed/expanded/toggled from outside logic
|
2012-12-21 09:37:21 +01:00 |
|
|
|
649d1f7666
|
reusable component that toggles the visibility of a panel
|
2012-12-20 18:32:06 +01:00 |
|
|
|
5249a45b1d
|
included notificationservice in pagetest since the menu uses it to render how many unread notifications the user has
also support for custom pageparameters
|
2012-12-20 18:24:32 +01:00 |
|
|
|
d20b13ab2e
|
mocks are now protected so tests can extend them with more functionality if required
|
2012-12-20 18:21:46 +01:00 |
|
|
|
731974ca48
|
detachable model for domainobjects backed by a service
|
2012-12-20 18:19:01 +01:00 |
|
Maryam Ammouri
|
734dd7a704
|
icons, bugfixes, logofixes
|
2012-12-20 15:58:19 +01:00 |
|
Emil Siverhall
|
c430b11482
|
Merge branch 'finalSeminarError' into develop
|
2012-12-20 15:57:31 +01:00 |
|
Emil Siverhall
|
151797b43f
|
prevent NPE when trying to delete a final seminar with an uploaded document but no turnitincheck available
|
2012-12-20 15:57:13 +01:00 |
|
|
|
d680183f91
|
fixed spelling
|
2012-12-20 15:16:33 +01:00 |
|
Maryam Ammouri
|
bee381d91e
|
before push nr 2 with dmeopage
Merge branch 'develop' into ny_feature
|
2012-12-20 13:59:57 +01:00 |
|
Maryam Ammouri
|
da6ae21478
|
admin pages and some small changes and bugg,also there is a demopage now
|
2012-12-20 13:57:30 +01:00 |
|
Emil Siverhall
|
cc0278631c
|
Merge branch 'studentIdeaStartPage' into develop
|
2012-12-20 09:25:59 +01:00 |
|
Emil Siverhall
|
1484bd67a7
|
minor text correction
|
2012-12-20 09:25:04 +01:00 |
|
Emil Siverhall
|
97723a0074
|
changed size of info dialog on idea start page
|
2012-12-20 08:50:25 +01:00 |
|
Emil Siverhall
|
7be464c218
|
Merge branch 'studentLevelSelection' into develop
|
2012-12-19 15:15:04 +01:00 |
|
Emil Siverhall
|
493c1216fa
|
filtering when student select between all supervisor ideas now uses service method to retrieve available project levels. removed duplicated code
|
2012-12-19 15:10:36 +01:00 |
|
Emil Siverhall
|
12a6d298a7
|
student idea submission is now only available on the levels with open application periods
|
2012-12-19 15:05:02 +01:00 |
|
Emil Siverhall
|
4ea3319326
|
added new service method to retrieve project classes within the currently open application periods
|
2012-12-19 14:59:20 +01:00 |
|
Arian Jafari
|
15133e29c5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2012-12-19 14:42:54 +01:00 |
|
Arian Jafari
|
b201483836
|
Unknowingly removed User.toString() during merge. Readded.
|
2012-12-19 14:42:37 +01:00 |
|
Emil Siverhall
|
db5d64603c
|
changed language models way of force english language. instead of get(index) which could change, we now user service to retrieve Language.ENGLISH
|
2012-12-19 13:57:08 +01:00 |
|
Emil Siverhall
|
008a2ec1ad
|
Merge branch 'supervisorEditFix' into develop
|
2012-12-19 13:35:42 +01:00 |
|
Emil Siverhall
|
935e83af61
|
made sure supervisors isnt allowed to change to swedish after the idea is submitted once and then edited
|
2012-12-19 13:35:14 +01:00 |
|
Maryam Ammouri
|
254bbd97f1
|
get the demopage from emil
Merge branch 'develop' into ny_feature
|
2012-12-19 10:07:23 +01:00 |
|
Maryam Ammouri
|
2e9b37a278
|
fortsatte med markup efter första develope commiten, detaljändringar plus adminsidor
|
2012-12-19 09:58:40 +01:00 |
|
Emil Siverhall
|
43a8d26ef3
|
Merge branch 'englishOnlyForMaster' into develop
|
2012-12-19 09:42:52 +01:00 |
|
Emil Siverhall
|
81662cefb2
|
supervisors submitting a master idea may not choose swedish as language anymore
|
2012-12-19 09:37:15 +01:00 |
|
Emil Siverhall
|
364518221b
|
added method that retrieves Languages by name to services
|
2012-12-19 09:27:11 +01:00 |
|
Emil Siverhall
|
95f13d8141
|
Merge branch 'demoPage' into develop
|
2012-12-18 20:01:32 +01:00 |
|
Emil Siverhall
|
4ab5839705
|
mounted new demo page to scipro2/cssdemo
|
2012-12-18 20:01:12 +01:00 |
|
Emil Siverhall
|
44db47162e
|
added basepage for css demo that Maryam can use
|
2012-12-18 20:00:54 +01:00 |
|
|
|
1e52673ead
|
Merge branch 'notifications' into develop
|
2012-12-18 16:35:43 +01:00 |
|
|
|
237098c5b6
|
update the tab menu on top with unread notifications as they are (un)read
|
2012-12-18 16:35:11 +01:00 |
|
|
|
ca48174f17
|
Merge branch 'notifications' into develop
|
2012-12-18 15:54:14 +01:00 |
|
|
|
260b223e84
|
git now ignores the out folder
|
2012-12-18 15:53:35 +01:00 |
|
|
|
3e660d0535
|
simple test for checking if a page renders correctly both while logged in and not
|
2012-12-18 15:51:04 +01:00 |
|
|
|
473c23180c
|
test environment now supports logged users
|
2012-12-18 15:50:36 +01:00 |
|
|
|
7be633ccc5
|
notification menu tab now display number of unread notifications
|
2012-12-18 15:50:06 +01:00 |
|
|
|
d32066a4c0
|
no longer uses safetolongintservice as a spring injected service since it only contains a static method
|
2012-12-18 15:47:13 +01:00 |
|
|
|
2705f03c8d
|
working test environment
relevant reading; SciProTest and SeminarCRUDPanelTest for an implementation
|
2012-12-18 15:01:41 +01:00 |
|
|
|
c3c2e46c56
|
removed dead code
|
2012-12-18 15:01:08 +01:00 |
|
|
|
abf04ca1d2
|
changed access modifier to protected
|
2012-12-18 15:00:41 +01:00 |
|
Emil Siverhall
|
b946bfb90b
|
Merge branch 'createIdeaInfoPanels' into develop
|
2012-12-18 14:28:26 +01:00 |
|
Emil Siverhall
|
6fad45903d
|
removed language info dialog from supervisor idea submission page. the same info is already available in the level info dialog
|
2012-12-18 14:27:39 +01:00 |
|
Emil Siverhall
|
7178414b1e
|
students may now only choose supervisor ideas which are published
|
2012-12-18 14:27:37 +01:00 |
|
