Jona Ekenberg
|
a457d867e0
|
fixed a small thing in markup
|
2012-12-27 22:43:35 +01:00 |
|
Jona Ekenberg
|
dadf11aa06
|
now the markup looks quite good
|
2012-12-27 22:41:07 +01:00 |
|
Jona Ekenberg
|
46c9440a79
|
changed some classes in ProjectNewIdeaSubmissionPanel.html
|
2012-12-27 21:58:50 +01:00 |
|
Jona Ekenberg
|
65b288227c
|
started changing some css in submissionpanel
|
2012-12-26 18:36:54 +01:00 |
|
Jona Ekenberg
|
452d2fe6c6
|
changed id of panel
|
2012-12-26 18:20:08 +01:00 |
|
Maryam Ammouri
|
96a6af2894
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-12-21 16:54:40 +01:00 |
|
Maryam Ammouri
|
58fd207265
|
last css push
|
2012-12-21 16:54:06 +01:00 |
|
|
|
efaa9a9c32
|
Merge branch 'notifications' into develop
|
2012-12-21 16:48:02 +01:00 |
|
|
|
5b171c6dd3
|
notifications for created, edited, deleted activity plans
|
2012-12-21 16:46:52 +01:00 |
|
Maryam Ammouri
|
b0d2ddb219
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-12-21 16:21:33 +01:00 |
|
Maryam Ammouri
|
5aedb795ce
|
final touches scipro
|
2012-12-21 16:20:04 +01:00 |
|
|
|
13e50db8e5
|
notifications for new checklists
|
2012-12-21 16:07:30 +01:00 |
|
|
|
8d2d497c78
|
removed all recipients for notifications about checklist answered due to spam potential
1 checklist with 10 questions for 2 project members would result in 20 notifications
|
2012-12-21 15:20:56 +01:00 |
|
|
|
a4a5ada904
|
added missing notificationcontroller bean
|
2012-12-21 15:20:07 +01:00 |
|
|
|
9154f183c1
|
readded the test since apitest seems to be working again
|
2012-12-21 15:19:41 +01:00 |
|
|
|
c231f48e3f
|
Merge branch 'notifications' into develop
|
2012-12-21 15:12:06 +01:00 |
|
|
|
233c85f182
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-12-21 15:11:41 +01:00 |
|
Emil Siverhall
|
86ae4cadfe
|
merge conflict from hotfix
|
2012-12-21 14:04:50 +01:00 |
|
Emil Siverhall
|
5c438092b4
|
Merge branch 'hotfix-20121221'
20121221
|
2012-12-21 13:59:57 +01:00 |
|
Emil Siverhall
|
1e2f63ea78
|
hotfix to change locale in production. to make date fields be formatted properly
|
2012-12-21 13:54:44 +01:00 |
|
Emil Siverhall
|
ee51e1235b
|
Merge branch 'ignoreTests' into develop
|
2012-12-21 13:43:08 +01:00 |
|
Emil Siverhall
|
2523af38a6
|
ignoring export tests for now since they get error from test api
|
2012-12-21 13:42:57 +01:00 |
|
|
|
795e7dac8e
|
notifications for checklist answers
|
2012-12-21 12:49:25 +01:00 |
|
|
|
da994e576b
|
all notification sources are now absolute urls
|
2012-12-21 12:46:46 +01:00 |
|
|
|
b091a69999
|
project crud panel now uses notificationutils class instead of generating urls on its own
|
2012-12-21 12:43:30 +01:00 |
|
|
|
a4d867eef3
|
notifications now uses absolute urls to fix bug with link containing many ../../../
this also allows links to be mailed out from the system
|
2012-12-21 12:41:49 +01:00 |
|
|
|
e22cd1e267
|
major refactoring of test classes to make writing tests more similar to normal junit tests with @Before instead of @Override setup_context()
also added mockito runner to ease the mock creation
|
2012-12-21 12:21:28 +01:00 |
|
|
|
ff0cec6558
|
added constants to help testing
|
2012-12-21 12:20:03 +01:00 |
|
|
|
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 |
|
