fred-fri
|
4c07ced6b9
|
preventing projects that arent active from submitting peer review requests
|
2013-03-20 12:00:10 +09:00 |
|
fred-fri
|
4b0708dd97
|
added panel for peerrequestsubmission
|
2013-03-20 11:47:19 +09:00 |
|
fred-fri
|
69041e0077
|
Merge branch 'activity' into develop
|
2013-03-20 10:42:27 +09:00 |
|
fred-fri
|
c8e1b7bd85
|
fixed presentation a bit
|
2013-03-20 10:39:15 +09:00 |
|
Emil Siverhall
|
ee69b2bfb1
|
Merge branch 'release20130319'
20130319
|
2013-03-19 14:00:40 +01:00 |
|
Emil Siverhall
|
b2629cfe66
|
added new current.sql file
|
2013-03-19 13:57:07 +01:00 |
|
fred-fri
|
bb0ce96dc2
|
fixing fileviewdeletepanel and places where its used
|
2013-03-19 17:53:27 +09:00 |
|
fred-fri
|
9864cb9a41
|
removed duplicate statements from current.sql
|
2013-03-19 16:13:18 +09:00 |
|
fred-fri
|
9ad2623d40
|
fixed conflict
|
2013-03-19 12:08:51 +09:00 |
|
fred-fri
|
3f8ebaaefd
|
fixed conflict
|
2013-03-19 12:01:08 +09:00 |
|
fred-fri
|
7e93ccaca6
|
fixed merge conflicts
|
2013-03-19 11:46:02 +09:00 |
|
fred-fri
|
7805858ae0
|
cleanup
|
2013-03-19 11:21:52 +09:00 |
|
fred-fri
|
1d78ffb537
|
removed unnecessary in memory implementation
|
2013-03-19 11:21:36 +09:00 |
|
fred-fri
|
bd2c22feba
|
new sql that goes the other way too
|
2013-03-19 11:20:02 +09:00 |
|
fred-fri
|
7266b320d5
|
set cascade all on notifications notificationevent
|
2013-03-19 10:59:36 +09:00 |
|
Emil Siverhall
|
c00bdb077a
|
Merge branch 'mySettings' into develop
|
2013-03-18 12:47:58 +01:00 |
|
Emil Siverhall
|
0b0e132922
|
added unit tests for form submission on basic profile
|
2013-03-18 12:40:45 +01:00 |
|
Emil Siverhall
|
e2cc3fc339
|
case sensitive correction in current sql
|
2013-03-18 12:40:43 +01:00 |
|
Emil Siverhall
|
d1a6879ea3
|
removed some imports from deleted entities
|
2013-03-18 12:40:41 +01:00 |
|
Emil Siverhall
|
ca9388501a
|
added sql to remove notificationsettings tables
|
2013-03-18 12:40:39 +01:00 |
|
Emil Siverhall
|
2bf0b5faaa
|
moved mail compilation setting to user profile and removed notification settings entity
|
2013-03-18 12:40:37 +01:00 |
|
Emil Siverhall
|
419413bc71
|
text fix
|
2013-03-18 12:40:35 +01:00 |
|
Emil Siverhall
|
accc33f9cc
|
added create table to current.sql
|
2013-03-18 12:40:33 +01:00 |
|
Emil Siverhall
|
d9cf351584
|
moved feedback panel to prevent double feedback messages on other settings pages
|
2013-03-18 12:40:31 +01:00 |
|
Emil Siverhall
|
886697bd19
|
added form to update user profile domain object to the basic profile page
|
2013-03-18 12:40:29 +01:00 |
|
Emil Siverhall
|
ecb8ba2483
|
new domain objects with user profile settings
|
2013-03-18 12:40:27 +01:00 |
|
Emil Siverhall
|
c0d096a946
|
repo and service for user profiles
|
2013-03-18 12:40:25 +01:00 |
|
Emil Siverhall
|
36bca11062
|
labels for name and email added
|
2013-03-18 12:40:23 +01:00 |
|
Emil Siverhall
|
45d320e677
|
panel structure and test class for profile page
|
2013-03-18 12:40:21 +01:00 |
|
Emil Siverhall
|
e732ff12fd
|
renamde SettingsPage to BasicProfilePage to make it easier to find it
|
2013-03-18 12:40:19 +01:00 |
|
Emil Siverhall
|
5510048af4
|
more restructuring of settings pages and removed no longer user pages
|
2013-03-18 12:40:17 +01:00 |
|
Emil Siverhall
|
8ec0ad63d4
|
added my settings link next to notifications and new tab structure for settings pages
|
2013-03-18 12:40:15 +01:00 |
|
Emil Siverhall
|
c07ffc9c5d
|
removed unused page and panel
|
2013-03-18 12:40:13 +01:00 |
|
Emil Siverhall
|
6e5c3e1b9a
|
Merge branch 'watson' into develop
|
2013-03-18 09:46:31 +01:00 |
|
Emil Siverhall
|
831521d00e
|
removed popup dialog if students have unfinished watson boxes
|
2013-03-18 09:45:13 +01:00 |
|
Emil Siverhall
|
b73e3745ad
|
removed waiting for watson box status from idea columns
|
2013-03-18 09:43:18 +01:00 |
|
fred-fri
|
ea5ee3eb7d
|
sql run and commented out call to in memory delete method, but no cigar
|
2013-03-18 16:21:06 +09:00 |
|
fred-fri
|
0006109ec0
|
added sql statement which removes foreign key and constraint and recreates them with on delete cascade
|
2013-03-18 16:13:02 +09:00 |
|
fred-fri
|
b706860f58
|
same changes as a hotfix deployed to master
|
2013-03-18 14:13:44 +09:00 |
|
fred-fri
|
206af9fd26
|
changed peerrequestevents getproject method to prevent nullpointers introduced by expiredpeerrequestworker
|
2013-03-18 13:39:10 +09:00 |
|
fred-fri
|
6c3572c330
|
working on panel for nonworkdays
|
2013-03-18 10:48:59 +09:00 |
|
Emil Siverhall
|
99a9d42034
|
Merge branch 'testFix' into develop
|
2013-03-15 10:27:12 +01:00 |
|
Emil Siverhall
|
c4a4988879
|
fixed failing test
|
2013-03-15 10:26:49 +01:00 |
|
Emil Siverhall
|
cf00e4b179
|
Merge branch 'thesisReviewDO' into develop
|
2013-03-15 10:05:05 +01:00 |
|
Emil Siverhall
|
51c71e4e26
|
test fix
|
2013-03-15 10:04:41 +01:00 |
|
Emil Siverhall
|
abbbfb0ddf
|
added settings checkbox to final seminar settings page
|
2013-03-15 09:50:48 +01:00 |
|
Emil Siverhall
|
b4c49e1499
|
added feature toggle setting for thesis review module
|
2013-03-15 09:50:45 +01:00 |
|
Emil Siverhall
|
6072db9361
|
hiding deadline info for now since we dont have any notifications implemented yet
|
2013-03-15 09:50:43 +01:00 |
|
Emil Siverhall
|
6ee02da881
|
isOpponent and isActiveParticipant methods
|
2013-03-15 09:50:41 +01:00 |
|
Emil Siverhall
|
ca3decba27
|
added deadline information info box and hooked up the date model with the admin settings provided
|
2013-03-15 09:50:39 +01:00 |
|