fred-fri
|
dbcb1a6197
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-09-25 18:40:25 +09:00 |
|
fred-fri
|
5b637ba131
|
EVEN MORE SENSE
|
2014-09-25 18:39:45 +09:00 |
|
fred-fri
|
44f6423c3e
|
and even more
|
2014-09-25 18:24:17 +09:00 |
|
fred-fri
|
1653bc52c7
|
sense- this makes more
|
2014-09-25 18:17:26 +09:00 |
|
torgny
|
dc8d337135
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-09-25 10:47:22 +02:00 |
|
torgny
|
ea87160136
|
Glömde läsa kortet, nu är användarna sorterade med senast först...
|
2014-09-25 10:47:15 +02:00 |
|
fred-fri
|
0d281cd5d7
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-09-25 17:46:47 +09:00 |
|
fred-fri
|
7c7d1c3d7c
|
PUT DE KOKKI BAKK!
|
2014-09-25 17:46:00 +09:00 |
|
torgny
|
023f2bd61c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-09-25 10:37:37 +02:00 |
|
torgny
|
baaecad099
|
Made local users sortable.
|
2014-09-25 10:37:28 +02:00 |
|
|
|
c73d2566ac
|
It is now possible to specify an "anchor" named page parameter when redirecting and that will be set as the anchor on the page when it is loaded.
|
2014-09-25 10:28:26 +02:00 |
|
|
|
1a7e60f32a
|
Bunch of PO review fixes.
|
2014-09-25 10:28:26 +02:00 |
|
fred-fri
|
5aef729f00
|
test and page fixes
|
2014-09-25 16:58:23 +09:00 |
|
fred-fri
|
069010b1eb
|
fixed a test
|
2014-09-25 16:19:03 +09:00 |
|
fred-fri
|
93b9d92aee
|
refactoring this mess
|
2014-09-25 16:18:52 +09:00 |
|
fred-fri
|
4ffc42bb92
|
defaults in switches
|
2014-09-25 14:31:46 +09:00 |
|
fred-fri
|
244232a110
|
test fix
|
2014-09-25 13:35:12 +09:00 |
|
fred-fri
|
5a43f96e1e
|
default
|
2014-09-25 13:17:40 +09:00 |
|
fred-fri
|
ffd4724269
|
test fixes
|
2014-09-25 12:51:07 +09:00 |
|
fred-fri
|
f55ea44e3f
|
removing unused stuff
|
2014-09-25 12:09:09 +09:00 |
|
fred-fri
|
7c07227dfe
|
model fix
|
2014-09-25 12:04:11 +09:00 |
|
fred-fri
|
a374f59422
|
switch to stringubilder
|
2014-09-25 11:54:22 +09:00 |
|
fred-fri
|
385e0c7360
|
switch to stringubilder
|
2014-09-25 11:45:41 +09:00 |
|
fred-fri
|
efca04117e
|
sonar
|
2014-09-25 11:38:33 +09:00 |
|
fred-fri
|
6f87a6bdc5
|
sonar
|
2014-09-25 11:35:43 +09:00 |
|
fred-fri
|
0fa8184770
|
sonar
|
2014-09-25 11:05:12 +09:00 |
|
fred-fri
|
30c752639e
|
sonar
|
2014-09-25 10:59:48 +09:00 |
|
fred-fri
|
3526d4fb5e
|
sonar
|
2014-09-25 10:53:54 +09:00 |
|
fred-fri
|
1af13569ed
|
sonar
|
2014-09-25 10:29:22 +09:00 |
|
fred-fri
|
e2c995e540
|
sonar
|
2014-09-25 10:28:39 +09:00 |
|
|
|
3ee5e91a4a
|
Email is now set correctly when registering the first user.
|
2014-09-24 15:12:40 +02:00 |
|
golrokh
|
e903eaf1a9
|
set DEV profile to be active by default to prevent jira errors
|
2014-09-24 15:09:11 +02:00 |
|
|
|
da68ae430e
|
Fixed test by adding missing mock implementation.
|
2014-09-24 14:44:22 +02:00 |
|
|
|
1f33955cf0
|
Fixed some i18n.
|
2014-09-24 14:39:58 +02:00 |
|
|
|
212387891a
|
Saves the reason when supervisor creates final seminar without approval.
|
2014-09-24 14:30:09 +02:00 |
|
|
|
68e1a4c963
|
Merge remote-tracking branch 'origin/develop' into final_seminar_creation
|
2014-09-24 13:53:36 +02:00 |
|
|
|
55c511b68f
|
Implemented case when the reviewer has not reached a decision yet.
|
2014-09-24 13:46:34 +02:00 |
|
|
|
95484abc74
|
Implemented case when the reviewer denied the request.
|
2014-09-24 13:11:57 +02:00 |
|
|
|
591153b3e7
|
Minor refactoring.
|
2014-09-24 09:19:20 +02:00 |
|
|
|
7795dce142
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-09-23 16:39:21 +02:00 |
|
|
|
63a8c278b6
|
Fix2 Improved the Grading tab
|
2014-09-23 16:36:50 +02:00 |
|
golrokh
|
6c708e5b79
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-09-23 15:12:06 +02:00 |
|
golrokh
|
f7451870c0
|
Added forum notification in admin/notification settigns/general settings
|
2014-09-23 15:11:56 +02:00 |
|
|
|
48c7f39cbd
|
Fix Improved the Grading tab
|
2014-09-23 14:51:51 +02:00 |
|
|
|
5b2b2540c5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-09-23 13:54:44 +02:00 |
|
|
|
dedd75f90f
|
Improved the Grading tab
|
2014-09-23 13:54:09 +02:00 |
|
|
|
4b8b128f05
|
Bootstrapped-ified the forms for editing projects (admin and supervisor) as well as removed the hard-coded width of the AddUsersPanel, it is better to specify the width where the panel is used so it can fit in all situations.
|
2014-09-23 13:40:48 +02:00 |
|
|
|
7a4d0ff8d5
|
Bootstrapped-ified the final seminar form.
|
2014-09-23 13:13:10 +02:00 |
|
|
|
3e9e72faa6
|
Fixed some minor warnings.
|
2014-09-23 12:49:26 +02:00 |
|
golrokh
|
9ecb835096
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-09-23 12:42:32 +02:00 |
|
