|
|
d91f08e5cf
|
Merge branch 'feature/final_seminar_days_ahead_thesis' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.java
src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java
|
2013-02-26 17:12:26 +01:00 |
|
|
|
cb9006a086
|
Setting for specifying number of days ahead a thesis must be uploaded added to settings page.
|
2013-02-26 16:43:41 +01:00 |
|
|
|
df96196a2b
|
Days Service no longer counts weekends
|
2013-02-26 16:42:59 +01:00 |
|
|
|
b08fc276a9
|
Replaced thesis component in SeminarPanel
|
2013-02-26 15:41:38 +01:00 |
|
|
|
176799e681
|
Refactoring
|
2013-02-26 15:40:44 +01:00 |
|
|
|
fdf9ab369d
|
Convenience method to GeneralSystemSettingsService
|
2013-02-26 15:18:24 +01:00 |
|
|
|
1ee85049eb
|
Thesis download link now displays the file name.
Delete link is now a delete image.
|
2013-02-26 15:06:13 +01:00 |
|
|
|
f19e47fbc1
|
Added extra help constructor to ImageObject.
|
2013-02-26 15:05:50 +01:00 |
|
|
|
d0943def63
|
Delete link only shown for project supervisor and test to verify that behaviour.
|
2013-02-26 14:51:47 +01:00 |
|
|
|
22ad8741d3
|
Removed old invalid test since the link shows a custom dialog, not a javascript confirm()
|
2013-02-26 14:47:58 +01:00 |
|
|
|
525cf6b0a6
|
HTML changes
|
2013-02-26 14:46:45 +01:00 |
|
|
|
c740797657
|
New deadline information when deleting seminar thesis
|
2013-02-26 12:10:16 +01:00 |
|
|
|
1ad71e6b96
|
Popup title and cancel warning text if deadline has passed.
|
2013-02-26 12:07:54 +01:00 |
|
|
|
6cbcad33a6
|
Static text moved to external properties file
|
2013-02-26 11:58:54 +01:00 |
|
|
|
64fd7d31ae
|
Deadline date emphasized.
|
2013-02-26 11:53:17 +01:00 |
|
|
|
96a0658809
|
Deadline information now styled and with static content
|
2013-02-26 11:47:47 +01:00 |
|
|
|
cd63a0f447
|
Thesis component tries to update itself using AJAX if the file upload supported it.
|
2013-02-26 11:31:21 +01:00 |
|
|
|
596f00bbde
|
AbstractUploadForm now tries to use ajax for uploads but falls back if it is not available. The ajaxrequesttarget is sent to the onFinished callback. Check for potential nulls.
|
2013-02-26 11:24:14 +01:00 |
|
|
|
8e5c2eca44
|
FileDownloadLink is now better at determining its own visibility even for ajax uploads.
|
2013-02-26 11:22:50 +01:00 |
|
fred-fri
|
3d2944c173
|
fixed test error
|
2013-02-26 17:31:00 +09:00 |
|
fred-fri
|
fdc7dbf586
|
fixed tests
|
2013-02-26 17:25:59 +09:00 |
|
fred-fri
|
6d50019467
|
test stuff
|
2013-02-26 17:10:27 +09:00 |
|
fred-fri
|
464fd68bd3
|
final touches, adding test for page
|
2013-02-26 16:51:15 +09:00 |
|
fred-fri
|
e1e415371c
|
added filter for external and some final touches
|
2013-02-26 16:13:30 +09:00 |
|
fred-fri
|
9e2ca2d52f
|
overriding methods and rearranged filters
|
2013-02-26 15:37:34 +09:00 |
|
fred-fri
|
4d1f428959
|
added new project statistics page
|
2013-02-26 15:30:40 +09:00 |
|
fred-fri
|
310b415e80
|
added methods for discerning what to add
|
2013-02-26 15:02:35 +09:00 |
|
fred-fri
|
85bd2f4427
|
cleanup
|
2013-02-26 14:54:34 +09:00 |
|
fred-fri
|
62911f17a2
|
using arraylist instead of array
|
2013-02-26 14:54:09 +09:00 |
|
fred-fri
|
6189d3db10
|
changed a setvisible statement to setvisibilityallowed
|
2013-02-26 14:39:30 +09:00 |
|
fred-fri
|
161997e59f
|
removed if statements
|
2013-02-26 14:36:05 +09:00 |
|
fred-fri
|
55f4a2536c
|
changed from visible to enabled
|
2013-02-26 14:35:17 +09:00 |
|
fred-fri
|
b3961439d3
|
changed from visible to enabled
|
2013-02-26 14:06:49 +09:00 |
|
fred-fri
|
305776fe77
|
cleanup
|
2013-02-26 12:24:46 +09:00 |
|
fred-fri
|
4768ea3541
|
cleanup
|
2013-02-26 12:24:38 +09:00 |
|
fred-fri
|
549f5c5f3d
|
added panel to page
|
2013-02-26 12:24:08 +09:00 |
|
fred-fri
|
7f0afb3729
|
added new project data panel
|
2013-02-26 12:16:53 +09:00 |
|
|
|
42a1ce55a2
|
No butto and logic
|
2013-02-25 16:37:08 +01:00 |
|
Jona Ekenberg
|
6e224dbe4d
|
miniändring i forum.css
|
2013-02-25 16:33:29 +01:00 |
|
Jona Ekenberg
|
b03f730979
|
uppdaterat forummockupen
|
2013-02-25 16:10:13 +01:00 |
|
Jona Ekenberg
|
c2b211c83b
|
updated more on the forum m ockup
|
2013-02-25 15:55:21 +01:00 |
|
|
|
a1cbe89492
|
Hides cancel warning if deadline not lapsed
|
2013-02-25 15:40:04 +01:00 |
|
Jona Ekenberg
|
63aa2aad1c
|
Merge branch 'develop' into dubbelDUBBELmockup
|
2013-02-25 15:33:09 +01:00 |
|
Jona Ekenberg
|
2ad7a7beee
|
more updates to forummockup
|
2013-02-25 15:29:37 +01:00 |
|
|
|
c22127ee30
|
Deadline label shows date, not days left.
|
2013-02-25 15:24:19 +01:00 |
|
|
|
81f0b06a7e
|
Hides deadline label if passed.
|
2013-02-25 15:11:46 +01:00 |
|
|
|
7f0338f2b6
|
Dialog shows days to deadline
|
2013-02-25 15:02:31 +01:00 |
|
|
|
91069ca57f
|
workDaysUntil method
|
2013-02-25 14:52:04 +01:00 |
|
|
|
2d9176d1fb
|
Separate day calculation and model
|
2013-02-25 14:47:42 +01:00 |
|
|
|
efbd2fad6d
|
Days service
|
2013-02-25 14:34:59 +01:00 |
|
