joha-asc
37f3b41aae
removed wall
...
Change-Id: Icd1a6c438ba89f6c880474019a4edb1ebaddcc53
2011-07-20 14:28:20 +02:00
joha-asc
520ce8b5b9
Panel for showing webnotifications
...
Change-Id: Ifca8d40e73a8fb17371456f3df7d2932c55961a2
2011-07-20 14:27:59 +02:00
joha-asc
c236d6addf
usiing the new notificationcontroller and mailproperties for mail
...
Change-Id: I22b79ea63b449c3179c94dff754043cc15e4ab1e
2011-07-20 14:25:45 +02:00
joha-asc
8a74bac9a6
using notificationcontroller
...
Change-Id: Ie9e4389df4adaddb3e23fae9e85ead3d51970aef
2011-07-20 14:25:11 +02:00
joha-asc
04d60a682d
genereal notificationscontroller
...
Change-Id: Iba569b8ab3bbfcce6a7a33d51e1da4a0ae864dca
2011-07-20 14:24:45 +02:00
joha-asc
4599a394ec
conference with notifications
...
Change-Id: I28ea22a0a8c5d74792f7f5e6a69125c9c0300b60
2011-07-20 14:24:09 +02:00
joha-asc
348c4cc2d4
settings for notification priority
...
Change-Id: I08af3a8627cac79f84ac1ab0ff0d606f3b9eb4e7
2011-07-20 14:23:45 +02:00
joha-asc
f79c13a645
Settings for notifications
...
Change-Id: I9f737750b5d15eab0ddc918016080833e0214f64
2011-07-20 14:23:24 +02:00
Fredrik Norberg
85480e30f2
daily commit
2011-07-19 16:56:15 +02:00
Marcus Höjvall
117f82eb45
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Done with upcomingEventPanel
events now order properly
Refactored some XML-related stuff to make it more reusable
daily commit
Removed checkbox for activating latest reviewers links since further work is needed on which reviews the students should have access to.
added support for inactivating/activating Latest Reviewers panel in General System Settings and Peer Administration
weekend commit
fixed an issue where a test behaved differently on windows and linux
Added upcomingeventpanel
Added support for activating/inactivating clickable links in Latest reviewers panel.
Minor changes in Latest reviewers panel and in the general system settings that the panel concern.
Added functionality to enable/disable Latest reviews-panel and to specify number of reviews to show.
Added a new panel that show the latest reviews in the peer portal
2011-07-19 12:17:16 +02:00
Marcus Höjvall
5e9d33b991
Worked on some design for edit levels in admin pages
2011-07-19 12:16:24 +02:00
Fredrik Norberg
d222f0c4cd
Merge branch 'activityplan' into develop
...
* activityplan:
Done with upcomingEventPanel
events now order properly
daily commit
weekend commit
Added upcomingeventpanel
2011-07-19 12:11:20 +02:00
Fredrik Norberg
3af8444d02
Merge branch 'master' into develop
...
* master:
fixed an issue where a test behaved differently on windows and linux
2011-07-19 12:09:35 +02:00
Fredrik Norberg
e698544c1c
Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/scipro
...
* 'master' of ssh://git.dsv.su.se/git/scipro/scipro:
Added unit tests for SSO and userlookup config, much more could be done with this config-checking stuff
2011-07-19 12:08:37 +02:00
Fredrik Norberg
00fa623880
merged with origin/dvelop
2011-07-19 12:01:45 +02:00
Fredrik Norberg
e842e1e543
Done with upcomingEventPanel
2011-07-19 11:49:28 +02:00
Fredrik Norberg
bfa5f8ad7c
events now order properly
2011-07-19 11:48:11 +02:00
Robin Eklund
fa63861f04
Merge branch 'refactor' into develop
2011-07-19 10:45:35 +02:00
Robin Eklund
50e0b1d61f
Refactored some XML-related stuff to make it more reusable
2011-07-19 10:44:52 +02:00
Emil Siverhall
770f87b600
Merge branch 'peer_reviewdate_feature' into develop
2011-07-19 09:00:02 +02:00
joha-asc
f4e948f89b
test for notifications and messageboards
...
Change-Id: I11536aa0e9fceaf45db34a0019517857925b4aa9
2011-07-18 17:10:16 +02:00
joha-asc
5b512e0f9d
notificationsPanel
...
Change-Id: Ib713fef22d523a26db1ac352e26d1ff19aea5c32
2011-07-18 17:09:50 +02:00
joha-asc
58176d349f
format fix
...
Change-Id: Ia40ca57e57af06fa8ea05a70bb88af34e044af36
2011-07-18 17:09:03 +02:00
joha-asc
aa0169db6a
messageboard dao
...
Change-Id: I8698b8c470aa293fcf39d51bf8e727c888c57443
2011-07-18 17:08:23 +02:00
joha-asc
70a8b32042
conference
...
Change-Id: Iaf75044a924eaccb4cb625901fa011542523dd90
2011-07-18 17:07:47 +02:00
joha-asc
b7f1427800
notificationPanel
...
Change-Id: I34d291c31a4799f5e216821dcae32508043dda28
2011-07-18 17:07:12 +02:00
joha-asc
8b26f4d9af
add notificationspanel
...
Change-Id: I7842245012b59773cc8fee67537be99374a168fb
2011-07-18 17:06:46 +02:00
joha-asc
49eb2dbba4
handles urls to rest sites
...
Change-Id: I19f9342bd601042a7daedf29b242f27a08303c8c
2011-07-18 17:06:26 +02:00
joha-asc
b1b38584cb
format fix
...
Change-Id: I802bae02ac8b7076096887e9044c08135652b86b
2011-07-18 17:05:46 +02:00
joha-asc
102296f842
removes private message and conference type
...
Change-Id: I703ba508a1365748bdc1f6aec22b78abd8aa0218
2011-07-18 17:05:16 +02:00
joha-asc
006f0236fa
Creates notifications
...
Change-Id: Icef65107d3e749457cdaf23c44f5544c95373eca
2011-07-18 17:04:31 +02:00
joha-asc
2970d73e73
propertiesfiles for notifications
...
Change-Id: I89621d99900053a492644370323e79cd8cd8f0b2
2011-07-18 17:03:57 +02:00
joha-asc
ece6ffacc9
conveinencemethod for creating notifications
...
Change-Id: I6bb184b1f6e084c65ebb75059390e9d8d65600bf
2011-07-18 17:01:37 +02:00
joha-asc
aac654c81d
Enums for handle notificationpriorities
...
Change-Id: I13493ea0e1675affe3ab92ff3e053138b4e1a0da
2011-07-18 17:00:11 +02:00
joha-asc
30887666ca
webnotification for scipro
...
Change-Id: I6e5e2126c9bcaf5eadcec416b6650872d2530c8d
2011-07-18 16:58:56 +02:00
Marcus Höjvall
5d5cf8b309
Merge branch 'develop' into dynmaic_project_classes
...
Conflicts:
src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminSettingsPage.java
2011-07-18 16:58:35 +02:00
joha-asc
4cc172b512
added a notificationpriority field
...
Change-Id: I4f45f106d3c8fa1ffebeb6182a4833957874a2d6
2011-07-18 16:58:35 +02:00
joha-asc
29726c28e3
added all messageboardclasses in one
...
Change-Id: I3c1a93a9d9a3c2e781e28c57fd232800aa6d11c6
2011-07-18 16:58:07 +02:00
Emil Siverhall
76699691ad
Merge branch 'develop' into peer_reviewdate_feature
2011-07-18 16:57:02 +02:00
joha-asc
136255e011
rename to webnotifications in method names
...
Change-Id: I98b6bf8ce7c334e56150398fd90b6793c758b615
2011-07-18 16:55:52 +02:00
joha-asc
7ff10415bc
renamed notification to webnotification, and added to methods
...
Change-Id: Iea4810e9a8296900079bd192cc03e6f2e1ceead1
2011-07-18 16:55:12 +02:00
joha-asc
cb5818e09b
Notification improvements with prioritychecks
...
Change-Id: Ib45e7ec440a65a01ed1b8620c4d1ebb3ef549804
2011-07-18 16:53:42 +02:00
joha-asc
ce9868d7a5
notification and rest interface
...
Change-Id: I1abe31b9371eff5015e0f326e6e6172823ed3aa1
2011-07-18 16:53:12 +02:00
Fredrik Norberg
7fb6513e4c
daily commit
2011-07-18 16:50:39 +02:00
Robin Eklund
c0f7316c49
Re-added hbm2ddl=auto, we'll need a better solution for this at some point.
2011-07-18 15:32:49 +02:00
Robin Eklund
1a5cce59f3
Merge branch 'master' into develop
2011-07-18 15:29:45 +02:00
Robin Eklund
d0162134e6
Merge branch 'release-2011-07-18'
2011-07-18 15:21:28 +02:00
Robin Eklund
82513a59e3
Added unit tests for SSO and userlookup config, much more could be done with this config-checking stuff
2011-07-18 13:36:35 +02:00
Emil Siverhall
3cc25ec7e9
Removed checkbox for activating latest reviewers links since further work is needed on which reviews the students should have access to.
2011-07-18 11:48:12 +02:00
Emil Siverhall
e95b332186
added support for inactivating/activating Latest Reviewers panel in General System Settings and Peer Administration
2011-07-18 09:45:13 +02:00
