fred-fri
|
32ce7b86b2
|
Merge branch 'release20130114'
20130114
|
2013-01-14 17:16:33 +09:00 |
|
fred-fri
|
4b5c09d561
|
added new db update file
|
2013-01-14 17:09:44 +09:00 |
|
fred-fri
|
07d5428f7a
|
changed datetimes to stylabledatetimes
|
2013-01-14 16:48:29 +09:00 |
|
fred-fri
|
56febd5d56
|
replaced one customdate with stylable
|
2013-01-14 16:35:12 +09:00 |
|
fred-fri
|
5adb97b5f9
|
added ajax method to styleable
|
2013-01-14 16:24:09 +09:00 |
|
fred-fri
|
6034fd79b8
|
keywords css fixed
|
2013-01-14 15:11:19 +09:00 |
|
fred-fri
|
931546f834
|
fixed bug in cleanstring method
|
2013-01-14 14:12:25 +09:00 |
|
fred-fri
|
ce4be0f530
|
refactored the stupid longtointservice into the utility class
|
2013-01-14 13:04:33 +09:00 |
|
fred-fri
|
fee658e9cf
|
copied longtoint method into utility class
|
2013-01-14 12:47:26 +09:00 |
|
fred-fri
|
ddbc355915
|
corrected error in the shorter method fix
|
2013-01-14 12:35:31 +09:00 |
|
fred-fri
|
d7472d4390
|
checking that all titles can indeed be displayed in dialogs
|
2013-01-14 12:30:52 +09:00 |
|
fred-fri
|
38b2aec4fd
|
hooked up another method to the previous stuff
|
2013-01-14 12:25:34 +09:00 |
|
fred-fri
|
c3e7f7eee9
|
created new utility class and hooked up project gettitle method to it to clean title strings before they are used
|
2013-01-14 12:14:49 +09:00 |
|
fred-fri
|
7837adac01
|
found a good regexp that removes all (?) control and non-printable characters"
|
2013-01-14 11:29:44 +09:00 |
|
fred-fri
|
0d6122ee0d
|
replaced a if else with onvisibility allowed and removed old supervisor project panel no longer in use
|
2013-01-14 09:29:58 +09:00 |
|
|
|
86d5388d82
|
Merge branch 'feature/notifications/idea' into develop
|
2013-01-11 14:12:15 +01:00 |
|
|
|
74672b4e28
|
New ideas are now saved again.
|
2013-01-11 14:10:19 +01:00 |
|
|
|
7f78fa5a80
|
User label no longer displays itself if user is null (no more floating icon)
|
2013-01-11 14:09:08 +01:00 |
|
Emil Siverhall
|
e82108b786
|
Merge branch 'checklistFix' into develop
|
2013-01-11 13:00:13 +01:00 |
|
Emil Siverhall
|
3e218caf09
|
css styling on answer checklist dialog
|
2013-01-11 13:00:05 +01:00 |
|
Emil Siverhall
|
1411e80c09
|
Merge branch 'ideasCSS' into develop
|
2013-01-11 10:37:42 +01:00 |
|
Emil Siverhall
|
852e1b21c1
|
finished css work at old idea submission page
|
2013-01-11 10:31:22 +01:00 |
|
Emil Siverhall
|
f3e903d793
|
working on old idea submission css
|
2013-01-11 10:31:20 +01:00 |
|
Emil Siverhall
|
a95647aaeb
|
fixed css at scipro2/projectideas/allsupervisor
|
2013-01-11 10:31:18 +01:00 |
|
Emil Siverhall
|
072ea69e3f
|
fixed countByStatusAndCapabilities in supervisor idea service to give correct numbers
|
2013-01-11 10:31:16 +01:00 |
|
Emil Siverhall
|
c23c893cf2
|
label alignment on filter form checkbox panel
|
2013-01-11 10:31:14 +01:00 |
|
fred-fri
|
a1f95468ff
|
switched to stylable datetime component
|
2013-01-11 17:09:25 +09:00 |
|
Emil Siverhall
|
1bcdac41fc
|
Merge branch 'dateTime' into develop
|
2013-01-11 08:44:16 +01:00 |
|
Emil Siverhall
|
428c81b795
|
remade stylable date time field.
|
2013-01-11 08:44:08 +01:00 |
|
fred-fri
|
fd88ba66f5
|
hiding role links if user is not authorized for employee, admin or sysadmin roles
|
2013-01-11 14:13:00 +09:00 |
|
fred-fri
|
cede446ef1
|
removed old seminar panel
|
2013-01-11 11:12:26 +09:00 |
|
fred-fri
|
02635da3f5
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-11 10:59:11 +09:00 |
|
fred-fri
|
f39067c4de
|
fixed seminarpanel bugs
|
2013-01-11 10:58:41 +09:00 |
|
|
|
62d7023eff
|
Merge branch 'notifications' into develop
|
2013-01-10 18:03:31 +01:00 |
|
|
|
8a4b22eb8b
|
Notification settings are now toggleable to take up less real estate on the screen
|
2013-01-10 18:03:13 +01:00 |
|
|
|
cf1541e019
|
log4j now logs to a file as well /var/log/scipro/scipro.log to help debug external login
|
2013-01-10 17:23:48 +01:00 |
|
|
|
1d394d2038
|
Enabling both login modules again
Kerberos did not break even though the module was renamed
|
2013-01-10 16:43:15 +01:00 |
|
|
|
af34ed36f0
|
Turning off both login modules too try and narrow down the error
|
2013-01-10 16:13:01 +01:00 |
|
|
|
a3106e9792
|
PARTNER_ADDED events sent out for existing ideas as well
|
2013-01-10 12:33:46 +01:00 |
|
Emil Siverhall
|
44bee2dc12
|
Merge branch 'adminCSS' into develop
|
2013-01-10 09:18:38 +01:00 |
|
Emil Siverhall
|
4103a59b82
|
removed height limit on review template dialog in the peer portal
|
2013-01-10 09:18:21 +01:00 |
|
Emil Siverhall
|
096007fc8d
|
minor alignment adjustment when displaying completed review
|
2013-01-10 09:18:18 +01:00 |
|
Emil Siverhall
|
c74910a4e8
|
peer request submission page now looks better with new css
|
2013-01-10 09:18:16 +01:00 |
|
Emil Siverhall
|
fd1dda8914
|
added some rounded corners to our info-box class
|
2013-01-10 09:18:14 +01:00 |
|
Emil Siverhall
|
d58bfea60c
|
display question panel is now better styled with bootstrap css
|
2013-01-10 09:18:12 +01:00 |
|
Emil Siverhall
|
d02c80acf9
|
renamed misspelled applicable to match enum values already in the db
|
2013-01-10 09:18:09 +01:00 |
|
Emil Siverhall
|
3de9e07d1a
|
new css on create new application period dialog
|
2013-01-10 09:18:07 +01:00 |
|
Emil Siverhall
|
edbe1a81ee
|
better styling of the custom date time field component. now using bootstrap css for sizing
|
2013-01-10 09:18:05 +01:00 |
|
fred-fri
|
f2a78ff0aa
|
fixed bug in visibilityallowed logic
|
2013-01-10 16:53:16 +09:00 |
|
fred-fri
|
dbf04f4e0a
|
turned on lazy loading of projectfollowes to fix an exception
|
2013-01-10 15:42:32 +09:00 |
|
