Emil Siverhall
|
e7187d110b
|
Merge branch 'breadcrumbs' into develop
20121204
|
2012-12-04 12:41:36 +01:00 |
|
Emil Siverhall
|
285d29858a
|
reintroduced the breadcrumbs and made tab highlighting work on all new idea pages
|
2012-12-04 12:41:21 +01:00 |
|
Jona Ekenberg
|
d0652436d3
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-12-04 12:03:31 +01:00 |
|
Emil Siverhall
|
db970368ce
|
Merge branch 'areaOrderFix' into develop
|
2012-12-04 12:01:12 +01:00 |
|
Emil Siverhall
|
dad66f3600
|
research areas should be in alphabetical order when students submitting ideas as well
|
2012-12-04 12:01:00 +01:00 |
|
Jona Ekenberg
|
edd21f9c39
|
Merge branch 'addedResearchAreaInfo' into develop
|
2012-12-04 11:52:42 +01:00 |
|
Jona Ekenberg
|
33fb5fdbfa
|
added link to researcharea info
|
2012-12-04 11:52:27 +01:00 |
|
Emil Siverhall
|
9038a0cc63
|
Merge branch 'deployFix_20121204' into develop
|
2012-12-04 11:17:24 +01:00 |
|
Emil Siverhall
|
b70eafc09b
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-12-04 11:17:04 +01:00 |
|
Emil Siverhall
|
d3765b71f1
|
moved author info to its own panel since we dont want this with supervisor ideas that are still unmatched. no authors created lazy init exceptions on the participation objects
|
2012-12-04 11:16:23 +01:00 |
|
Jona Ekenberg
|
f6ab5e5400
|
changed the rest
|
2012-12-04 10:59:34 +01:00 |
|
Jona Ekenberg
|
f209524761
|
changed some
|
2012-12-04 10:52:44 +01:00 |
|
Emil Siverhall
|
31bf912ad7
|
Merge branch 'deployFix_20121204' into develop
|
2012-12-04 08:33:35 +01:00 |
|
Emil Siverhall
|
ce90a7d8e2
|
new idea details dialog for supervisors was showing the idea authors twice. removed panel that isnt needed anymore
|
2012-12-04 08:30:22 +01:00 |
|
Jona Ekenberg
|
0f92231421
|
now sorting researchAreas by title when filtering
|
2012-12-03 17:52:14 +01:00 |
|
Emil Siverhall
|
8626815186
|
Merge branch 'match35_addNewPartner' into develop
|
2012-12-03 14:42:27 +01:00 |
|
Emil Siverhall
|
0904b73b76
|
hiding create and select buttons for students if no application period is open
|
2012-12-03 14:41:55 +01:00 |
|
Emil Siverhall
|
62389f0901
|
made sure that authors may not add a new partner to a pending idea if application period has ended.
|
2012-12-03 14:17:18 +01:00 |
|
Emil Siverhall
|
cf08f194ce
|
added link to add new author to an idea where the current authors project partner declined to be a part of the idea
|
2012-12-03 14:04:02 +01:00 |
|
Jona Ekenberg
|
7dbab7bd0c
|
reactivated the edit on (old) projectideas
|
2012-12-03 12:11:42 +01:00 |
|
Jona Ekenberg
|
e583aa2ce5
|
changed the width of selectkeywordpanel
|
2012-12-02 21:47:32 +01:00 |
|
Jona Ekenberg
|
4211164914
|
can't change language to swedish when selecting master now
|
2012-12-02 18:18:39 +01:00 |
|
Jona Ekenberg
|
0c32e57daf
|
Merge branch 'newIdeaFixes' into develop
|
2012-12-02 18:10:20 +01:00 |
|
Jona Ekenberg
|
2c5e4a7284
|
now the partner is set to null and disabled when pressing master, also the language is set to english
|
2012-12-02 17:55:30 +01:00 |
|
Jona Ekenberg
|
2434e36348
|
now partner is hidden when clicking bachelour or master, next step is master only
|
2012-12-02 16:33:38 +01:00 |
|
Emil Siverhall
|
a5be04075d
|
Merge branch 'removeEdit' into develop
|
2012-11-30 10:03:12 +01:00 |
|
Emil Siverhall
|
83f859a971
|
removed edit feature of student project ideas for now, since we have problems editing master ideas
|
2012-11-30 10:02:56 +01:00 |
|
fred-fri
|
453335c8aa
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-11-30 15:17:15 +09:00 |
|
fred-fri
|
1bd77c59bf
|
added authors to newideadialog
|
2012-11-30 15:14:21 +09:00 |
|
Emil Siverhall
|
ba82d5a856
|
Merge branch 'partnerFix' into develop
|
2012-11-29 23:44:16 +01:00 |
|
Emil Siverhall
|
ab3633fd43
|
add remove students panel only had delete icon visible for sysadmins. since we use the same component when supervisors add student to their ideas, we make delete available for other roles as well.
|
2012-11-29 23:43:12 +01:00 |
|
Jona Ekenberg
|
1f319ab3f0
|
trying to make it print when changing selection...
|
2012-11-29 23:32:54 +01:00 |
|
Jona Ekenberg
|
f4532fc9c3
|
changed width to span-6 but had to add style='float: none; margin-bottom: 0px;' for it to look good
|
2012-11-29 22:11:28 +01:00 |
|
Jona Ekenberg
|
dcf357c125
|
changed width to 100%
|
2012-11-29 21:45:00 +01:00 |
|
fred-fri
|
4d77f0c61c
|
changed back to project ideas for demo purposes
|
2012-11-29 19:04:19 +09:00 |
|
fred-fri
|
e1782f6b3c
|
added first meeting details to newideapanel
|
2012-11-29 15:56:36 +09:00 |
|
fred-fri
|
2f0477fa57
|
added watsons box header above watson boxes
|
2012-11-29 14:35:05 +09:00 |
|
fred-fri
|
9b24449e95
|
changed from link to button
|
2012-11-29 14:25:50 +09:00 |
|
fred-fri
|
eba12783ef
|
added or between the two options
|
2012-11-29 14:21:42 +09:00 |
|
fred-fri
|
584595d961
|
changed from project idea to idea in match 3.5
|
2012-11-29 14:10:33 +09:00 |
|
fred-fri
|
37b4e5fdff
|
commented out breadcrumbs from student project idea section
|
2012-11-29 14:01:12 +09:00 |
|
fred-fri
|
e213c245f0
|
commented out breadcrumbs from supervisor project idea section
|
2012-11-29 13:57:03 +09:00 |
|
fred-fri
|
5d2e05b7f5
|
added infolinks
|
2012-11-29 12:36:56 +09:00 |
|
fred-fri
|
4e7fb4ee70
|
added more info to both supervisor and student submit idea panels
|
2012-11-29 12:21:46 +09:00 |
|
fred-fri
|
56c74fc0d0
|
replaced space consuming info panels with link to dialog
|
2012-11-29 11:45:19 +09:00 |
|
fred-fri
|
85e46e5591
|
switched to old component which achieves what i want flawlessly
|
2012-11-29 11:07:53 +09:00 |
|
fred-fri
|
6733dfa06a
|
some cleanup
|
2012-11-28 17:35:46 +09:00 |
|
fred-fri
|
9ddaff7819
|
added keywordsinfo too
|
2012-11-28 17:08:32 +09:00 |
|
fred-fri
|
2360407282
|
replaced the partner info with new component
|
2012-11-28 16:52:28 +09:00 |
|
fred-fri
|
8b8d7e650c
|
added new helpiconpanel which helps keep the gui of components that need help dialogs cleaner
|
2012-11-28 16:42:28 +09:00 |
|