6349 Commits

Author SHA1 Message Date
Emil Siverhall
ae4562455f added admin tab to supervisor page as well 2014-04-23 14:53:29 +02:00
Emil Siverhall
83208ec935 Merge remote-tracking branch 'origin/develop' into develop 2014-04-23 14:42:33 +02:00
Emil Siverhall
1c0dbdfaae removed panels from project overview 2014-04-23 14:42:22 +02:00
Emil Siverhall
b672af90a4 admin module 2014-04-23 14:34:44 +02:00
Emil Siverhall
776ac48d24 styling, menu highlighting 2014-04-23 13:38:34 +02:00
Emil Siverhall
823cecde44 new page for phd admin 2014-04-23 13:21:29 +02:00
fred-fri
bc81917a59 removed unused pngs 2014-04-23 19:09:27 +09:00
fred-fri
ae2e75b2db removed deleted imageobject constants 2014-04-23 19:04:55 +09:00
fred-fri
c75ba70c7d removed deleted imageobjects 2014-04-23 19:02:31 +09:00
fred-fri
0eb318a8e0 fixed visibility 2014-04-23 18:53:25 +09:00
fred-fri
51df2def89 moved annual reviews out of add container 2014-04-23 18:45:12 +09:00
fred-fri
8a7bbe7692 removed duplicate basic contract stuff 2014-04-23 18:37:55 +09:00
fred-fri
3c719441d1 fixed basic contract form 2014-04-23 18:34:35 +09:00
fred-fri
b956e1fcb5 detach issue 2014-04-23 15:57:28 +09:00
Emil Siverhall
785046a914 Merge remote-tracking branch 'origin/develop' into develop 2014-04-23 08:16:50 +02:00
Emil Siverhall
8a999334cc issues 2014-04-23 08:16:24 +02:00
fred-fri
02e9051291 sonar issues 2014-04-23 15:16:16 +09:00
fred-fri
180097efa3 sonar issues 2014-04-23 15:13:41 +09:00
fred-fri
f009671547 visiblity fixes 2014-04-23 12:05:53 +09:00
Golrokh Moattar
431b22f0e5 styling fixed 2014-04-22 17:38:02 +02:00
c4855fd972 Added confirmation when deleting a file from an activity. 2014-04-22 17:01:42 +02:00
8f5bf075bf Extended session length. 2014-04-22 16:57:43 +02:00
f1e406db3a Removed link to norwegian ranking system. 2014-04-22 16:55:47 +02:00
d206e0d0ad Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 16:54:27 +02:00
06575285c2 Added PhD student news. 2014-04-22 16:54:22 +02:00
Golrokh Moattar
329a3e8a14 Study plan like Research plan 2014-04-22 16:36:08 +02:00
6a41ad31c3 Changed delete file text to delete icon. 2014-04-22 16:17:49 +02:00
8affccaa9d Fixed test 2014-04-22 16:16:37 +02:00
1c08984eaa Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 16:06:29 +02:00
60db4c1c97 Changed flag icon to bootstrap. 2014-04-22 16:06:22 +02:00
Golrokh Moattar
0aa230c1e3 Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 15:51:27 +02:00
Golrokh Moattar
9a76705a8c Wrong page redirection fixed 2014-04-22 15:50:54 +02:00
Emil Siverhall
c48465b517 Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 15:49:14 +02:00
Emil Siverhall
c76b9696ce activity plan uploads should not be deletable in files tab 2014-04-22 15:45:24 +02:00
Golrokh Moattar
a36e31b1d1 Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 15:40:04 +02:00
Golrokh Moattar
ee772f44dc Fixed the wrong title. Only 2 latest events show in Latest event panel. Right Project name when user clicks on forum post. Latest comes first. 2014-04-22 15:39:59 +02:00
bb1950f6c6 Removed "View all" link in the milestone summary. 2014-04-22 15:23:57 +02:00
f89e54b8e8 Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 15:09:55 +02:00
8935dca540 Research plan panel now toggles smoothly with javascript. 2014-04-22 15:09:49 +02:00
Emil Siverhall
174bd0162b Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 15:07:38 +02:00
Emil Siverhall
19c114a253 feedback when saving/deleting as well 2014-04-22 15:07:23 +02:00
9eb3d0f6bb Study plan panel now toggles smoothly with javascript. 2014-04-22 15:01:45 +02:00
Emil Siverhall
03927f1a59 feedback to external links panel, form is visible if errors exists, feedback messages tells what's wrong. 2014-04-22 15:00:42 +02:00
8727c2999a HTML fixes. 2014-04-22 14:52:02 +02:00
53b262ab91 Merge remote-tracking branch 'origin/develop' into develop 2014-04-22 14:46:45 +02:00
60008b231b Fixed styling of header. 2014-04-22 14:46:39 +02:00
Emil Siverhall
03bf645871 fixed excel export for not graded columns 2014-04-22 14:26:32 +02:00
2f0f2671a9 Changed name in header to a profile popup link. 2014-04-22 14:11:42 +02:00
2077469c9b Moved all modal <divs> to direct children of body to prevent style inheritance and generate valid markup. 2014-04-22 14:10:15 +02:00
Emil Siverhall
9c87ea51a1 added e-mail to supervisor in export of document 2014-04-22 14:03:18 +02:00