fred-fri
|
e88591e09b
|
Merge branch 'release20130208'
20120208
|
2013-02-08 13:42:39 +09:00 |
|
fred-fri
|
0d154c244a
|
new db file
|
2013-02-08 13:42:24 +09:00 |
|
fred-fri
|
6c8cca8108
|
added missing properties
|
2013-02-08 13:13:14 +09:00 |
|
Emil Siverhall
|
1bbad42a9e
|
Merge branch 'seminarLink' into develop
|
2013-02-07 14:47:41 +01:00 |
|
Emil Siverhall
|
150d0b6c68
|
mounted some system setting pages with bad url's
|
2013-02-07 14:47:22 +01:00 |
|
Emil Siverhall
|
4ec1849e9b
|
added link to the page where final seminars are created when no seminar is available in the supervisors project overview
|
2013-02-07 14:37:45 +01:00 |
|
Emil Siverhall
|
474d56229d
|
Merge branch 'newSupervisorMenu' into develop
|
2013-02-07 13:26:43 +01:00 |
|
Emil Siverhall
|
78fbae7768
|
removed button links since we not have a tab menu for this instead
|
2013-02-07 13:26:25 +01:00 |
|
Emil Siverhall
|
487a5e7679
|
added a sub tab menu to supervisor idea start page for navigation instead of the buttons on the page
|
2013-02-07 13:13:29 +01:00 |
|
Emil Siverhall
|
ab5cd347fc
|
Merge branch 'systemSettings' into develop
|
2013-02-07 12:41:15 +01:00 |
|
Emil Siverhall
|
e2873263ed
|
more restructuring to work better with the responsive design
|
2013-02-07 12:30:58 +01:00 |
|
Emil Siverhall
|
9027de920b
|
refactoring and test class added for admin - final seminar settings
|
2013-02-07 10:40:48 +01:00 |
|
Emil Siverhall
|
a07f3c9749
|
refactor on general settings page as well
|
2013-02-06 22:50:48 +01:00 |
|
Emil Siverhall
|
80e4c56c9f
|
refactor on the admin - system settings - match settings page to use external general system settings form
|
2013-02-06 18:37:00 +01:00 |
|
Emil Siverhall
|
dc1228d53d
|
moved the feedbackPanel below the tabmenu to render properly
|
2013-02-06 16:22:13 +01:00 |
|
|
|
11da6d3135
|
Supervisor project submenu now shows Checklists instead of Checklist
|
2013-02-06 15:23:27 +01:00 |
|
Emil Siverhall
|
1be56eb754
|
changed menu structure to horizonal on system settings. also removed server environment tab and changes some headers to match the others
|
2013-02-06 13:49:21 +01:00 |
|
Emil Siverhall
|
ba11943b0a
|
Merge branch 'newStatistics' into develop
|
2013-02-06 07:21:38 +01:00 |
|
Emil Siverhall
|
4f37ecc121
|
some test structure changes
|
2013-02-06 07:21:12 +01:00 |
|
Emil Siverhall
|
a6e1595914
|
changed the excel export button to use a download icon with title text instead. it's now placed above the table next to the rowsPerPage-component instead
|
2013-02-06 07:16:21 +01:00 |
|
Emil Siverhall
|
4fd7440e95
|
added excel export to active projects table as well
|
2013-02-06 07:16:19 +01:00 |
|
Emil Siverhall
|
b6869494f5
|
added excel export to idea table
|
2013-02-06 07:16:16 +01:00 |
|
Emil Siverhall
|
085776603e
|
made sure that ideas datatable is empty when entering the page without supervisor selected
|
2013-02-06 07:16:14 +01:00 |
|
Emil Siverhall
|
e7c60c6b1e
|
added datatable with matched ideas as well. still needs some filter implementation to show an empty table when entering the page
|
2013-02-06 07:16:12 +01:00 |
|
Emil Siverhall
|
19779c761f
|
some refactoring to put the project datatable in it's own panel
|
2013-02-06 07:16:10 +01:00 |
|
Emil Siverhall
|
7c6fd52d2f
|
new constructor to the generic data panel ot use if you want a title of the data table. the title is on the same row as the rowsPerPage-component instead of above it, as it is if you put a title outside the panel.
|
2013-02-06 07:16:07 +01:00 |
|
Emil Siverhall
|
629068c8d7
|
further work on statistics page. project datatable is available
|
2013-02-06 07:16:05 +01:00 |
|
Emil Siverhall
|
5c9bd1cce5
|
started with structure for new statistics page with supervisors ideas and projects
|
2013-02-06 07:16:03 +01:00 |
|
|
|
c12225b937
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-02-05 13:39:03 +01:00 |
|
|
|
6a8575d818
|
Idea export worker uses NewIdeaService to determine eligibility for exporting.
|
2013-02-05 13:36:48 +01:00 |
|
|
|
850d80a305
|
Course start reached check now only cares about date and not time of day as well.
|
2013-02-05 13:35:55 +01:00 |
|
|
|
9ae0816c4d
|
Moved assert to not cause errors if no default selection was provided.
|
2013-02-05 13:34:06 +01:00 |
|
|
|
7502b944c3
|
Supervisor idea table now accurately reflects the current status of an idea when matched (project created, export failed, awaiting export).
|
2013-02-05 13:32:07 +01:00 |
|
|
|
df60501ec3
|
Added export status panel to idea popup.
|
2013-02-05 13:14:00 +01:00 |
|
|
|
e90c982490
|
Remove close button since the required bootstrap library is missing.
|
2013-02-05 13:13:38 +01:00 |
|
|
|
9dcb6d5d40
|
Email property is not auto injected. Hardcoded for now.
|
2013-02-05 13:13:22 +01:00 |
|
|
|
e55408f48b
|
Moved properties file to main from test. Ops
|
2013-02-05 11:24:17 +01:00 |
|
|
|
a8ab4a8741
|
Added explanation.
|
2013-02-05 11:18:10 +01:00 |
|
|
|
168267eb30
|
Property files for managing displayed text.
|
2013-02-05 11:12:15 +01:00 |
|
|
|
37375dc55c
|
Test to make sure it renders if there was no reason provided during export failure.
|
2013-02-05 11:11:39 +01:00 |
|
|
|
e5d01bb9c3
|
Test to verify export failure reason is included.
Implementation.
|
2013-02-05 10:59:07 +01:00 |
|
|
|
48a93364f3
|
path() helper function migrated to SciProTest
|
2013-02-05 10:54:57 +01:00 |
|
|
|
dfc20e8196
|
Test verifying panel visibility when export failed.
|
2013-02-05 10:43:26 +01:00 |
|
|
|
812da20bbf
|
Idea export feedback panel.
|
2013-02-05 10:40:20 +01:00 |
|
|
|
8829e4af84
|
Fixed bug with filterform when passing in a non-modifiable list as default selection.
|
2013-02-05 09:50:03 +01:00 |
|
fred-fri
|
1ffedb60f6
|
made match pages visible to admins, not just sysadmins
|
2013-02-05 09:41:33 +09:00 |
|
Emil Siverhall
|
88328cbf24
|
Merge branch 'linkChange' into develop
|
2013-02-04 19:56:44 +01:00 |
|
Emil Siverhall
|
ee0467d3cb
|
changed redirect url when clicking resources link in the headerpanel
|
2013-02-04 19:56:36 +01:00 |
|
Emil Siverhall
|
fb308e9256
|
Merge branch 'badge' into develop
|
2013-02-04 19:36:26 +01:00 |
|
Emil Siverhall
|
504fc35b3c
|
removed println..
|
2013-02-04 19:25:36 +01:00 |
|
