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
Fredrik Norberg
546658093b
weekend commit
2011-07-15 16:34:22 +02:00
Fredrik Norberg
699ccb2eae
fixed an issue where a test behaved differently on windows and linux
2011-07-15 14:30:47 +02:00
joha-asc
92278f8427
Added logic to handle different webnotifications.
...
Change-Id: Ied056f8e1ae3d2baa7a24052e8bdfea3b7fdc41f
2011-07-15 13:03:40 +02:00
joha-asc
bc50d1be16
WebNotification
...
Change-Id: Iccb7b4dca2ab3cbf28e0b1a899b68fa51a886f05
2011-07-15 13:02:11 +02:00
joha-asc
0614f51425
added conference and notificaitpn
...
Change-Id: I5e53efb62b3062fddd4e599f72d8ab8437903f4f
2011-07-15 13:01:26 +02:00
joha-asc
7aa01ddca1
added a conferenecepanel
...
Change-Id: I4ebd7496f2063cbb4abd74531156ba09d1611e4d
2011-07-15 13:00:57 +02:00
joha-asc
982bea4355
Added a method for handling webnotifications, and som roles and types
...
to webnotificatiosndao
Change-Id: Ia2f6e3dc2b425463b04d3a637eee6d62fe2a53d6
2011-07-15 12:59:12 +02:00
joha-asc
0ddcc9e75d
Notificationcontroler call
...
Change-Id: Ieb54b0386287b80ea50787284fd93004488fef83
2011-07-15 12:58:24 +02:00
Emil Siverhall
a03cba66cb
Fixed merge conflicts in PeerPortalPanel-files
2011-07-15 10:23:18 +02:00
U-XeNote\Martin
5f95f27d8d
Merge branch 'local_develop'
2011-07-15 09:55:07 +02:00
