Commit Graph

3375 Commits

Author SHA1 Message Date
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
86beee9929 add translations for timeline 2015-09-21 16:55:51 +02:00
Uwe Steinmann
a7736397a8 pass $timeline instead of $document to printTimeline() 2015-09-21 16:47:47 +02:00
Uwe Steinmann
fc909100d2 add link to timeline, move version info into last line 2015-09-21 16:47:05 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
b6012ae428 set homefolder to NULL if not set 2015-09-21 12:51:37 +02:00
Uwe Steinmann
0d89f5b1c6 set font size of timeline boxes 2015-09-21 12:43:16 +02:00
Uwe Steinmann
419af9880a initial version of getTimeline() 2015-09-21 12:42:58 +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
46db6dc803 add provisional translations for timeline 2015-09-18 07:58:48 +02:00
Uwe Steinmann
1004d5f1ee separate extraheader by js and css, only admins see timeline 2015-09-18 07:55:24 +02:00
Uwe Steinmann
8ee257068e add some styles for timeline 2015-09-18 07:54:43 +02:00
Uwe Steinmann
753733d153 set type and params in list of timeline actions 2015-09-18 07:54:08 +02:00
Uwe Steinmann
71ba7412ce split extraheader into js and css, msg in timeline can be translated 2015-09-18 07:53:20 +02:00
Uwe Steinmann
b55627f213 add initial support for timeline of recent changes 2015-09-16 21:19:46 +02:00
Uwe Steinmann
4206f5d32a log approval/reject 2015-09-16 17:31:09 +02:00
Uwe Steinmann
a263c6c36b various new translations in modal boxes while loading contents, updates 2015-09-16 12:01:43 +02:00
Uwe Steinmann
ab35650f0b check if settings->_libraryFolder is set before using it 2015-09-16 11:25:59 +02:00
Uwe Steinmann
850bb05481 add superfluous code 2015-09-16 11:10:11 +02:00
Uwe Steinmann
524e361439 add constraint tblUsers_homefolder after creating tblFolders
set homefolder to NULL when creating initial users
2015-09-14 18:18:52 +02:00
Uwe Steinmann
3d1cb2beb3 add changes for 4.3.21 2015-09-03 16:52:17 +02:00
Uwe Steinmann
f11738fbb1 show preview of file and date of creation 2015-09-03 15:16:20 +02:00
Uwe Steinmann
8d7bceefac pass preview parameters to view 2015-09-03 15:16:00 +02:00
Uwe Steinmann
5a534e6b71 use translation for text when modal boxes are loading its content 2015-09-03 15:15:12 +02:00
Uwe Steinmann
e142404c71 make dialog for drop folder file list wider 2015-09-03 15:14:38 +02:00
Uwe Steinmann
459739bd01 file for creating preview in list of files in dropfolder 2015-09-03 15:13:59 +02:00
Uwe Steinmann
c3982f05bf previews can be created from files on the disc (e.g. the dropfolder) 2015-09-03 15:13:06 +02:00
Uwe Steinmann
0a4e2861ce fix sql statements when searching fro attributes (Closes #227) 2015-08-31 07:58:09 +02:00
Uwe Steinmann
07053ca7e9 check for includecontent checkbox and pass it to url 2015-08-25 16:44:07 +02:00
Uwe Steinmann
022490e461 set propper content type for excel documents 2015-08-25 16:43:27 +02:00
Uwe Steinmann
397c5ee9d8 Merge branch 'seeddms-5.0.x' into develop 2015-08-25 14:58:49 +02:00
Uwe Steinmann
78b39a24c5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-25 14:58:35 +02:00
Uwe Steinmann
eca7d067c5 add getParam() 2015-08-25 14:58:16 +02:00
Uwe Steinmann
8c0377aa39 Merge branch 'seeddms-5.0.x' into develop 2015-08-21 11:10:23 +02:00
Uwe Steinmann
2be77ac0e9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-21 11:10:05 +02:00
Uwe Steinmann
8256b61e36 do not output info if no user is selected 2015-08-21 11:09:38 +02:00
Uwe Steinmann
b7de0f61c7 Merge branch 'seeddms-5.0.x' into develop 2015-08-20 22:38:08 +02:00
Uwe Steinmann
cd3ca37885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 22:37:50 +02:00
Uwe Steinmann
0ae71871ef fix php warning in getProgressBar() 2015-08-20 16:22:05 +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
26819ce00e add method info(), place output of info below user selection 2015-08-20 15:55:03 +02:00
Uwe Steinmann
139b498d14 use new method getProgressBar() 2015-08-20 15:54:40 +02:00
Uwe Steinmann
d63b427822 use __invoke() when calling view 2015-08-20 15:54:17 +02:00
Uwe Steinmann
80f0499d1b add method __invoke()
calls the function whose name is passed as $_GET['action']
2015-08-20 15:53:30 +02:00
Uwe Steinmann
ca32bc856e add method getProgressBar() 2015-08-20 15:52:46 +02:00
Uwe Steinmann
f59751aa14 set data-view and data-action in div.ajax tag instead of data-href 2015-08-20 14:52:36 +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
e97de9c6df Merge branch 'seeddms-5.0.x' into develop 2015-08-19 20:16:40 +02:00