fred
31a344b051
bytte ut gammal css
2011-10-17 22:40:08 +09:00
fred
20857e863a
bytte ut gammal css
2011-10-17 22:29:51 +09:00
fred
b5904e1bfb
bytte ut gammal css
2011-10-17 22:24:52 +09:00
fred
c5762ef754
bytte ut gammal css
2011-10-17 21:58:41 +09:00
fred
5b8a787170
bytte ut gammal css
2011-10-17 21:47:05 +09:00
Emil Siverhall
7d74b78774
new design for one of the panels in My requests & reviews
2011-10-17 14:44:03 +02:00
fred
86a70b9537
tog bort gammal css
2011-10-17 21:11:42 +09:00
fred
e8aa8681a3
ändrade gammal css
2011-10-17 20:44:23 +09:00
fred
0ec870b6f0
bytte ut gammal css
2011-10-17 19:38:55 +09:00
fred
6167b62c3d
bytte ut gammal css
2011-10-17 19:32:52 +09:00
fred
6f3a65fa0a
bytte ut gammal css
2011-10-17 19:28:24 +09:00
fred
01aedb5aa1
bytte ut gammal css
2011-10-17 19:21:28 +09:00
fred
8c041f80ff
bytte ut gammal css
2011-10-17 19:02:56 +09:00
fred
4a36b0f172
bytte ut gammal css
2011-10-17 15:43:08 +09:00
fred
eaec571a1a
bytte ut gammal css
2011-10-17 14:48:53 +09:00
fred
5d6e761b92
bytte ut gammal css
2011-10-17 14:08:51 +09:00
fred
b21fdabb9d
bytte css på en panel
2011-10-17 13:52:26 +09:00
fred
881470340e
fixade tabell till ny css
2011-10-17 13:29:11 +09:00
Emil Siverhall
31155588b1
Merge branch 'new_peer_design' into develop
...
* new_peer_design:
added general system settings to choose if peer request files should be available for download before accepting a review.
removed icons from peer portal menu
2011-10-16 20:57:40 +02:00
Emil Siverhall
2533583421
added general system settings to choose if peer request files should be available for download before accepting a review.
2011-10-16 20:53:36 +02:00
Emil Siverhall
9cbad229d2
removed icons from peer portal menu
2011-10-16 20:17:24 +02:00
Fredrik Norberg
083aa5ea6e
small changes to supervisorActivityPlanPage
2011-10-14 15:26:59 +02:00
Fredrik Norberg
196be494dd
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
...
* 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re:
Merged local alterations to HEAD
Refactored the recent Dao and added some utility to the base-dao's to make sorting and limits easier to implement with less boilerplate code needed.
2011-10-14 14:29:17 +02:00
Fredrik Norberg
9d4abeb39b
added funtionality to add and view checklists in the new activity plan
2011-10-14 14:26:56 +02:00
Joakim Berglund
fd094cd17a
Merge branch 'ConferenceFixes' into develop
2011-10-14 11:03:27 +02:00
Joakim Berglund
e8288e9059
Inversed order of comments on conference-message. Now the usual way to show comments.
2011-10-14 10:56:52 +02:00
Joakim Berglund
3f9caf3335
Added placeholder text (HTML5) in conference according to mockup.
2011-10-14 10:48:12 +02:00
Joakim Berglund
d240fd2661
Added more margin on comments in conference.
2011-10-14 10:44:54 +02:00
Robin Eklund
d823595055
Merged local alterations to HEAD
2011-10-13 15:36:50 +02:00
Robin Eklund
983229c3ff
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
2011-10-13 15:35:58 +02:00
Robin Eklund
7d0f436324
Refactored the recent Dao and added some utility to the base-dao's to make sorting and limits easier to implement with less boilerplate code needed.
...
Very unhappy with how unflexible our current JPA setup is, we'd potentially benefit from ripping out
the JpaTemplate stuff completely and just going directly on the Hibernate specific API.
2011-10-13 15:35:30 +02:00
Fredrik Norberg
9ffd5d71fb
design changes for the new activityplan and added title, description and requiredUpload to the create dialog
2011-10-12 16:05:18 +02:00
Fredrik Norberg
f10023b20e
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
...
* 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re:
Added sort-capable backend queries, mucho boilerplate, better solution needed.
2011-10-12 12:17:19 +02:00
Robin Eklund
645bdce99d
Added sort-capable backend queries, mucho boilerplate, better solution needed.
2011-10-12 12:12:11 +02:00
Fredrik Norberg
7e6e3fb386
Merge branch 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re into scheduleEvents
...
* 'scheduleEvents' of ssh://git.dsv.su.se/git/scipro/personal/re:
Added some documentation, mode controls, some bugfixes, changed api on the schedule event dao.
Doclet comments.
DomainObjects now have a versioning property to support hibernate op-locking.
Changed transactional state on finder methods
Refactoring, the API is now fixed (for now)
2011-10-12 11:58:09 +02:00
Fredrik Norberg
8d302b6711
added addschedulepanel
2011-10-12 11:57:09 +02:00
Robin Eklund
4b950fbbbd
Added some documentation, mode controls, some bugfixes, changed api on the schedule event dao.
...
Removed role restrictions on activity plan, schedule and checklist pages.
2011-10-11 14:33:33 +02:00
Robin Eklund
5c252a4421
Doclet comments.
2011-10-11 11:30:06 +02:00
Robin Eklund
1ec1e886c4
DomainObjects now have a versioning property to support hibernate op-locking.
...
This is a bit experimental, but should work fine and increase performance significantly.
2011-10-11 11:15:17 +02:00
Emil Siverhall
8521e3f9f1
Merge branch 'peerWork' into develop
...
* peerWork:
minor changes to make expandable panel slide smoother.
peer requests is now expandable on peer portal front page.
2011-10-11 08:44:13 +02:00
Emil Siverhall
19f8113fe5
minor changes to make expandable panel slide smoother.
2011-10-10 16:07:33 +02:00
Emil Siverhall
5a31fd5f0a
peer requests is now expandable on peer portal front page.
2011-10-10 15:30:16 +02:00
Emil Siverhall
2d40823d72
some comment cleanup in new subclass
2011-10-10 11:35:21 +02:00
Emil Siverhall
772c8c36ff
Merge branch 'supervisorMenu' into develop
...
* supervisorMenu:
Removed project details tab from Supervisor view. All project details is now under My Projects tab with correct highlighting.
2011-10-10 11:29:34 +02:00
Emil Siverhall
1f18ef84d3
Removed project details tab from Supervisor view. All project details is now under My Projects tab with correct highlighting.
2011-10-10 11:28:24 +02:00
Robin Eklund
542a9f48af
Changed transactional state on finder methods
2011-10-10 10:37:10 +02:00
Robin Eklund
7354471f17
Refactoring, the API is now fixed (for now)
2011-10-10 10:25:11 +02:00
Emil Siverhall
aa1dde5f67
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
...
* 'develop' of ssh://git.dsv.su.se/git/scipro/scipro:
fixat lite smågrejer på demosidan och file
ny tabell i files som kan användas överallt. alla andra tabeller i systemet bör i princip göras om med thead, foot och body och sen ha denna tabell som css
bytt till liknande tabell på filer som vi använder på andra ställen
ändrade en formulering på state of mind
fixat markupbuggar
gjort alla ikoner til 16 och daisy
fixat lite ikoner, snyggat till
fixat lite ikoner, snyggat till
tog bort onödig ajax, snyggade till upload o create folder barsen
försöker orda markupen
tog bort onödigt filtrams ifrån files
strukturerade upp koden och lade in lite kommentarer
Image instead of button to download peerreview-file.
Download of peer-review-file from peer portal implemented.
2011-10-10 08:07:51 +02:00
Emil Siverhall
1e4e2f2df9
Merge branch 'peerPortal' into develop
...
* peerPortal:
more date formatting change in peer portal
2011-10-10 08:07:23 +02:00
Fredrik Norberg
6044a305e9
added a 3 queries to projectScheduleEventDao and createEvent link now spawns a popup where you can choose date
2011-10-07 16:00:05 +02:00
