Commit Graph

3706 Commits

Author SHA1 Message Date
Uwe Steinmann
13dc351928 more changes for 4.3.22 2015-10-27 09:02:30 +01:00
Uwe Steinmann
3fbc24759d add changes for 4.3.22 2015-10-27 09:01:17 +01:00
Uwe Steinmann
6a4402a1d6 add mp4 to view filetypes 2015-10-27 08:57:26 +01:00
Uwe Steinmann
e35cc9f3c6 fix setting of Content-Type in header (Closes: #233) 2015-10-22 13:36:23 +02:00
Uwe Steinmann
15040a2f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:36:57 +02:00
Uwe Steinmann
af91b6813f do not use reference to array item, use index 2015-10-20 18:36:24 +02: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
47c2083fe6 do not set min/max anymore as it can't be changed afterwards 2015-10-20 18:15:08 +02:00
Uwe Steinmann
1972d961f3 initial test with webkitRelativePath (not used) 2015-10-20 18:14:39 +02:00
Uwe Steinmann
193077fdcd properly set homefolder to NULL when creating a user 2015-10-19 13:42:19 +02:00
Uwe Steinmann
e52059df64 set color of div.timeline-event-selected 2015-10-19 13:16:28 +02:00
Uwe Steinmann
f83ae3eda1 printTimeline() retrieves data from ajax 2015-10-19 13:15:52 +02:00
Uwe Steinmann
88e0a57135 add ajax function for returning the timeline data 2015-10-19 13:15:20 +02:00
Uwe Steinmann
2c79669c94 pass $_GET to view 2015-10-19 13:14:50 +02:00
Uwe Steinmann
002fa8df29 get timeline data in ajax call 2015-10-19 13:14:14 +02:00
Uwe Steinmann
54b2e8a881 add statusid and fileid in entry of timeline 2015-10-19 13:12:35 +02:00
Uwe Steinmann
dc66a5959d use converters 2015-09-30 13:22:25 +02:00
Uwe Steinmann
7ba956d760 Merge branch 'seeddms-5.0.x' into develop 2015-09-30 12:10:39 +02:00
Uwe Steinmann
c17d7246ad call hook for setting msg of timeline item 2015-09-29 12:12:01 +02:00
Uwe Steinmann
15bedc303e Merge branch 'seeddms-5.0.x' into develop 2015-09-28 14:54:03 +02:00
Uwe Steinmann
1d626fc7e5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 14:53:46 +02:00
Uwe Steinmann
4e71830aaa add more entries for 4.3.21 2015-09-28 14:45:20 +02:00
Uwe Steinmann
ea20501ed3 update date of new version 2015-09-28 14:34:19 +02:00
Uwe Steinmann
33c5e313d0 do not pass parameter 'localtime' to strftime() 2015-09-28 13:25:00 +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
a91d385ee8 add some translations for timeline 2015-09-28 12:34:38 +02:00
Uwe Steinmann
7e507e6a9e fix searching in fulltext, number of hits and pages was often wrong 2015-09-28 12:32:41 +02:00
Uwe Steinmann
9514115460 rename doNotCheckVersion to doNotCheckDBVersion 2015-09-28 06:39:26 +02:00
Uwe Steinmann
23362f8146 remove old code, set data-query in div.ajax elements
load an initial user when the page is opened
2015-09-25 16:17:23 +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
fd92628c30 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 18:11:17 +02:00
Uwe Steinmann
d43dc75207 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 18:05:47 +02:00
Uwe Steinmann
ca3970c9c3 fix setting date in timeline 2015-09-23 18:05:30 +02:00
Uwe Steinmann
4012122e5e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 18:00:16 +02:00
Uwe Steinmann
dba8e78dc8 reformat datetime for timeline 2015-09-23 17:59:39 +02:00
Uwe Steinmann
37f9771b97 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 17:21:26 +02:00
Uwe Steinmann
874066a7fc Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 17:21:17 +02:00
Uwe Steinmann
b456b02fbd add timeline to admin menu 2015-09-23 17:11:09 +02:00
Uwe Steinmann
d2d2d8a415 some more french translations, updated translations for timeline 2015-09-23 17:03:06 +02:00
Uwe Steinmann
42dbb30e22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 16:03:15 +02:00
Uwe Steinmann
659f788de4 do not show subheader of timeline if empty 2015-09-23 15:50:04 +02:00
Uwe Steinmann
3f82cb1957 do not add item to timeline if date is empty 2015-09-23 15:47:46 +02:00
Uwe Steinmann
3c13873195 fix syntax error 2015-09-23 15:00:47 +02:00
Uwe Steinmann
ea3fe81a0e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:56:59 +02:00
Uwe Steinmann
da168c3eec check if _GET[skip] is set 2015-09-23 14:56:28 +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