|
|
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 |
|
|
|
fcffd98ad2
|
Merge branch 'notifications' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorNewIdeaStartPage.java
|
2012-12-14 14:14:29 +01:00 |
|
Niklas
|
906e31e3ed
|
Updated login parameters with LoginModule string.
|
2012-12-14 14:01:47 +01:00 |
|
|
|
7740a65d7b
|
allow editing of newly created seminars
|
2012-12-14 13:38:48 +01:00 |
|
|
|
68ab93703f
|
prevent deletion from causing NPE if panel stays open
|
2012-12-14 13:38:28 +01:00 |
|
|
|
a9562cea3b
|
forced flush or recipients do not get saved
|
2012-12-14 13:38:05 +01:00 |
|
|
|
52a6aceb48
|
replaced the old seminar panel that does not send out notifications with a one that does
|
2012-12-14 13:02:46 +01:00 |
|
|
|
fe47da084c
|
fixed a typo in a property name
|
2012-12-14 13:00:11 +01:00 |
|
|
|
12edde6c31
|
added head supervisor email
|
2012-12-14 12:12:13 +01:00 |
|
|
|
27c0858b62
|
added presentation/report language
improved visibility on components based on permissions and data availability
|
2012-12-14 12:05:05 +01:00 |
|
|
|
d0d2c5b34a
|
added presentation/report language and generate notification sources with the help of utils class
|
2012-12-14 12:03:22 +01:00 |
|
|
|
7317b3402d
|
minor improvements
|
2012-12-14 12:01:58 +01:00 |
|
|
|
dea26f5655
|
hide the panel if no CRUD operations are allowed
|
2012-12-14 11:56:09 +01:00 |
|
|
|
4f7a1b9d26
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-12-14 10:32:06 +01:00 |
|
|
|
3d8e2a6438
|
added link from project to projectdata to cascade deletions down to notifications if a project is removed
|
2012-12-14 10:27:51 +01:00 |
|
|
|
b6f196bf89
|
readded deleted jpa annotations
|
2012-12-14 10:14:03 +01:00 |
|
|
|
29285e9edc
|
fixed jpa annotations to prevent manually having to delete oppositions/participants
|
2012-12-14 10:13:19 +01:00 |
|
|
|
8af8a06865
|
added jpa mapping from finalseminar to seminardata to cascade deletion of notifications to prevent constraint errors when trying to delete a seminar with notifications sent out for it
|
2012-12-14 09:41:03 +01:00 |
|
Emil Siverhall
|
adb691353f
|
Merge branch 'infoMouseOvers' into develop
|
2012-12-14 09:36:56 +01:00 |
|
|
|
22afb36493
|
better jpa annotations for notification(data) to cascade deletions
|
2012-12-14 09:31:05 +01:00 |
|
Emil Siverhall
|
11290c522a
|
added info dialogs to first meeting date and room/channel
|
2012-12-14 09:26:48 +01:00 |
|
Emil Siverhall
|
f257c61a16
|
added new constructor to help icon dialog, to be able to customize the dialog width if desirable
|
2012-12-14 09:26:03 +01:00 |
|
