Fredrik Friis
28df460a47
commit för push
2011-09-06 16:53:57 +09:00
Fredrik Friis
b06b48dc7a
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-09-06 16:37:52 +09:00
Fredrik Friis
4a1b09d70c
rensade bort utkommenterad kod + fixade lite kommentarer
2011-09-06 16:35:29 +09:00
Robin Eklund
bb65687034
Bugfixes with the menu-selection
2011-09-05 17:29:58 +02:00
Robin Eklund
2dd917c9f7
Refactoring some stuff with the menu panels, removing a certain anti-pattern.
2011-09-05 16:56:58 +02:00
Fredrik Friis
9f81f91837
lade till html ändringar
2011-09-05 22:25:41 +09:00
Fredrik Friis
c63395d6c1
bugg
2011-09-05 22:08:05 +09:00
Robin Eklund
62b07d6e0e
Merge branch 'bugFixes' into develop
2011-09-05 10:52:11 +02:00
Robin Eklund
480d564dba
Fixed rendering bug due to missing css-class usage, also pre-emptive bug fix for user-switching
2011-09-05 10:49:51 +02:00
Emil Siverhall
2f80e12f72
Merge branch 'requiredFields' into develop
...
* requiredFields:
Added stars to required fields in peer and changed some display logic regarding comment panel on displayed reviews
2011-09-05 09:58:19 +02:00
Emil Siverhall
81fc12067b
Added stars to required fields in peer and changed some display logic regarding comment panel on displayed reviews
2011-09-05 09:54:35 +02:00
Emil Siverhall
d7073d8422
fixed failing unit test for peer requests
2011-09-03 10:43:33 +02:00
Emil Siverhall
454818943e
unit test modifications
2011-09-03 10:39:18 +02:00
Emil Siverhall
0d22d5d068
Merge branch 'adminPeerList' into develop
...
* adminPeerList:
Added unit tests for admin peer pages and peer review/request dao
2011-09-03 10:10:49 +02:00
Emil Siverhall
79938681b8
Added unit tests for admin peer pages and peer review/request dao
2011-09-03 10:10:28 +02:00
Emil Siverhall
3fc0229c0d
Merge branch 'adminPeerList' into develop
...
* adminPeerList:
Delete function is added to the Peer request list
PeerRequestList is now sorted to show the latest created request first
Added links to peer reviews in the admin list of all reviews. Reviews are displayed in new page AdminPeerReviewPage to keep the Admin tab highlighted.
only waiting peer requests are now deletable.
All peer requests and reviews are now listed for admins.
2011-09-03 08:40:00 +02:00
Emil Siverhall
2df9037cd0
Delete function is added to the Peer request list
2011-09-03 08:30:36 +02:00
Fredrik Norberg
e789fb33f8
Merge branch 'checklists' into develop
...
* checklists:
added functionality to edit checklistTemplates
started with functionality to add questions to checklist templates
2011-09-02 11:39:01 +02:00
Fredrik Norberg
cb6a4ebe28
added functionality to edit checklistTemplates
2011-09-02 11:38:27 +02:00
Fredrik Norberg
f34b03c1ab
started with functionality to add questions to checklist templates
2011-09-02 11:38:26 +02:00
Fredrik Norberg
d03f720a4d
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Revert "css klass för underflikarna supervisor"
css klass för underflikarna supervisor
fixade till menysystemet supervisor>project details så det liknar mockuperna mer.
changed color
changed picture
added classes for git demo
2011-09-02 11:30:27 +02:00
Fredrik Friis
cddf80d1d7
Revert "css klass för underflikarna supervisor"
...
This reverts commit 0e65a3d592583d2fc5225fdcc9dd1a5b04a9b4d5.
commitade av misstag
2011-09-02 17:48:38 +09:00
Fredrik Friis
0e65a3d592
css klass för underflikarna supervisor
2011-09-02 16:42:53 +09:00
Fredrik Friis
4e963fe365
fixade till menysystemet supervisor>project details så det liknar mockuperna mer.
2011-09-01 20:57:05 +09:00
Fredrik Norberg
1e68cae726
changed color
2011-08-31 16:16:35 +02:00
Fredrik Norberg
414bcd1fa7
changed picture
2011-08-31 13:34:42 +02:00
Fredrik Norberg
623f88252a
added classes for git demo
2011-08-31 11:57:58 +02:00
Fredrik Norberg
2777b18e6e
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
Added unit tests of error pages, and some minor refactoring.
Added some minor previewability stuff, not sure if we can do anything with this due to
fixade snyggare tabell supervisormyprojects
testar minska storleken på bilder
testar minska storleken på bilder
Added ability to create custom error pages, implementation might be a bit
fixade supervisor my projects tabellen enligt mockups
Logout link removed when external authentication is configured.
lade in panel på supervisordelen, fixade så att den går att ladda
buggfixes where the wrong roles were sent as parameter
2011-08-31 11:55:18 +02:00
Emil Siverhall
25c34d237a
PeerRequestList is now sorted to show the latest created request first
2011-08-30 16:45:52 +02:00
Emil Siverhall
4d5deca1c4
Added links to peer reviews in the admin list of all reviews. Reviews are displayed in new page AdminPeerReviewPage to keep the Admin tab highlighted.
2011-08-30 16:39:30 +02:00
Robin Eklund
28eabbe822
Merge branch 'testErrorPages' into develop
2011-08-30 14:51:26 +02:00
Robin Eklund
79c6b9428f
Added unit tests of error pages, and some minor refactoring.
2011-08-30 14:50:36 +02:00
Robin Eklund
ba4de9317c
Merge branch 'previewabilityTest' into develop
2011-08-30 13:19:49 +02:00
Robin Eklund
036c62e3e4
Added some minor previewability stuff, not sure if we can do anything with this due to
...
the aggressive modularization of our components but it's worth considering for new UI stuff.
2011-08-30 13:19:33 +02:00
Fredrik Friis
3bc6b5f7ad
fixade snyggare tabell supervisormyprojects
2011-08-30 17:19:35 +09:00
Fredrik Friis
04ba73b1fa
Merge branch 'myfeature' into develop
2011-08-30 16:44:50 +09:00
Fredrik Friis
fa48377794
testar minska storleken på bilder
2011-08-30 15:38:30 +09:00
Fredrik Friis
05c88645a1
testar minska storleken på bilder
2011-08-30 15:32:56 +09:00
Robin Eklund
25abebfa15
Merge branch 'customErrorPages' into develop
2011-08-29 17:13:46 +02:00
Robin Eklund
3bc1f03da2
Added ability to create custom error pages, implementation might be a bit
...
abstract but extending should be fairly straight forward.
2011-08-29 17:13:14 +02:00
Fredrik Friis
ee66c22baa
fixade supervisor my projects tabellen enligt mockups
2011-08-29 18:22:53 +09:00
Emil Siverhall
e0d5ab7f19
only waiting peer requests are now deletable.
2011-08-28 21:38:54 +02:00
Emil Siverhall
60e92bdcce
All peer requests and reviews are now listed for admins.
2011-08-28 20:54:45 +02:00
Robin Eklund
f935f71722
Merge branch 'external_auth_logout' into develop
2011-08-25 11:33:21 +02:00
Robin Eklund
a18cfea73e
Logout link removed when external authentication is configured.
2011-08-25 11:32:39 +02:00
Robin Eklund
f6d04141ad
Merge branch 'release-2011-08-24'
2011-08-24 13:35:12 +02:00
Robin Eklund
166f6afbd7
Removed auto-ddl update command not intended for production use
2011-08-24 13:33:56 +02:00
Fredrik Friis
e9526bf6a2
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2011-08-24 00:06:48 +09:00
Fredrik Friis
d197e7a48f
lade in panel på supervisordelen, fixade så att den går att ladda
2011-08-24 00:06:14 +09:00
Fredrik Norberg
ce722eee2c
Merge branch 'checklists' into develop
...
* checklists:
buggfixes where the wrong roles were sent as parameter
2011-08-23 16:40:33 +02:00
