fred-fri
|
f8988e5e71
|
Merge branch 'languagesdefault' into develop
20130906
|
2013-09-05 17:33:45 +09:00 |
|
fred-fri
|
373252feb3
|
refactored roledao to use addlangauges in roleservice, kind of absurd but yeah until the dao is replaced this is how it has to be
|
2013-09-05 17:33:31 +09:00 |
|
fred-fri
|
8059191cb1
|
added addlanguagesmethod code to roleservice too
|
2013-09-05 17:27:45 +09:00 |
|
fred-fri
|
b7fdbcd495
|
Merge branch 'forumpostorder' into develop
|
2013-09-05 16:52:15 +09:00 |
|
fred-fri
|
043d58e060
|
commented out tests that crash for mysterious reasons
|
2013-09-05 16:52:08 +09:00 |
|
fred-fri
|
bf22de0cb1
|
cleanup
|
2013-09-05 16:43:18 +09:00 |
|
fred-fri
|
d21d425cc8
|
fixed most of the tests
|
2013-09-05 16:33:22 +09:00 |
|
fred-fri
|
8af25d3f36
|
Merge branch 'ajaxdrop' into develop
|
2013-09-05 15:55:32 +09:00 |
|
fred-fri
|
1ea00553d1
|
cleanup
|
2013-09-05 15:55:06 +09:00 |
|
fred-fri
|
b34b739728
|
Merge branch 'watsonjoin' into develop
|
2013-09-05 14:42:54 +09:00 |
|
fred-fri
|
a4acd44160
|
moved watsoncharlimit to watson
|
2013-09-05 14:42:35 +09:00 |
|
fred-fri
|
662b8a5db7
|
Merge branch 'watsonlimit' into develop
|
2013-09-05 14:34:27 +09:00 |
|
fred-fri
|
85894eb77d
|
Merge branch 'log' into develop
|
2013-09-05 14:33:03 +09:00 |
|
fred-fri
|
d1783c1d8e
|
changed forum content to multilinelabels
|
2013-09-04 11:31:05 +09:00 |
|
fred-fri
|
b9079fd634
|
deleted unused component
|
2013-09-04 10:57:37 +09:00 |
|
fred-fri
|
37298f65b3
|
changed component and fixed markup
|
2013-09-04 10:57:05 +09:00 |
|
fred-fri
|
a0bdf25ce4
|
added constructor with model with list
|
2013-09-04 10:51:59 +09:00 |
|
fred-fri
|
6540f95db7
|
fixed forum post order, tests fail though
|
2013-08-29 14:00:03 +09:00 |
|
fred-fri
|
f233ab46d2
|
added application period targets remaining info
|
2013-08-29 13:05:08 +09:00 |
|
fred-fri
|
88ae9aca51
|
added both languages as default when creating new employees
|
2013-08-28 16:54:27 +09:00 |
|
fred-fri
|
4a92be5190
|
added application period title
|
2013-08-28 16:01:49 +09:00 |
|
fred-fri
|
1e7e26afea
|
joined watsoncolumns
|
2013-08-28 15:37:26 +09:00 |
|
fred-fri
|
32a45876ce
|
lowered watsonlimit to 200
|
2013-08-28 15:24:57 +09:00 |
|
fred-fri
|
2195f6a451
|
fixed duplicate participations bug
|
2013-08-27 12:46:52 +09:00 |
|
fred-fri
|
4317ed7155
|
removed unused component
|
2013-08-26 11:05:03 +09:00 |
|
fred-fri
|
bdd72aeee3
|
changed component
|
2013-08-26 10:56:26 +09:00 |
|
fred-fri
|
51fa64cb9c
|
switching to use slf4j interface instead of direct to log4j
|
2013-08-23 14:46:53 +09:00 |
|
fred-fri
|
37548bd090
|
switching to use slf4j interface instead of direct to log4j
|
2013-08-23 14:44:49 +09:00 |
|
fred-fri
|
f57c0802dc
|
switching to use slf4j interface instead of direct to log4j
|
2013-08-23 14:42:47 +09:00 |
|
fred-fri
|
d99fce1cb2
|
switching to use slf4j interface instead of direct to log4j
|
2013-08-23 14:37:47 +09:00 |
|
fred-fri
|
a59bb22a72
|
added sql
20130823
|
2013-08-23 12:06:42 +09:00 |
|
fred-fri
|
6777e2146c
|
Merge branch 'merge' into develop
|
2013-08-23 10:54:52 +09:00 |
|
fred-fri
|
eba5d60590
|
removed some more methods
|
2013-08-23 10:54:15 +09:00 |
|
fred-fri
|
40153bd89c
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-08-23 10:39:36 +09:00 |
|
fred-fri
|
25920822d5
|
Merge branch 'studentsearch' into develop
|
2013-08-23 10:30:16 +09:00 |
|
fred-fri
|
72793ae787
|
primary key
|
2013-08-22 17:08:28 +09:00 |
|
fred-fri
|
e8d3fe3646
|
cleanup
|
2013-08-22 16:45:05 +09:00 |
|
fred-fri
|
7d3893019d
|
deleted employeeservice, redirected calls to supervisorservice
|
2013-08-22 16:30:22 +09:00 |
|
Emil Siverhall
|
af805bdf03
|
Merge branch 'notification_bug' into develop
|
2013-08-22 09:21:36 +02:00 |
|
Emil Siverhall
|
1cdba6c657
|
prevent notification bug when attaching to long forum messages as notficiation source.
|
2013-08-22 09:21:05 +02:00 |
|
fred-fri
|
26ad0cc842
|
removed unused package
|
2013-08-22 15:32:29 +09:00 |
|
fred-fri
|
d7da0a3d8f
|
equals hashcode
|
2013-08-22 14:46:30 +09:00 |
|
fred-fri
|
3661352814
|
seems to work
|
2013-08-22 13:55:17 +09:00 |
|
fred-fri
|
e01251213d
|
trying to refactor
|
2013-08-22 13:49:58 +09:00 |
|
fred-fri
|
0c29f51ef1
|
trying to refactor
|
2013-08-22 13:41:37 +09:00 |
|
fred-fri
|
916ed6eb1a
|
trying to refactor
|
2013-08-22 13:31:33 +09:00 |
|
fred-fri
|
f17dd98137
|
return null;
|
2013-08-22 12:24:29 +09:00 |
|
fred-fri
|
aa7fca3282
|
fixed conflict
|
2013-08-22 10:41:39 +09:00 |
|
fred-fri
|
21e03706c3
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-08-22 10:18:53 +09:00 |
|
Emil Siverhall
|
bc621b3127
|
Merge branch 'forum/mark_all' into develop
|
2013-08-21 22:50:53 +02:00 |
|