Jona Ekenberg
|
880962f2cf
|
Merge branch 'hehehehehe' into develop
|
2013-02-19 15:23:33 +01:00 |
|
Jona Ekenberg
|
1f0c5e6dd3
|
mer update på forummockup
|
2013-02-19 15:22:47 +01:00 |
|
|
|
f66d4e8335
|
Landing page for projects that redirects to the proper view based on project association
|
2013-02-19 15:21:46 +01:00 |
|
|
|
9b405335f8
|
Project column is now clickable if you are part of the project in some way
|
2013-02-19 14:38:30 +01:00 |
|
|
|
e5ff3a4c65
|
Method for checking if a user is part of a project
|
2013-02-19 14:21:39 +01:00 |
|
|
|
86bdfc1423
|
Project column
|
2013-02-19 14:15:35 +01:00 |
|
Jona Ekenberg
|
a61d243c8c
|
la till flagga
|
2013-02-19 14:01:43 +01:00 |
|
Jona Ekenberg
|
d3d67bc554
|
uppdaterat forummockupen
|
2013-02-19 13:55:47 +01:00 |
|
Jona Ekenberg
|
f60f297061
|
updated the scipro_m.css and moved it under bootstrap.css so that it overrides bootstrap properly
|
2013-02-19 13:55:36 +01:00 |
|
|
|
b572e9f8cb
|
getTitle is now abstract
|
2013-02-19 13:42:05 +01:00 |
|
|
|
f2176e108d
|
Removed old subject column
|
2013-02-19 12:40:14 +01:00 |
|
|
|
a8130847d7
|
Clicking the subject will mark the notification as read
|
2013-02-19 12:39:58 +01:00 |
|
|
|
3785afe0e5
|
Callback added when external link is clicked
|
2013-02-19 12:39:47 +01:00 |
|
|
|
e4c60ce173
|
Subject column
|
2013-02-19 12:32:59 +01:00 |
|
|
|
36c9bcd117
|
External link column (uses absolute URLs instead of wicket pages).
|
2013-02-19 12:28:05 +01:00 |
|
|
|
28e4a39a1d
|
Added DateService to test
|
2013-02-19 11:51:58 +01:00 |
|
|
|
baf8c294ff
|
First column now named status and now shows a red flag indicating the read status.
|
2013-02-19 11:25:16 +01:00 |
|
|
|
9eedb9874d
|
Added red flag to ImageObject
|
2013-02-19 11:08:01 +01:00 |
|
|
|
4d197fff27
|
Added red glyphicons using class="icon-red"
|
2013-02-19 11:03:34 +01:00 |
|
|
|
2aceec6139
|
Merge branch 'feature/external_project' into develop
Conflicts:
resources/db_update_scripts/current.sql
|
2013-02-19 10:21:24 +01:00 |
|
|
|
ee0b3eaed4
|
SQL statement for external organization column in project table
|
2013-02-19 10:17:57 +01:00 |
|
|
|
c2e95412da
|
External organization panel added to supervisor project view
|
2013-02-19 10:17:03 +01:00 |
|
|
|
0ee8be09f2
|
Help icon for external organization
|
2013-02-19 10:13:40 +01:00 |
|
|
|
092e9f2889
|
Improved rendering test.
|
2013-02-19 10:06:51 +01:00 |
|
|
|
5453e31ef8
|
Added enclosure to hide label when not connected to external organization.
Major panel refactoring.
|
2013-02-19 09:58:50 +01:00 |
|
fred-fri
|
32c944b60c
|
made select supervisor idea page use method that uses exemptions
|
2013-02-19 17:33:57 +09:00 |
|
fred-fri
|
3ef5dc5bcb
|
fixed a null bug
|
2013-02-19 16:49:51 +09:00 |
|
fred-fri
|
c24e7713af
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-02-19 16:36:51 +09:00 |
|
fred-fri
|
80b5700171
|
Merge branch 'ap2' into develop
|
2013-02-19 16:36:13 +09:00 |
|
fred-fri
|
f24b7f61b1
|
minor fixes to make saving idea work
|
2013-02-19 16:34:05 +09:00 |
|
fred-fri
|
4782b5e82a
|
made enter student idea page use methods that use exemptions
|
2013-02-19 15:52:42 +09:00 |
|
fred-fri
|
539a36b1b5
|
made showbuttons logic use methods that use exemptions
|
2013-02-19 15:44:00 +09:00 |
|
fred-fri
|
e694b3cfd5
|
added new getcurrentperiod method that takes a student which enables checking for exemptions
|
2013-02-19 15:34:42 +09:00 |
|
fred-fri
|
e9cb332d39
|
added new getcurrentperiod method that takes a student which enables checking for exemptions
|
2013-02-19 15:09:49 +09:00 |
|
fred-fri
|
6b29ed4eb2
|
added exemptions to student entity
|
2013-02-19 15:07:18 +09:00 |
|
fred-fri
|
08bd27fb0b
|
gui logic fix
|
2013-02-19 10:31:09 +09:00 |
|
fred-fri
|
cf05876a99
|
added logic that until date must be after end date
|
2013-02-19 10:19:53 +09:00 |
|
fred-fri
|
93be176c99
|
fixed ajax bug
|
2013-02-19 10:06:15 +09:00 |
|
Jona Ekenberg
|
02ff843007
|
mer update på forummockup
|
2013-02-18 17:08:52 +01:00 |
|
Jona Ekenberg
|
7315a109f4
|
mer uppdatering på forummockup
|
2013-02-18 17:00:14 +01:00 |
|
|
|
3fdf1cad9e
|
Panel now saves the external organization as changes are made.
|
2013-02-18 16:54:17 +01:00 |
|
Jona Ekenberg
|
5081e8a950
|
updated the forum mockup a bit more
|
2013-02-18 16:35:34 +01:00 |
|
|
|
080c27146d
|
Refactored test. Text field visibility toggled by clicking checkbox.
|
2013-02-18 16:28:49 +01:00 |
|
Jona Ekenberg
|
aff2dd9fc9
|
Merge branch 'fixaNYNYNYNY' into develop
|
2013-02-18 16:11:37 +01:00 |
|
Jona Ekenberg
|
fb0ee8e0a5
|
uppdaterat forummockup
|
2013-02-18 16:11:22 +01:00 |
|
|
|
04937d2a85
|
Supervisorexternalprojectpanel panel for displaying external organization information
|
2013-02-18 15:48:18 +01:00 |
|
|
|
d7c2a1699f
|
External organization information in project entity
|
2013-02-18 15:43:14 +01:00 |
|
fred-fri
|
0be7ca6387
|
some markup fixes
|
2013-02-18 16:57:12 +09:00 |
|
fred-fri
|
d2261fcc3f
|
some cleanup and improvements
|
2013-02-18 16:52:29 +09:00 |
|
fred-fri
|
8cf7ee4928
|
added artefact for adding exemptions
|
2013-02-18 16:25:59 +09:00 |
|
