Niklas
f65ab021a2
Merge branch 'externallogin' of ssh://git.dsv.su.se/git/scipro/personal/ne into feature
...
Conflicts:
src/main/java/se/su/dsv/scipro/data/dataobjects/User.java
2012-12-06 16:06:37 +01:00
Niklas
2c82dec9f8
Adding LoginPanel.
2012-12-06 14:41:44 +01:00
Niklas
82781928e4
Adding options for kerberos and external login to LoginPanel.
2012-12-06 14:41:44 +01:00
Niklas
8d72881fcd
asdf
2012-12-06 14:41:44 +01:00
Niklas
51c408f4ff
test commit
2012-12-06 14:41:44 +01:00
Niklas
4d244b76c4
RegistrationPanel
2012-12-06 14:41:44 +01:00
Niklas
38be6203f8
Registration form.
2012-12-06 14:41:44 +01:00
Niklas
f28dc4ce3a
Registration form.
2012-12-06 14:41:44 +01:00
5d469f56b3
generic abstract crud panel class
2012-12-06 14:40:40 +01:00
Arian Jafari
e9f0b1914e
Local authentication now functional. I think.
2012-12-06 14:33:48 +01:00
Jona Ekenberg
e62b993bd1
Merge branch 'popupResearchAreaInfo' into develop
2012-12-06 13:55:53 +01:00
Jona Ekenberg
9fabcbd3b0
trying to get the infobox to show when clicking researcharea when adding idea
2012-12-06 13:39:48 +01:00
Emil Siverhall
d3b671d8d8
Merge branch 'match35_supervisor_create_idea' into develop
2012-12-06 11:38:19 +01:00
Emil Siverhall
b6df4b51eb
added required stars and changed text on save button for supervisors creating ideas
2012-12-06 11:38:08 +01:00
ce1b2c96cb
fixes to notification details to allow html tags while still displaying e-mails nicely
2012-12-06 09:27:42 +01:00
dc91a13b0a
seminar notification - opposition added
2012-12-06 09:13:22 +01:00
99d4640dc4
seminar notification - participant added
2012-12-06 09:03:33 +01:00
355dcd2bc0
renamed a method
2012-12-06 09:02:49 +01:00
Emil Siverhall
46e4b5f06c
Merge branch 'postDeployFixes' into develop
2012-12-05 15:33:26 +01:00
Emil Siverhall
bc2c554868
changed column style for date column in new idea history panel (admin)
2012-12-05 15:28:50 +01:00
Emil Siverhall
b0e2de0a8c
hiding create and select buttons if author is part of an idea within an open application period or if there are no application periods open
2012-12-05 15:15:13 +01:00
Emil Siverhall
7ab9352aeb
added validation logics for authors already participating on an idea within the current application period
2012-12-05 14:53:09 +01:00
Emil Siverhall
2ea5017ff1
removed or-text between idea start page buttons
2012-12-05 14:51:27 +01:00
Emil Siverhall
85ee2ee601
Merge branch 'excelSupervisorSettings' into develop
2012-12-04 21:06:14 +01:00
Emil Siverhall
3cb0452518
added excel exports to supervisor settings page. also some changes to how we fill the excel sheets to hopefully make it a bit easier to work with
2012-12-04 21:05:44 +01:00
c50b0603ac
base class for simple domainobject crud panels
2012-12-04 18:03:20 +01:00
Maryam Ammouri
ac09d7b0d6
Fixed merge conflicts
2012-12-04 16:04:52 +01:00
Maryam Ammouri
465e18c7b3
added bootstrap folder
2012-12-04 15:58:50 +01:00
Maryam Ammouri
917ad826e7
author 3p + footer header
2012-12-04 15:57:28 +01:00
Arian Jafari
c3a3ffc98d
- Adding DAO for password
...
- Adding Password class
- Updating User class with optional local password
- Adding PasswordHandler, used for encrypting passwords.
2012-12-04 15:53:05 +01:00
Emil Siverhall
e7187d110b
Merge branch 'breadcrumbs' into develop
2012-12-04 12:41:36 +01:00
Emil Siverhall
285d29858a
reintroduced the breadcrumbs and made tab highlighting work on all new idea pages
2012-12-04 12:41:21 +01:00
Jona Ekenberg
d0652436d3
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2012-12-04 12:03:31 +01:00
Emil Siverhall
db970368ce
Merge branch 'areaOrderFix' into develop
2012-12-04 12:01:12 +01:00
Emil Siverhall
dad66f3600
research areas should be in alphabetical order when students submitting ideas as well
2012-12-04 12:01:00 +01:00
Jona Ekenberg
edd21f9c39
Merge branch 'addedResearchAreaInfo' into develop
2012-12-04 11:52:42 +01:00
Jona Ekenberg
33fb5fdbfa
added link to researcharea info
2012-12-04 11:52:27 +01:00
Emil Siverhall
9038a0cc63
Merge branch 'deployFix_20121204' into develop
2012-12-04 11:17:24 +01:00
Emil Siverhall
b70eafc09b
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
2012-12-04 11:17:04 +01:00
Emil Siverhall
d3765b71f1
moved author info to its own panel since we dont want this with supervisor ideas that are still unmatched. no authors created lazy init exceptions on the participation objects
2012-12-04 11:16:23 +01:00
Jona Ekenberg
f6ab5e5400
changed the rest
2012-12-04 10:59:34 +01:00
Jona Ekenberg
f209524761
changed some
2012-12-04 10:52:44 +01:00
abe41e859e
change notification settings to better support new types of notifications
2012-12-04 10:41:48 +01:00
4d93507e4e
fixed a bug that prevented editing of project title and class
2012-12-04 09:27:33 +01:00
aaa5e742c1
mounted the notifications page to "notifications"
2012-12-04 09:07:42 +01:00
970466f586
notifications are now sorted by date in descending order (newest first) by default
2012-12-04 09:05:18 +01:00
bf5ad995be
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into notifications
...
* 'develop' of git.dsv.su.se:/git/scipro/scipro: (52 commits)
now sorting researchAreas by title when filtering
hiding create and select buttons for students if no application period is open
made sure that authors may not add a new partner to a pending idea if application period has ended.
added link to add new author to an idea where the current authors project partner declined to be a part of the idea
reactivated the edit on (old) projectideas
changed the width of selectkeywordpanel
can't change language to swedish when selecting master now
now the partner is set to null and disabled when pressing master, also the language is set to english
now partner is hidden when clicking bachelour or master, next step is master only
removed edit feature of student project ideas for now, since we have problems editing master ideas
added authors to newideadialog
add remove students panel only had delete icon visible for sysadmins. since we use the same component when supervisors add student to their ideas, we make delete available for other roles as well.
trying to make it print when changing selection...
changed width to span-6 but had to add style='float: none; margin-bottom: 0px;' for it to look good
changed width to 100%
changed back to project ideas for demo purposes
added first meeting details to newideapanel
added watsons box header above watson boxes
changed from link to button
added or between the two options
...
Conflicts:
resources/db_update_scripts/current.sql
2012-12-04 09:01:28 +01:00
525cb0ff60
project notification - activity added
2012-12-04 08:51:09 +01:00
Emil Siverhall
31bf912ad7
Merge branch 'deployFix_20121204' into develop
2012-12-04 08:33:35 +01:00
Emil Siverhall
ce90a7d8e2
new idea details dialog for supervisors was showing the idea authors twice. removed panel that isnt needed anymore
2012-12-04 08:30:22 +01:00
