fred-fri
|
328f2788d0
|
added new db update file
20130816
|
2013-08-16 16:10:34 +09:00 |
|
fred-fri
|
e8238a2779
|
Merge branch 'studentpremandatory' into develop
|
2013-08-16 12:20:23 +09:00 |
|
fred-fri
|
6515d3bf04
|
fixed conflicts, improved panel
|
2013-08-16 11:49:48 +09:00 |
|
fred-fri
|
502fd1a262
|
some improvements
|
2013-08-16 11:23:22 +09:00 |
|
fred-fri
|
f6db74c0b9
|
fixed conflict
|
2013-08-16 10:56:32 +09:00 |
|
Emil Siverhall
|
032088a4ce
|
Merge branch 'forum/post_sorting' into develop
|
2013-08-15 12:45:26 +02:00 |
|
Emil Siverhall
|
70e4497053
|
changed authorization from sysadmin to new forum pages
|
2013-08-15 11:29:58 +02:00 |
|
Emil Siverhall
|
965c9adfd0
|
updated forum index links to use base pages + test updates
|
2013-08-15 11:29:56 +02:00 |
|
Emil Siverhall
|
19f378ad20
|
sort order setting for forum posts in the threaded version now available for users
|
2013-08-15 11:29:53 +02:00 |
|
Emil Siverhall
|
c6c6e93ac2
|
threaded forum setting added to current.sql
|
2013-08-15 11:29:05 +02:00 |
|
Emil Siverhall
|
87d6e57835
|
a lot of updated test classes
|
2013-08-15 11:28:12 +02:00 |
|
Emil Siverhall
|
133965d81d
|
a lot of work with correct notifications for forum module. users should be sent to the correct forum style depending on their settings
|
2013-08-15 11:28:10 +02:00 |
|
Emil Siverhall
|
331b906392
|
switch forum links for authors
|
2013-08-15 11:28:07 +02:00 |
|
Emil Siverhall
|
018090ce1e
|
base page for authors as well
|
2013-08-15 11:28:05 +02:00 |
|
Emil Siverhall
|
dea64d8753
|
links between forums now save user settings
|
2013-08-15 11:28:03 +02:00 |
|
Emil Siverhall
|
51a5f2badc
|
new supervisor forum base page that redirects to appropriate forum based on user profile settings
|
2013-08-15 11:28:01 +02:00 |
|
Emil Siverhall
|
50886680dc
|
added forum switch setting to user profile
|
2013-08-15 11:27:58 +02:00 |
|
Emil Siverhall
|
a1d282b81f
|
added sort thread by text
|
2013-08-15 11:27:56 +02:00 |
|
Emil Siverhall
|
4a14c12178
|
correct highlighting for both authors and supervisors
|
2013-08-15 11:27:54 +02:00 |
|
Emil Siverhall
|
2006e414ac
|
correct highlighting on author forum tabs
|
2013-08-15 11:27:52 +02:00 |
|
Emil Siverhall
|
1c6ddb8a78
|
fixed some tests and moved radio choice text strings to property file
|
2013-08-15 11:27:50 +02:00 |
|
Emil Siverhall
|
d6c5d3ab2c
|
moved the back-link to the view forum panel to make it easier to put sort radios in the same div
|
2013-08-15 11:27:47 +02:00 |
|
Emil Siverhall
|
22d0b9cac7
|
added radio choices for sort order in threaded forum
|
2013-08-15 11:27:45 +02:00 |
|
Emil Siverhall
|
84ffd9b3e6
|
updated test to work with dataview instead of list view
|
2013-08-15 11:27:42 +02:00 |
|
Emil Siverhall
|
3ed4fde1e0
|
switched to use a dataview to present posts in the threaded forum view to make it easier to implement sorting
|
2013-08-15 11:27:40 +02:00 |
|
Emil Siverhall
|
8bd9d12d19
|
link to threaded forum as well
|
2013-08-15 11:27:38 +02:00 |
|
Emil Siverhall
|
7589b21f16
|
threaded forum page now have link to the non threaded view
|
2013-08-15 11:27:35 +02:00 |
|
fred-fri
|
6d4d694755
|
erased commented out stuff
|
2013-08-15 14:22:13 +09:00 |
|
fred-fri
|
6ad5af4697
|
fixed conflict
|
2013-08-15 13:36:17 +09:00 |
|
fred-fri
|
7d2f0dee74
|
commented out old sql
|
2013-08-15 13:12:59 +09:00 |
|
fred-fri
|
5edd538634
|
fixed tests
|
2013-08-15 12:53:00 +09:00 |
|
fred-fri
|
33a4e78735
|
moved some stuff into panel
|
2013-08-15 12:22:49 +09:00 |
|
fred-fri
|
2e9f2ece78
|
Merge branch 'thesiscommentremindexclude' into develop
|
2013-08-15 11:50:04 +09:00 |
|
fred-fri
|
c130082ffc
|
checkbox works
|
2013-08-15 11:15:59 +09:00 |
|
fred-fri
|
167d9ca2f3
|
looks better
|
2013-08-15 10:42:16 +09:00 |
|
fred-fri
|
2e20fb4f01
|
looks better
|
2013-08-15 10:34:16 +09:00 |
|
fred-fri
|
c2a8df0c8a
|
test works properly now
|
2013-08-14 15:48:59 +09:00 |
|
fred-fri
|
c1d0d40b38
|
adding contract
|
2013-08-14 15:45:44 +09:00 |
|
fred-fri
|
6026627f54
|
added limit
|
2013-08-14 15:12:50 +09:00 |
|
fred-fri
|
45a5ec73aa
|
added lmiit
|
2013-08-14 15:01:19 +09:00 |
|
fred-fri
|
d5883a863d
|
small text adjustment
|
2013-08-14 14:05:45 +09:00 |
|
fred-fri
|
b0d5a6e3fd
|
adding checkbox
|
2013-08-14 14:01:27 +09:00 |
|
fred-fri
|
27241d88e6
|
adding checkbox
|
2013-08-14 13:55:24 +09:00 |
|
fred-fri
|
cf8ad393f8
|
added info
|
2013-08-14 13:31:30 +09:00 |
|
fred-fri
|
56d3b71faf
|
added test, intentionally incorrect implementation
|
2013-08-14 12:37:47 +09:00 |
|
fred-fri
|
d5e708ad77
|
changed dateformatter methods
|
2013-08-14 11:41:51 +09:00 |
|
fred-fri
|
ef1a981ebf
|
cleanup up url
|
2013-08-14 11:34:04 +09:00 |
|
fred-fri
|
d4155d1ab1
|
added status completed to countmatched method because they should also be counted in it
|
2013-08-14 11:30:49 +09:00 |
|
fred-fri
|
182f110d85
|
made exemptions work
|
2013-08-13 13:56:38 +09:00 |
|
fred-fri
|
444672ad83
|
resolved some conflicts
|
2013-08-13 12:25:40 +09:00 |
|