Fredrik Friis
|
2d29cdafd8
|
added supervisor unit to project idea list
|
2012-02-02 18:04:45 +09:00 |
|
Fredrik Friis
|
6a823ddbd6
|
added date filtering to project ideas
|
2012-02-02 17:27:11 +09:00 |
|
Fredrik Friis
|
d00915089a
|
added pending explanation
|
2012-02-02 15:22:59 +09:00 |
|
Fredrik Friis
|
f248d19464
|
added info to match info box
|
2012-02-02 15:05:57 +09:00 |
|
Fredrik Friis
|
a2e0a488ec
|
added counter to project idea page
|
2012-02-02 14:51:23 +09:00 |
|
Fredrik Friis
|
837abfe5ae
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-02-02 12:07:40 +09:00 |
|
Fredrik Friis
|
ef8ea6048f
|
commented out unimplemented search fields
|
2012-02-02 12:07:22 +09:00 |
|
Tom Vahlman
|
4b7b6a076f
|
It should not be allowed to add overlapping application periods when there is the same Project Class.
|
2012-02-01 18:54:12 +01:00 |
|
Tom Vahlman
|
064ab5716b
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-02-01 14:14:47 +01:00 |
|
Tom Vahlman
|
b8632acdea
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-02-01 14:13:51 +01:00 |
|
Tom Vahlman
|
c3194fe523
|
A first impl. of the ApplicationPeriod issue.
|
2012-02-01 14:11:45 +01:00 |
|
Tom Vahlman
|
265460f03b
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-02-01 10:19:48 +01:00 |
|
Rasmus Ivö
|
1a704c30d2
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-02-01 09:34:44 +01:00 |
|
Fredrik Friis
|
27c8afcb82
|
correction
|
2012-02-01 16:45:35 +09:00 |
|
Fredrik Friis
|
9c8a201fe7
|
set 5 character minimum for declining, but the dialog is still closed when button is pressed
|
2012-02-01 16:44:08 +09:00 |
|
Fredrik Friis
|
3570763f53
|
actually we can have both
|
2012-02-01 15:03:57 +09:00 |
|
Fredrik Friis
|
e5b9137f28
|
changed author to suggested to in top waiting
|
2012-02-01 14:59:26 +09:00 |
|
Fredrik Friis
|
b6e628dace
|
correction
|
2012-02-01 14:22:33 +09:00 |
|
Fredrik Friis
|
880421ef01
|
users are sent to the correct tab at login
|
2012-02-01 11:56:35 +09:00 |
|
Fredrik Friis
|
4cd5ca7f4b
|
added more explanation to match statuses
|
2012-02-01 10:39:51 +09:00 |
|
Fredrik Friis
|
b0db3bdfd4
|
removed links from latest reviewer panel from users without author role
|
2012-02-01 10:09:35 +09:00 |
|
Fredrik Friis
|
b0f5d3113e
|
added explanations to match statuses
|
2012-02-01 09:32:47 +09:00 |
|
Tom Vahlman
|
7e91b1576d
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-31 15:59:10 +01:00 |
|
FredrikNorberg
|
e38095990f
|
Merge branch 'preferredSupervisor' into develop
|
2012-01-31 15:43:32 +01:00 |
|
FredrikNorberg
|
da8652267b
|
students cannot chose themselves as supervisors even if they are employees
|
2012-01-31 15:43:03 +01:00 |
|
Tom Vahlman
|
a595522818
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-31 11:11:25 +01:00 |
|
Tom Vahlman
|
a549fd0e05
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-31 10:50:11 +01:00 |
|
Fredrik Friis
|
a6e17d2bde
|
changed text
|
2012-01-31 11:01:14 +09:00 |
|
Tom Vahlman
|
af003930a4
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-30 12:53:08 +01:00 |
|
FredrikNorberg
|
8381ac5a12
|
the name of the user that made the fileupload is now shown
|
2012-01-30 11:57:27 +01:00 |
|
Tom Vahlman
|
e0f35bd3c1
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-30 09:33:41 +01:00 |
|
FredrikNorberg
|
be4d6a7a47
|
small gui fixes to matchAdminProjectIdea
|
2012-01-30 09:21:24 +01:00 |
|
FredrikNorberg
|
a814aeb112
|
hidden information that cannot be edited in profile panels
|
2012-01-30 08:56:57 +01:00 |
|
Fredrik Friis
|
5f853c9a61
|
Merge branch 'release20120130'
|
2012-01-30 10:35:35 +09:00 |
|
Tom Vahlman
|
d52c851d2d
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-27 16:17:54 +01:00 |
|
Fredrik Friis
|
d4a647ffba
|
edited some lockdown settings in supervisor profile
|
2012-01-27 11:29:29 +09:00 |
|
Fredrik Friis
|
ef83b841cc
|
added peer info
|
2012-01-27 11:16:44 +09:00 |
|
Fredrik Friis
|
2a7a90afd6
|
some refactoring of the my projects idea design
|
2012-01-27 10:59:40 +09:00 |
|
Fredrik Friis
|
c4b3e117cb
|
hiding inactive filter option for non admins
|
2012-01-27 10:43:09 +09:00 |
|
Fredrik Friis
|
1fe4b867a9
|
removed only mine option from template filter cus it doesnt work
|
2012-01-27 10:27:10 +09:00 |
|
Fredrik Friis
|
3a98748e26
|
more instructions for supervisor profiles
|
2012-01-27 10:17:13 +09:00 |
|
Fredrik Friis
|
95e2fd9006
|
locked unit selection because we will get it from daisy and changes will be overwritten
|
2012-01-27 10:06:09 +09:00 |
|
Tom Vahlman
|
438eb3b979
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-26 09:25:32 +01:00 |
|
Fredrik Friis
|
507eaa7905
|
cleanup
|
2012-01-26 15:10:22 +09:00 |
|
Fredrik Friis
|
673bccb76c
|
fixed mailto bug
|
2012-01-26 15:09:52 +09:00 |
|
Fredrik Friis
|
9873b7e67f
|
Merge branch 'release20120126'
|
2012-01-26 13:21:48 +09:00 |
|
Fredrik Friis
|
d15d200ad6
|
Merge branch 'match' into develop
|
2012-01-26 12:13:53 +09:00 |
|
Fredrik Friis
|
e0ae35bdc4
|
test probably needs mocking
|
2012-01-26 12:13:20 +09:00 |
|
Fredrik Friis
|
662422d2f2
|
working on test
|
2012-01-26 08:30:21 +09:00 |
|
Tom Vahlman
|
15786012f0
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-01-25 17:36:01 +01:00 |
|