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 |
|
Emil Siverhall
|
50d3ba2017
|
Merge branch 'workshop' into develop
|
2012-11-27 09:07:50 +01:00 |
|
Emil Siverhall
|
38c7cdbc15
|
added more instructions to workshop page, and links back to login page
|
2012-11-27 09:07:20 +01:00 |
|
Emil Siverhall
|
c97235ecaf
|
added new workshop page with instructions
|
2012-11-26 22:23:04 +01:00 |
|
|
|
0723d51105
|
all project notifications complete with english localization
|
2012-11-26 18:13:15 +01:00 |
|
|
|
2aa0468d65
|
removed unnessecary method
|
2012-11-26 16:55:25 +01:00 |
|
|
|
07d1f6a383
|
major simplification of project notification data
|
2012-11-26 16:54:24 +01:00 |
|
|
|
1b62e207da
|
project notifications: activity and checklist
|
2012-11-26 15:57:40 +01:00 |
|
|
|
7014f08bac
|
project notifications: checklist change
|
2012-11-26 15:08:04 +01:00 |
|
|
|
c08ba098c4
|
small refactoring of internal implementation
|
2012-11-26 15:04:20 +01:00 |
|
|
|
dfda6524bf
|
project notification: forum post
|
2012-11-26 14:45:22 +01:00 |
|
Jona Ekenberg
|
7180659356
|
Merge branch 'displayEvenPanel' into develop
|
2012-11-26 14:39:21 +01:00 |
|
Jona Ekenberg
|
28b4b595bd
|
fixed bug
|
2012-11-26 14:38:25 +01:00 |
|
|
|
9d3abd3e7d
|
project notification status is now stateofmind, not projectstatus
|
2012-11-26 14:22:47 +01:00 |
|
|
|
8c6d7b488d
|
project notification: status change
|
2012-11-26 14:09:30 +01:00 |
|
|
|
d9a1eb3c87
|
project notification: co-supervisor
|
2012-11-26 13:53:37 +01:00 |
|
|
|
9ef8afcc76
|
project notification: reviewer
|
2012-11-26 13:42:13 +01:00 |
|
|
|
5a4df41fc5
|
project notification supervisor change
|
2012-11-26 13:13:40 +01:00 |
|
|
|
74eea7d6ef
|
project author notifications
|
2012-11-26 13:04:29 +01:00 |
|
|
|
87023a2e99
|
refactoring of notification properties
|
2012-11-26 11:08:17 +01:00 |
|
|
|
7552dda268
|
more refactoring and some controller interface changes
|
2012-11-26 10:52:21 +01:00 |
|
|
|
ca88a39e6c
|
refactoring to group up notification related classes in the notifications package
|
2012-11-26 10:47:56 +01:00 |
|
Jona Ekenberg
|
c429f01db6
|
fixed conflict
|
2012-11-23 14:15:50 +01:00 |
|
Jona Ekenberg
|
e925d92f82
|
made files open in new window
|
2012-11-23 14:12:36 +01:00 |
|
fred-fri
|
61c235fe4c
|
test
|
2012-11-23 14:39:35 +09:00 |
|
fred-fri
|
a29b43557a
|
Merge branch 'release20121123'
20121123
|
2012-11-23 14:16:32 +09:00 |
|
Jona Ekenberg
|
12e0d9cae3
|
trying to find what's causing the bug
|
2012-11-22 23:46:19 +01:00 |
|
Jona Ekenberg
|
83333fd562
|
added fileuploadingstuff to the display-panel, a bug to fix thought
|
2012-11-22 15:29:25 +01:00 |
|
