|
|
f1f67e95a1
|
Renamed UserLocation to UserBasedLocation and changed its contract slightly so that it is required to pass PageParameters.
|
2014-11-19 11:26:09 +01:00 |
|
|
|
9731966d7d
|
Use existing StringValue extension methods.
|
2014-11-19 11:04:36 +01:00 |
|
|
|
8e444a4e54
|
Merge branch 'develop' into landing_page
|
2014-11-19 10:59:51 +01:00 |
|
|
|
822fa07809
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-19 10:11:50 +01:00 |
|
|
|
c488a3291c
|
Sonar.
|
2014-11-19 10:11:42 +01:00 |
|
|
|
85b7af9ccb
|
Removed unused method.
|
2014-11-19 10:08:23 +01:00 |
|
fred-fri
|
95e13d164d
|
ok less chaosy markup now
|
2014-11-19 15:05:04 +09:00 |
|
fred-fri
|
b5404860a3
|
more markup. the markup is a bit all over the place and doesnt gracefully tolerate small screen sizes, but its tricky to do much better because of the hierarchy of the components.
also removing old tests.
|
2014-11-19 14:22:26 +09:00 |
|
fred-fri
|
65047a6c63
|
markup
|
2014-11-19 13:50:19 +09:00 |
|
fred-fri
|
1e3b09aee1
|
markup
|
2014-11-19 13:45:56 +09:00 |
|
fred-fri
|
4e7d984222
|
markup
|
2014-11-19 13:09:32 +09:00 |
|
fred-fri
|
3fe66b9979
|
refactoring edit checklist template
|
2014-11-19 11:18:01 +09:00 |
|
|
|
b7e67b7b6e
|
Fixed so that the proper detached model is used instead of unpacking it.
|
2014-11-17 16:10:41 +01:00 |
|
fred-fri
|
c8d2731788
|
ajax on checklist answer
|
2014-11-17 17:08:05 +09:00 |
|
fred-fri
|
4612527026
|
loadable checklist
|
2014-11-17 16:04:06 +09:00 |
|
fred-fri
|
c3ffa3a58b
|
sending to mail page
|
2014-11-17 12:49:10 +09:00 |
|
fred-fri
|
aec56295a2
|
merge and remove page
|
2014-11-17 11:07:58 +09:00 |
|
fred-fri
|
67eaae9345
|
merge
|
2014-11-17 10:50:04 +09:00 |
|
fred-fri
|
85ce083c4a
|
user profile notifications setting whether to receive forum mails
|
2014-11-14 16:18:51 +09:00 |
|
fred-fri
|
c03ae07a92
|
larger popup, info
|
2014-11-14 13:10:15 +09:00 |
|
fred-fri
|
c95ee802e2
|
lazy stuff
|
2014-11-14 12:08:26 +09:00 |
|
fred-fri
|
da47bba25f
|
prevent crash on exempt already exempted user
|
2014-11-14 11:33:00 +09:00 |
|
fred-fri
|
54a6495fc4
|
multiline
|
2014-11-14 10:33:32 +09:00 |
|
fred-fri
|
eb748d9a8b
|
refactoring
|
2014-11-13 14:38:07 +09:00 |
|
fred-fri
|
ac9c4ce547
|
system template
|
2014-11-13 12:54:50 +09:00 |
|
fred-fri
|
927f063169
|
more cleaning
|
2014-11-12 15:34:07 +09:00 |
|
fred-fri
|
e6cc63b188
|
cleaning
|
2014-11-12 15:13:27 +09:00 |
|
fred-fri
|
6e62cdfdd0
|
moving form
|
2014-11-12 14:53:01 +09:00 |
|
fred-fri
|
c78d26c573
|
copy to clipboard
|
2014-11-12 14:26:23 +09:00 |
|
fred-fri
|
11f30a73f5
|
refactor mail panel, selection of recipients more granular
|
2014-11-12 12:07:31 +09:00 |
|
|
|
7b57c9a023
|
Yuck un-threaded forum.
|
2014-11-11 16:39:51 +01:00 |
|
golrokh
|
e52cd97e5c
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
|
2014-11-11 14:08:32 +01:00 |
|
golrokh
|
5db9a34418
|
sql for updating old thesis event
|
2014-11-11 13:55:59 +01:00 |
|
|
|
51334357c5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-11 13:26:44 +01:00 |
|
|
|
714e19b0ea
|
Converted unnecessary DataView to simpler ListView (there was no paging and Long.MAX_VALUE threads per page).
|
2014-11-11 13:26:39 +01:00 |
|
|
|
d793ce1596
|
Renamed ForumThreadProvider to ProjectThreadProvider since that is what it is.
|
2014-11-11 12:36:38 +01:00 |
|
golrokh
|
1a78389145
|
Merge branch 'develop' into separateFinalSeminarAndRoughDraftEvents
Conflicts:
core/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java
core/src/test/java/se/su/dsv/scipro/crosscutting/ReviewingNotificationsTest.java
view/src/main/java/se/su/dsv/scipro/landingpages/ProjectLandingPage.java
|
2014-11-11 11:31:49 +01:00 |
|
fred-fri
|
f90e1865fd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-11 17:40:49 +09:00 |
|
fred-fri
|
c5279f93aa
|
removed default "chart title"
|
2014-11-11 17:40:35 +09:00 |
|
|
|
6758d3ad63
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-11-11 09:14:05 +01:00 |
|
fred-fri
|
8988d9273d
|
markup fixes
|
2014-11-11 17:07:59 +09:00 |
|
|
|
b5ef548834
|
Merge branch 'develop' into forum
|
2014-11-11 09:04:18 +01:00 |
|
fred-fri
|
7e1ae65c8f
|
mail page fixes
|
2014-11-11 16:41:25 +09:00 |
|
fred-fri
|
f792677817
|
reset sorting
|
2014-11-11 16:27:18 +09:00 |
|
fred-fri
|
33f486095d
|
not always sys admin for users who have the role, but only when template is created in the admin interface
|
2014-11-11 16:18:23 +09:00 |
|
fred-fri
|
10c82390df
|
book a room
|
2014-11-11 16:06:50 +09:00 |
|
fred-fri
|
7f8f923ff4
|
removing plugins
|
2014-11-11 16:04:00 +09:00 |
|
fred-fri
|
0db682c32e
|
date fix
|
2014-11-11 15:13:29 +09:00 |
|
fred-fri
|
91a6e36748
|
visibility fix
|
2014-11-11 14:19:34 +09:00 |
|
fred-fri
|
65a423c09f
|
chart improvements
|
2014-11-11 11:33:53 +09:00 |
|
