Commit Graph

132 Commits

Author SHA1 Message Date
Uwe Steinmann
bc608eff07 Merge branch 'seeddms-5.0.x' into develop 2016-02-15 20:45:05 +01:00
Uwe Steinmann
380718266f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 20:33:52 +01:00
Uwe Steinmann
9b1faa429f propperly set timeout of noty message if not passed 2016-02-15 17:44:56 +01:00
Uwe Steinmann
47a72cc2db move js for sending test mail into view 2016-02-15 09:27:44 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
76f5a89f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-02 09:48:18 +01:00
Uwe Steinmann
f139625e4f fix link in autocompletion when search for object 2016-01-29 16:46:37 +01:00
Uwe Steinmann
ad41fd2571 fix calling checkTasks() 2016-01-19 10:10:38 +01:00
Uwe Steinmann
3bd4605c1f Merge branch 'seeddms-5.0.x' into develop 2016-01-18 12:17:35 +01:00
Uwe Steinmann
7568adb054 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-18 12:17:16 +01:00
Uwe Steinmann
60ba9577de new version which fixes a security hole 2016-01-14 20:04:18 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +01:00
Uwe Steinmann
1dff276217 div.splash can have a timeout attribute 2015-12-16 07:14:27 +01:00
Uwe Steinmann
abf1b90297 div.splash can have a timeout attribute 2015-12-16 06:35:46 +01:00
Uwe Steinmann
85e9dc25bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-11 20:35:20 +01:00
Uwe Steinmann
836fcd4457 remove all javascript from html output and place in a seperate file
this requires to change the popover into bootbox
2015-12-11 20:29:52 +01:00
Uwe Steinmann
c80d579072 add bootbox 2015-12-11 20:23:01 +01:00
Uwe Steinmann
01aac2c23c div.splash will be used as splash message
make it hidden on the page
2015-12-11 08:11:10 +01:00
Uwe Steinmann
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +01:00
Uwe Steinmann
50e0d2a885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-30 08:41:40 +01:00
Uwe Steinmann
0c98a1ae71 class .datepicker turns datepicker on 2015-10-30 08:03:31 +01:00
Uwe Steinmann
f78e02e7e8 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 11:43:40 +01:00
Uwe Steinmann
b7d1b0e663 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 11:42:39 +01:00
Uwe Steinmann
aa1f10af1c add word-break class to output of orig filename
breaking long filenames will leave more space for the preview image
2015-10-27 11:41:02 +01:00
Uwe Steinmann
031129a31c Merge branch 'seeddms-5.0.x' into develop 2015-10-20 18:21:47 +02:00
Uwe Steinmann
2f9e015856 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:20:24 +02:00
Uwe Steinmann
1972d961f3 initial test with webkitRelativePath (not used) 2015-10-20 18:14:39 +02:00
Uwe Steinmann
e52059df64 set color of div.timeline-event-selected 2015-10-19 13:16:28 +02:00
Uwe Steinmann
ddfea8f3cb Merge branch 'seeddms-5.0.x' into develop 2015-09-28 12:35:18 +02:00
Uwe Steinmann
1ab19f6831 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 12:35:04 +02:00
Uwe Steinmann
01449f66e3 check if data-query is set in div.ajax elements, pass it to the url 2015-09-25 16:16:48 +02:00
Uwe Steinmann
42b5162ca4 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 14:43:13 +02:00
Uwe Steinmann
f2762b6685 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:36:05 +02:00
Uwe Steinmann
de6cc16428 set background for items in timeline 2015-09-23 14:35:42 +02:00
Uwe Steinmann
b0edf297a2 Merge branch 'seeddms-5.0.x' into develop 2015-09-22 16:01:09 +02:00
Uwe Steinmann
58731cfdde Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 15:59:47 +02:00
Uwe Steinmann
cb4c6a5dbb add missing images for timeline 2015-09-22 10:55:27 +02:00
Uwe Steinmann
6be0d179fc Merge branch 'seeddms-5.0.x' into develop 2015-09-21 16:58:25 +02:00
Uwe Steinmann
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
0d89f5b1c6 set font size of timeline boxes 2015-09-21 12:43:16 +02:00
Uwe Steinmann
d54172d366 Merge branch 'seeddms-5.0.x' into develop 2015-09-18 08:00:06 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
8ee257068e add some styles for timeline 2015-09-18 07:54:43 +02:00
Uwe Steinmann
e142404c71 make dialog for drop folder file list wider 2015-09-03 15:14:38 +02:00
Uwe Steinmann
b7de0f61c7 Merge branch 'seeddms-5.0.x' into develop 2015-08-20 22:38:08 +02:00
Uwe Steinmann
6e80f025cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 15:55:53 +02:00
Uwe Steinmann
36135883ee div.ajax uses data-view and data-action attributes if set 2015-08-20 14:51:14 +02:00
Uwe Steinmann
4c6eb18528 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 06:09:20 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00