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 |
|
Emil Siverhall
|
91eee54e9c
|
updated current sql
|
2012-12-18 14:27:35 +01:00 |
|
Emil Siverhall
|
340a7c471a
|
added choice to publish idea or not when supervisors are submitting ideas
|
2012-12-18 14:27:32 +01:00 |
|
Emil Siverhall
|
3b796d1369
|
added published boolean to NewIdea object
|
2012-12-18 14:27:30 +01:00 |
|
Emil Siverhall
|
ecc0c53c3f
|
added info dialogs for title, description and prerequisites fields on supervisor idea submission page
|
2012-12-18 14:27:28 +01:00 |
|
|
|
5e4b58a3a9
|
Merge branch 'notifications' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/peer/pages/PeerRequestSubmissionPage.html
|
2012-12-18 11:32:27 +01:00 |
|
|
|
5edcd2161a
|
compilation mail now includes a link to the notifications page
added a editable scipro url to general system settings
|
2012-12-18 11:26:06 +01:00 |
|
|
|
af55ddf15a
|
mail compilation now only includes every unread notification once
|
2012-12-18 10:57:57 +01:00 |
|
|
|
c788f9f6e9
|
authors now display the students name instead of the object reference
|
2012-12-18 10:26:41 +01:00 |
|
|
|
c767f1babe
|
modified recipients for a peer review event
|
2012-12-18 10:24:28 +01:00 |
|
|
|
ab639464d8
|
added missing component so the page renders in DEV mode
|
2012-12-18 10:23:38 +01:00 |
|
|
|
fc3be4a3ba
|
changed requester name from a object.toString() to the actual users real name
|
2012-12-18 10:23:07 +01:00 |
|
|
|
9b7a85c0ea
|
removed old method for peer review comments
|
2012-12-17 16:29:36 +01:00 |
|
|
|
500275661d
|
formatting properties for peer related notifications
|
2012-12-17 16:28:41 +01:00 |
|
|
|
9485d7a095
|
added notification for peer review comments
|
2012-12-17 16:25:09 +01:00 |
|
|
|
9005e17ac7
|
added notification for peer review completed
|
2012-12-17 16:19:19 +01:00 |
|
|
|
f7ad243c28
|
removed old dead code
|
2012-12-17 16:18:13 +01:00 |
|
|
|
bb4e41f4e7
|
refactored to reduce duplicate code
|
2012-12-17 16:17:06 +01:00 |
|
|
|
4d20ed7174
|
moved recipient bit enums to notificationdata and renamed asString to userString to better communicate what it does
|
2012-12-17 15:22:07 +01:00 |
|
|
|
099c07dbd8
|
removed old and dead code
|
2012-12-17 15:05:46 +01:00 |
|
|
|
6ed6a48cc5
|
new posts on the project forums now generate notifications
|
2012-12-17 14:50:50 +01:00 |
|
Maryam Ammouri
|
a4ad6027e5
|
scipro markup and css changes
|
2012-12-17 14:36:31 +01:00 |
|
Maryam Ammouri
|
9eb32bae24
|
innan deploy
|
2012-12-17 14:15:59 +01:00 |
|
|
|
3325afc94a
|
Merge branch 'notifications' into develop
|
2012-12-17 14:13:59 +01:00 |
|
|
|
d9553962cf
|
removed dead code from notificationcontroller
|
2012-12-17 14:12:00 +01:00 |
|
Arian Jafari
|
d3c2187d76
|
Merge branch 'externallogin' into develop
|
2012-12-17 14:08:33 +01:00 |
|
|
|
461f197db7
|
added simple compilation properties for formatting into properties file
|
2012-12-17 14:01:58 +01:00 |
|
|
|
7e398aea94
|
output is now logger.info instead of system.out
|
2012-12-17 13:56:46 +01:00 |
|
Arian Jafari
|
799d02fc55
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into externallogin
Conflicts:
src/main/java/se/su/dsv/scipro/SciProSession.java
src/main/java/se/su/dsv/scipro/data/dataobjects/User.java
src/main/java/se/su/dsv/scipro/util/StringUtil.java
|
2012-12-17 12:49:06 +01:00 |
|
|
|
e567d27b43
|
gives some output from the worker as to what it did after running
|
2012-12-17 12:47:48 +01:00 |
|
|
|
11f440d8eb
|
notification compilation worker and its associated test
runs 1/day at 15:00
|
2012-12-17 12:42:20 +01:00 |
|
|
|
20d24672bc
|
made methods in abstractworker non-final since it prevented testing with mockito (cant stub final methods, need powermock or other bytecode testing framework)
|
2012-12-17 12:40:45 +01:00 |
|
|
|
5957efdb6b
|
updated test to new class names in objectmother
|
2012-12-17 12:36:39 +01:00 |
|
|
|
bf3d6e5acf
|
added method to fetch all unread notifications to the service class
|
2012-12-17 12:35:12 +01:00 |
|
|
|
c4db574c83
|
refactored method names to match those used by notificationData
|
2012-12-17 12:34:44 +01:00 |
|
Jona Ekenberg
|
1662d97c2b
|
changed the wording in the filterpanel
|
2012-12-17 11:59:23 +01:00 |
|
Arian Jafari
|
2eb913dc99
|
Finalizing external login work. Separate page for external users can be found at /external
|
2012-12-17 11:29:45 +01:00 |
|
Jona Ekenberg
|
2e0e6d793b
|
Merge branch 'makeSelectKeywordBeingAbleToBeBasedOnResearchArea' into develop
|
2012-12-17 11:22:54 +01:00 |
|
Jona Ekenberg
|
bb825a917a
|
updated all pages with FilterKeywordsPanel
|
2012-12-14 15:29:14 +01:00 |
|
Jona Ekenberg
|
291cd9e9e0
|
it now works as intended, keywords chooseable are based on the research area selected
|
2012-12-14 15:25:10 +01:00 |
|
Jona Ekenberg
|
6382c4322b
|
now redid some stuff and at least the clearing-part works when changing research area
|
2012-12-14 15:16:17 +01:00 |
|
Jona Ekenberg
|
d19df5abe3
|
now it became messed up again T_T
|
2012-12-14 15:11:24 +01:00 |
|
|
|
ec7b6e8ec5
|
mail events recipients do not play nice
now recipients get saved without flush and flush generates exceptions
its magic
|
2012-12-14 15:07:46 +01:00 |
|
|
|
ec804757e5
|
removed old history model
|
2012-12-14 14:48:44 +01:00 |
|
|
|
37dd790a0e
|
better aligning of notification settings
|
2012-12-14 14:48:28 +01:00 |
|
|
|
376f00838a
|
new sql tables
|
2012-12-14 14:48:13 +01:00 |
|
Jona Ekenberg
|
d818c9b221
|
FilterKeywordsPanel now has a clear-button
|
2012-12-14 14:38:41 +01:00 |
|
|
|
1c2c764347
|
new sql tables
|
2012-12-14 14:19:02 +01:00 |
|
