golrokh
|
96c53d8d23
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-03 13:00:53 +01:00 |
|
golrokh
|
6fc396d765
|
in create final seminar, show language as selected only if one language exists
|
2014-11-03 13:00:45 +01:00 |
|
|
|
64751997e4
|
Changed some text related to group forum notifications and mail.
|
2014-11-03 12:50:41 +01:00 |
|
|
|
308f2a0b88
|
Fixed logger name.
|
2014-11-03 12:48:41 +01:00 |
|
fred-fri
|
8c7e4248de
|
removing unused stuff
|
2014-11-03 19:29:54 +09:00 |
|
fred-fri
|
f8fbb2ec47
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-03 19:28:07 +09:00 |
|
fred-fri
|
21cc320bde
|
removing unused stuff
|
2014-11-03 19:27:50 +09:00 |
|
|
|
5ab92ea9af
|
...
|
2014-11-03 11:24:35 +01:00 |
|
fred-fri
|
9e42aaf4ed
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-03 19:22:05 +09:00 |
|
fred-fri
|
7aa7c14200
|
refactoring services
|
2014-11-03 19:21:51 +09:00 |
|
|
|
a0383e17e3
|
Fixed CSS class for checkboxes.
|
2014-11-03 11:20:53 +01:00 |
|
fred-fri
|
e9dbe975dc
|
table rows per page position fix
|
2014-11-03 18:45:31 +09:00 |
|
fred-fri
|
4fe2d17167
|
no notification from supervisorapprovalpanel
|
2014-11-03 18:06:23 +09:00 |
|
fred-fri
|
42a34e4585
|
this is better
|
2014-11-03 17:49:24 +09:00 |
|
fred-fri
|
46a70d3df2
|
adding languages when creating supervisor
|
2014-11-03 17:47:25 +09:00 |
|
|
|
b2da968c10
|
Start of proper landing page.
|
2014-11-03 09:44:21 +01:00 |
|
fred-fri
|
082d3f69b8
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-11-03 17:17:10 +09:00 |
|
fred-fri
|
532a484700
|
final seminar statistics
|
2014-11-03 17:09:27 +09:00 |
|
fred-fri
|
b07e8db34f
|
final seminar statistics prep
|
2014-11-03 16:07:42 +09:00 |
|
|
|
88e9c03ffa
|
Fixed label position for all checkboxes as well.
|
2014-11-01 20:24:47 +01:00 |
|
|
|
0ce5e9be8f
|
Set label position in AjaxRadioChoice instead of every individual call site.
|
2014-11-01 20:16:52 +01:00 |
|
|
|
62d8ba348f
|
More fixes for RadioChoices after Bootstrap 3.3
|
2014-11-01 20:14:04 +01:00 |
|
|
|
1e06a1311e
|
Fixed some radio and checkbox groups after upgrading to Bootstrap 3.3
|
2014-11-01 16:51:12 +01:00 |
|
golrokh
|
4ae354c687
|
fix initializing gradingCriterionPoints
|
2014-10-31 12:19:34 +01:00 |
|
|
|
ced7bf6a58
|
Removed faulty CSS rules since the introduction of Bootstrap theme.
|
2014-10-31 12:16:22 +01:00 |
|
golrokh
|
f7243288ae
|
fix styling and description
|
2014-10-31 12:10:59 +01:00 |
|
golrokh
|
22544bccfe
|
Merge branch 'develop' into radioGroupForPointsInGrading
|
2014-10-31 11:25:12 +01:00 |
|
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 |
|
