fred-fri
|
65ac655d06
|
added notification to peer reviewers supervisor about completed review
|
2013-04-16 11:40:16 +09:00 |
|
|
|
e76d34b68a
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-04-15 09:08:27 +02:00 |
|
fred-fri
|
e42684be21
|
added setread
|
2013-04-15 15:06:10 +09:00 |
|
|
|
ff44371f2d
|
Merge branch 'develop' into feature/non_workday_hookup
|
2013-04-12 16:15:23 +02:00 |
|
|
|
23caf7bb44
|
Un-ignored tests, API is up and running
|
2013-04-12 16:13:51 +02:00 |
|
Emil Siverhall
|
a7a44f5dc0
|
Merge branch 'feature/forum/attachments' into develop
|
2013-04-12 15:02:15 +02:00 |
|
Emil Siverhall
|
3d5e26ae00
|
line break
|
2013-04-12 15:01:54 +02:00 |
|
Emil Siverhall
|
20fa8b0ef7
|
added attachment upload to replies as well
|
2013-04-12 14:48:07 +02:00 |
|
Emil Siverhall
|
4cc923354e
|
fixed merge conflicts
|
2013-04-12 13:43:41 +02:00 |
|
fred-fri
|
65e0e276cd
|
added test
|
2013-04-12 18:35:47 +09:00 |
|
fred-fri
|
a153a06ce1
|
added readonly false to method
|
2013-04-12 18:25:50 +09:00 |
|
fred-fri
|
0ecbd72c4b
|
fixed a test
|
2013-04-12 18:18:45 +09:00 |
|
fred-fri
|
ac8f2e55a5
|
minor cleanup
|
2013-04-12 18:15:21 +09:00 |
|
fred-fri
|
a137fc0ccd
|
fixed conflicts
|
2013-04-12 18:08:47 +09:00 |
|
fred-fri
|
9292680dde
|
fixed fragment visibility bug
|
2013-04-12 15:40:27 +09:00 |
|
fred-fri
|
46923f8bdd
|
made replies thread centric
|
2013-04-12 15:37:41 +09:00 |
|
fred-fri
|
5b08fcf894
|
Merge branch 'release20130412b'
20130412b
|
2013-04-12 12:17:01 +09:00 |
|
fred-fri
|
5609ada7ee
|
forced to add @ignore to tests because api returns 500 on all calls
|
2013-04-12 12:16:15 +09:00 |
|
fred-fri
|
51248df6ae
|
Merge branch 'release20130412'
20130412
|
2013-04-12 11:46:15 +09:00 |
|
fred-fri
|
513739b759
|
added new sql file
|
2013-04-12 11:45:19 +09:00 |
|
fred-fri
|
81734414b3
|
cleanup
|
2013-04-12 11:23:16 +09:00 |
|
Emil Siverhall
|
53db015d78
|
Merge branch 'state_mouseover' into develop
|
2013-04-11 22:00:01 +02:00 |
|
Emil Siverhall
|
14246cbea0
|
added mouseover info text to Project state header as well
|
2013-04-11 21:58:51 +02:00 |
|
Emil Siverhall
|
0657a92b15
|
added mouseover texts to state icons in the table overview
|
2013-04-11 21:58:48 +02:00 |
|
|
|
75444c67e2
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-04-11 16:16:41 +02:00 |
|
|
|
e47415c595
|
Supervisor forum page
|
2013-04-11 16:16:32 +02:00 |
|
|
|
db67bfdd41
|
Implementation of NonWorkDayPeriodService#isNonWorkDay(Date)
|
2013-04-11 15:53:16 +02:00 |
|
Emil Siverhall
|
fafe36f5ba
|
Merge branch 'thesis_review_examiner_cancel' into develop
|
2013-04-11 13:41:43 +02:00 |
|
Emil Siverhall
|
15584c190e
|
serialization problems still occur, skipping extra test for now
|
2013-04-11 13:23:29 +02:00 |
|
Emil Siverhall
|
c23381522b
|
serialization issues..
|
2013-04-11 13:23:27 +02:00 |
|
Emil Siverhall
|
2a521c94ae
|
added cancel button to examiner thesis review dialog
|
2013-04-11 13:23:25 +02:00 |
|
|
|
bfb689b809
|
Made forum page only accessible to sys admins
|
2013-04-11 12:54:06 +02:00 |
|
|
|
1b13a72362
|
Test (existing implementation) for overlapping weekends and non-work days
|
2013-04-11 11:08:23 +02:00 |
|
|
|
9e182d15dc
|
Test (existing implementation) for days until with non work days
|
2013-04-11 11:06:05 +02:00 |
|
|
|
21d6b49c23
|
Implementation for days until over a weekend
|
2013-04-11 11:03:37 +02:00 |
|
|
|
9c1288e03a
|
Test for days until over a weekend
|
2013-04-11 11:03:28 +02:00 |
|
|
|
1065264fca
|
Implementation for days until weekend
|
2013-04-11 10:57:01 +02:00 |
|
|
|
7fdb509384
|
Test for days until over weekend
|
2013-04-11 10:56:46 +02:00 |
|
|
|
b551479d4d
|
Added new service method that calculates work days until a given date from another date
|
2013-04-11 10:50:46 +02:00 |
|
|
|
5870df4b32
|
More tests
|
2013-04-11 10:47:51 +02:00 |
|
|
|
e3bdefd8f7
|
Refactored test
|
2013-04-11 10:42:28 +02:00 |
|
|
|
159d9cdda3
|
Removed already deployed table from current sql
|
2013-04-11 10:18:47 +02:00 |
|
|
|
1232d05793
|
Tables in the wrong order in current.sql
|
2013-04-11 10:14:27 +02:00 |
|
|
|
a8eb29e534
|
Renamed tests to clarify what they are testing
|
2013-04-11 10:13:23 +02:00 |
|
|
|
82d9210e0f
|
Implementation for non work days
|
2013-04-11 10:12:43 +02:00 |
|
|
|
b51daa3364
|
Test for non work days
|
2013-04-11 10:02:59 +02:00 |
|
|
|
24f37ae3e5
|
Rewrote test to test for only weekends
|
2013-04-11 09:53:20 +02:00 |
|
|
|
5274beb507
|
Added service method for checking if a date is a non work day
|
2013-04-11 09:47:34 +02:00 |
|
|
|
9e1ddd98d8
|
Added dependency on non work day service
|
2013-04-11 09:46:09 +02:00 |
|
|
|
66527e5fc8
|
Removed HTTP response code from exception message
|
2013-04-11 09:19:44 +02:00 |
|
