154 Commits

Author	SHA1	Message	Date
Uwe Steinmann	d317388d18	Merge branch 'seeddms-5.0.x' into develop	2016-03-09 08:10:15 +01:00
Uwe Steinmann	9a319ef539	Merge branch 'seeddms-4.3.x' into seeddms-5.0.x	2016-03-09 08:06:37 +01:00
Uwe Steinmann	adcd6d7002	used for showing online editor	2016-03-09 07:48:50 +01:00
Uwe Steinmann	f859b48a57	Merge branch 'seeddms-5.0.x' into develop	2016-03-09 06:42:30 +01:00
Uwe Steinmann	dc3958b456	Merge branch 'seeddms-4.3.x' into seeddms-5.0.x	2016-03-09 06:40:14 +01:00
Uwe Steinmann	41c83dbe6d	remove various console.log()	2016-03-08 22:04:00 +01:00
Uwe Steinmann	aca3db06c2	Merge branch 'seeddms-5.0.x' into develop	2016-03-08 10:46:16 +01:00
Uwe Steinmann	91e57e49da	Merge branch 'seeddms-4.3.x' into seeddms-5.0.x	2016-03-08 10:42:21 +01:00
Uwe Steinmann	42ebb5d452	use bootbox when moving docs/folders via drag&drop	2016-03-08 10:38:51 +01:00
Uwe Steinmann	192700fd26	various minor cleanups	2016-03-08 08:02:17 +01:00
Uwe Steinmann	4bd2a9f766	Merge branch 'seeddms-5.0.x' into develop	2016-03-08 07:00:09 +01:00
Uwe Steinmann	4a45fb2e42	Merge branch 'seeddms-4.3.x' into seeddms-5.0.x	2016-03-08 06:59:18 +01:00
Uwe Steinmann	6098fc9057	much cleaner drap&drop support	2016-03-08 06:56:58 +01:00
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