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 |
|
Arian Jafari
|
4e83620ff9
|
Merge branch 'master' of ssh://git.dsv.su.se/git/scipro/personal/aj into externallogin
|
2012-11-29 14:57:25 +01:00 |
|
Arian Jafari
|
2d3e87b80d
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into externallogin
|
2012-11-29 14:55:21 +01:00 |
|
Arian Jafari
|
0f52b65dfe
|
Adding PasswordHandler, to be used for encryption of external user passwords.
|
2012-11-29 14:22:09 +01:00 |
|
Arian Jafari
|
ee76b876f1
|
First commit.
|
2012-11-29 12:47:57 +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 |
|
fred-fri
|
641d6e4ecd
|
removed unnecessary size rules
|
2012-11-28 15:55:35 +09:00 |
|
fred-fri
|
df2b355b79
|
added some space
|
2012-11-28 15:51:45 +09:00 |
|
fred-fri
|
4e16f1aa40
|
added watsons box header
|
2012-11-28 15:19:31 +09:00 |
|
fred-fri
|
8525003d96
|
added partner info
|
2012-11-28 14:25:47 +09:00 |
|
|
|
276cff404d
|
notification details dialog
|
2012-11-27 17:59:26 +01:00 |
|
|
|
9689ce7dde
|
forum posts now generate notifications for participants(author), supervisor and co-supervisors
|
2012-11-27 17:13:04 +01:00 |
|
|
|
0f8734f414
|
link now displayed in notification datatable
|
2012-11-27 17:12:28 +01:00 |
|
|
|
05aed94387
|
url for notifications now stored in the right entity
|
2012-11-27 17:11:37 +01:00 |
|
|
|
4cced34b99
|
recipients are now specified manually
|
2012-11-27 17:11:13 +01:00 |
|
Emil Siverhall
|
25a38e09c7
|
Merge branch 'logFixes' into develop
|
2012-11-27 13:45:51 +01:00 |
|
Emil Siverhall
|
07f5a1e94e
|
removed printlines without value to the logs
|
2012-11-27 13:45:22 +01:00 |
|
Emil Siverhall
|
42208b5524
|
removed some unnecessary info loggers when importing projects and looking for ideas to connect with them.
|
2012-11-27 13:32:39 +01:00 |
|
Emil Siverhall
|
829ee3c83e
|
Merge branch 'workshop_fixes' into develop
|
2012-11-27 10:50:42 +01:00 |
|
Emil Siverhall
|
7d2b63a266
|
removed connected to project? column from supervisor datatables. still available for admins though
|
2012-11-27 10:46:00 +01:00 |
|
Emil Siverhall
|
924fe866d3
|
changed default locale to english in scipro
|
2012-11-27 10:37:12 +01:00 |
|
Emil Siverhall
|
1f0900d0eb
|
Merge branch 'newidea_admin' into develop
|
2012-11-27 09:40:40 +01:00 |
|
|
|
e4a326aaa8
|
idea notification data
|
2012-11-27 09:38:42 +01:00 |
|
|
|
ef30fe7663
|
removed unnecessary annotation properties
|
2012-11-27 09:30:55 +01:00 |
|
|
|
783c6d4674
|
project notifications done
|
2012-11-27 09:25:53 +01:00 |
|
Emil Siverhall
|
e8dd4c9dec
|
added status column to new admin idea datatable
|
2012-11-27 09:16:16 +01:00 |
|
Emil Siverhall
|
fac96f3de7
|
implementation for author and supervisor change is done to the dialog. also added check to see if idea is exportable or not
|
2012-11-27 09:16:14 +01:00 |
|
Emil Siverhall
|
40ea6b8a64
|
most of the admin page is done, with dialog for editing added. supervisor change and author change implementation still needed
|
2012-11-27 09:16:12 +01:00 |
|
Emil Siverhall
|
3ce13fd059
|
started working on admin gui for new ideas
|
2012-11-27 09:16:09 +01:00 |
|
