16921 Commits

Author SHA1 Message Date
golrokh
05bb43a3cd Removed Description from GradingCriterion but kept it in Criterion because we need to keep history of descriptions we used in the opposition reports 2014-10-31 11:23:26 +01:00
656ea430ec Removed footer from the log in/log out pages. 2014-10-31 10:23:33 +01:00
9bddae6644 Reviewers final seminar notifications now always end up on the preliminary grading report tab if they use the landing page. 2014-10-31 09:54:47 +01:00
8b17ca128b Fixed logger to use the correct class. 2014-10-31 09:44:03 +01:00
302b70febb Refactored. 2014-10-31 09:43:38 +01:00
48a7492526 Removed old unused files. 2014-10-30 16:08:19 +01:00
a1d2d7fd1b Switched to proper bootstrap-theme with simple overrides for .well 2014-10-30 16:04:34 +01:00
golrokh
b952229a0b changed after technical review 2014-10-30 16:02:24 +01:00
4cdec2c8a9 Upgraded to jQuery 2 for modern browsers.
Deleted some old local copies of jQuery 1.
2014-10-30 15:32:09 +01:00
b7a33ea5db Upgraded to Bootstrap 3.3.0 (from 3.1.1) and switched to a CDN instead of local copies. 2014-10-30 15:31:04 +01:00
e88e66ba38 Fixed proper Bootstrap HTML for the filter form on Admin / Project management / Projects. 2014-10-30 15:11:30 +01:00
golrokh
b8e2d28b8b Merge branch 'develop' into radioGroupForPointsInGrading 2014-10-30 14:58:33 +01:00
1831e10fb4 Added default sorting by template number, it looked really weird without it. 2014-10-30 14:34:05 +01:00
golrokh
4e9515a615 sql sats for inseritng data to point template 2014-10-30 14:26:30 +01:00
ee70f090bd Added external room booking setting and it is shown on final seminar crud panel if it is set. 2014-10-30 12:51:26 +01:00
fred-fri
2dd8bd0f08 test fix 2014-10-30 14:06:17 +09:00
fred-fri
0d5e38dd04 added comment to approval requests 2014-10-30 14:02:34 +09:00
fred-fri
ad1022fbcb adding daisy link 2014-10-30 11:51:18 +09:00
fred-fri
a69417cca1 clarification 2014-10-30 10:56:28 +09:00
fred-fri
38bb710db9 adding languages 2014-10-30 10:27:57 +09:00
golrokh
ca761e48a8 Insert data into template point via script for the production servers, not completed yet 2014-10-29 16:46:43 +01:00
golrokh
a8216f3f0e Insert data into template point via script for the production servers 2014-10-29 15:09:40 +01:00
fred-fri
b92741c640 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2014-10-29 19:39:51 +09:00
fred-fri
644e09cc5e refactor 2014-10-29 19:35:21 +09:00
fred-fri
d44f2680a9 moving daisy stuff 2014-10-29 18:14:31 +09:00
35cb692cf9 If it is a list, treat it as a list. get(int) should never ever be called. 2014-10-29 10:01:38 +01:00
fred-fri
92778160d3 test 2014-10-29 17:48:21 +09:00
fred-fri
5a874b7ef1 removed br 2014-10-29 17:18:04 +09:00
fred-fri
bd78e10e01 pdf validation 2014-10-29 17:17:50 +09:00
fred-fri
724e9cd302 added ajax to firstmeeting 2014-10-29 15:08:34 +09:00
fred-fri
41a8c35d36 rename release-2014-10-29_03-09-05 2014-10-29 09:14:23 +09:00
golrokh
c9cd034ca5 final version 2014-10-28 15:09:49 +01:00
53af188834 Bootstrap CSS validation is now added on AJAX completion in addition to page load. 2014-10-28 13:18:27 +01:00
e7bee67ffb Fixed serialization warning. 2014-10-28 13:16:08 +01:00
5a60b59e2a Feedback is now shown on successful scheduling of the first meeting. 2014-10-28 13:11:43 +01:00
16a5e7beef Fixed problem when clicking save multiple times in the first meeting dialog.
If you need a detachable model but you do not have a DomainObject you can use DetachableModel and provide the proper persistence strategy.
2014-10-28 13:10:36 +01:00
golrokh
2d34b03f8b fix sql for inserting old data in the new table 2014-10-28 11:21:12 +01:00
d733bf7a04 Sigh 2014-10-28 11:20:58 +01:00
617a731965 So lazy about building test data. 2014-10-28 10:59:58 +01:00
dc5de3885c Fixed date filter in Admin / Unit / Statistics. 2014-10-28 10:49:45 +01:00
f02d8b878e Fixed AJAX behaviours for the Bootstrap date pickers. 2014-10-28 10:49:27 +01:00
f7cf026713 Moved the milestone activator related type class instances to the package object. 2014-10-28 10:31:37 +01:00
f5a69e4e0d [SCIPRO-20429] Fixed sorting problem. 2014-10-28 10:28:51 +01:00
53b778be83 Removed useless code. 2014-10-28 10:14:01 +01:00
da30aa975a Merge remote-tracking branch 'origin/develop' into develop 2014-10-28 10:11:49 +01:00
3afb6d34c3 Fix Sonar issues. 2014-10-28 10:11:43 +01:00
fred-fri
bae21e62d4 Merge remote-tracking branch 'origin/develop' into develop 2014-10-28 18:02:05 +09:00
fred-fri
db5e5a0529 plugin removed 2014-10-28 18:01:37 +09:00
6c265d48a3 Fix Sonar issues. 2014-10-28 09:58:37 +01:00
fred-fri
9bdda9565c simple stuff done 2014-10-28 17:48:01 +09:00