Commit Graph

300 Commits

Author SHA1 Message Date
Uwe Steinmann
ca6f0303b2 put javascript into its own file and turn on content security policy 2016-03-18 15:33:18 +01:00
Uwe Steinmann
fc0b7a4e16 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-15 08:48:03 +01:00
Uwe Steinmann
d283c24979 put footnote into row-fluid 2016-03-15 08:28:23 +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
96db0eb052 dropfolderchoose can select folders 2016-03-08 18:33:54 +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
d67132f090 set formtoken on draggable documents/folders 2016-03-08 10:39:21 +01:00
Uwe Steinmann
e9c116cd7a object title in clipboard is not draggable 2016-03-08 08:01:41 +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
62095c443b override exiting query parameter 'action' when including js code 2016-02-29 08:36:10 +01:00
Uwe Steinmann
d984f75871 set $objvalue in printAttributeEditField() 2016-02-25 10:49:18 +01:00
Uwe Steinmann
0f991c2dc1 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-17 11:39:09 +01:00
Uwe Steinmann
a691c9628c remove extra variable in print[Document|Folder]ChooserJs() for modal form 2016-02-17 11:38:32 +01:00
Uwe Steinmann
be640b811d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-09 12:36:53 +01:00
Uwe Steinmann
ffdcbd0ce0 make click on .delete-document-btn and .delete-folder-btn work
even if the html is loaded by ajax
2016-02-09 12:35:30 +01:00
Uwe Steinmann
b04571da11 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-04 19:13:06 +01:00
Uwe Steinmann
8b6631da6a folderListRow() doesn't need folder from view 2016-02-04 19:03:48 +01:00
Uwe Steinmann
2317c092d6 fix setting default search method
the search form in the main menu will just set 'fulltext=1' if
fulltext is the default method. out/out.Search.php will not
check for the defaultSearchMethod
2016-02-03 14:46:06 +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
a8a86193af unfold tree if folder is selected 2016-02-02 09:41:31 +01:00
Uwe Steinmann
4dce5d7ab3 help and default search method be set 2016-02-01 19:57:08 +01:00
Uwe Steinmann
07f5512c9a add csp header only if view->js() is defined 2015-12-16 07:16:16 +01:00
Uwe Steinmann
d6c393dede use div.splash instead of calling noty() for message of missing
translations
2015-12-16 07:14:13 +01:00
Uwe Steinmann
8cbf645014 use div.splash instead of calling noty() for message of missing
translations
2015-12-16 06:36:20 +01:00
Uwe Steinmann
1acad75f83 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-15 21:04:45 +01:00
Uwe Steinmann
3f778f9a77 seperate html from javascript to make content security policy possible 2015-12-14 15:16:32 +01:00
Uwe Steinmann
29f4ca0710 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-14 12:09:16 +01:00
Uwe Steinmann
c0fa5d9cc6 fix link to Search.php, add missing params to printFolderChooser() 2015-12-14 11:45:56 +01:00
Uwe Steinmann
c3fddd209d seperate folder chooser in html and javascript 2015-12-14 09:50:49 +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
4a23bd9eca rename css() to js() 2015-12-11 08:21:04 +01:00
Uwe Steinmann
940102f72f add csp headers, place div.splash instead of calling noty() 2015-12-11 08:13:05 +01:00
Uwe Steinmann
9c0fe92998 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 18:04:12 +01:00
Uwe Steinmann
e47d84071d attributes of type checkbox can be reset
added a hidden field in printAttributeEditField() to set the value of
a checkbox to 0 if it not set.
2015-12-04 08:02:02 +01:00
Uwe Steinmann
423ef654c4 fix output of checkboxes in printAttributeEditField() 2015-12-03 15:08:12 +01:00
Uwe Steinmann
881925d201 fix link to FolderNotify when logged in as normal user 2015-11-27 15:45:01 +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
74a248d592 allow to edit 'date' and 'boolean' attributes 2015-10-30 08:02:21 +01:00
Uwe Steinmann
36578b267d pass currently set language to timeline 2015-10-28 08:19:13 +01:00
Uwe Steinmann
50478ee3c7 use textarea for attribute field values if value > 80 chars 2015-10-28 08:18:25 +01: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
f83ae3eda1 printTimeline() retrieves data from ajax 2015-10-19 13:15:52 +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
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
10c5086307 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:13:56 +02:00
Uwe Steinmann
06691a7d6f set className of items in timeline 2015-09-23 14:12:07 +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
88d973f496 turn off selectable items in timeline 2015-09-22 10:55:52 +02:00
Uwe Steinmann
6a91429711 do not output timeline if no data is available 2015-09-22 10:32:33 +02:00
Uwe Steinmann
c8b007a1af timeline can be limited to date range 2015-09-22 10:16:26 +02:00
Uwe Steinmann
f82dc7558b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 17:25:56 +02:00
Uwe Steinmann
a326421ac2 take out today from timeline 2015-09-21 17:20:10 +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
a7736397a8 pass $timeline instead of $document to printTimeline() 2015-09-21 16:47:47 +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
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
5a534e6b71 use translation for text when modal boxes are loading its content 2015-09-03 15:15:12 +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
ca32bc856e add method getProgressBar() 2015-08-20 15:52:46 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00
Uwe Steinmann
69e262cea3 save state of jqtree widget
has no effect currently
2015-08-18 22:39:30 +02:00
Uwe Steinmann
6d8930a360 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-07 14:30:07 +02:00
Uwe Steinmann
d7223bc521 fix link to downloadable file in printProtocol() 2015-08-07 14:29:32 +02:00
Uwe Steinmann
6060f1e98e new parameter $base for htmlStartPage(), propperly can hook in documentMenu 2015-07-15 22:32:19 +02:00
Uwe Steinmann
245bcc6a1e run hook folderNavigationMenu 2015-07-15 22:09:47 +02:00
Uwe Steinmann
1609610541 pass previewer to printClipboard, call hook for menuitems, ...
backported from develop
2015-07-15 07:24:32 +02:00
Uwe Steinmann
b8e9d3a6dd add missing space between tag attributes 2015-07-09 08:00:43 +02:00
Uwe Steinmann
7902ab3fab Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-06-30 18:54:11 +02:00
Uwe Steinmann
77a5512f0b move code for easier merging 2015-06-30 18:53:40 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
2015-06-30 07:05:27 +02:00
Uwe Steinmann
195add869c move printProtocol() into class.Bootstrap.php
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewDocument.php
2015-06-23 09:52:29 +02:00
Uwe Steinmann
73254d7346 move printProtocol() into class.Bootstrap.php 2015-06-23 09:49:34 +02:00
Uwe Steinmann
a7ff808787 show link to Indexer only if fulltext is enabled 2015-06-15 15:28:53 +02:00
Uwe Steinmann
1d186d230b show link to Indexer only if fulltext is enabled 2015-06-15 15:28:25 +02:00
Uwe Steinmann
22b7b3ce96 add optional parameter class to contentContainerStart() 2015-06-15 09:21:13 +02:00
Uwe Steinmann
ae481e6ac9 add optional parameter class to contentContainerStart() 2015-06-15 09:20:33 +02:00
Uwe Steinmann
0c9714c37c show docs in root folder of document chooser 2015-06-11 11:27:07 +02:00
Uwe Steinmann
f02734b063 show docs in root folder of document chooser 2015-06-11 11:25:14 +02:00
Uwe Steinmann
45a9373bdd include DocumentChooser relative to out
this makes it possible to include the document chooser even in
op/op.xxx.php files
2015-06-11 07:56:04 +02:00
Uwe Steinmann
269355bb43 allow context sensitive help files 2015-06-11 06:42:28 +02:00
Uwe Steinmann
e527862c9d allow context sensitive help files 2015-06-11 06:41:49 +02:00
Uwe Steinmann
de40aa816a printAttributeEditField() outputs textarea for longer values
up to 30 chars it remains an input field
2015-04-16 08:05:11 +02:00
Uwe Steinmann
7d7a21fc9e printAttributeEditField() takes a second parameter the attribute
this was the attribute value
2015-04-15 14:11:52 +02:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
2015-03-20 08:32:29 +01:00
Uwe Steinmann
cb3392c774 propperly take new workflow mode traditional_only_approval into account 2015-03-17 11:19:55 +01:00
Uwe Steinmann
0335cc8bcd Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.Settings.php
2015-03-17 06:52:33 +01:00
Uwe Steinmann
89ef1a58ec view parameter enableClipboard has been renamed to enableclipboard 2015-03-13 09:31:48 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
cb0d7d8d92 enableClipboard takes out all clipboard functions 2015-02-24 17:47:58 +01:00
Uwe Steinmann
6c3024e799 include application.css after all other css files 2015-02-13 17:41:12 +01:00
Uwe Steinmann
b3bfaf9ac5 Merge branch 'seeddms-4.3.15' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
2015-02-05 09:37:52 +01:00