Commit Graph

77 Commits

Author SHA1 Message Date
Uwe Steinmann
99682a11d1 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-07-10 07:50:33 +02:00
Uwe Steinmann
78cbe8ad5d fix typo 2017-06-29 16:42:06 +02:00
Uwe Steinmann
fd55920c52 fix error in preset button 2017-06-29 16:38:16 +02:00
Uwe Steinmann
258c3fae0b change field name of attributes to 'attributes_version'
makes much more sense because the attributes are version attributes.
2017-06-29 16:32:42 +02:00
Uwe Steinmann
652e7a82af Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-06-13 14:48:55 +02:00
Uwe Steinmann
dc58e02d25 add hook for editing attribute, return value of hook can be an empty array 2017-06-09 15:13:49 +02:00
Uwe Steinmann
092967004a Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-05-12 08:23:42 +02:00
Uwe Steinmann
cb61fdacb3 add form key, fix uploading with fine-uploader 2017-05-04 13:49:45 +02:00
Uwe Steinmann
0ddabba869 call hook addDocumentContentAttributes 2017-05-04 11:04:08 +02:00
Uwe Steinmann
510067a714 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-04-11 06:42:27 +02:00
Uwe Steinmann
727f93eafa expiration date can be selected from list and entered by calendar 2017-04-05 22:00:54 +02:00
Uwe Steinmann
c01c59e2e5 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-20 12:44:49 +01:00
Uwe Steinmann
3fba221ac3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-20 12:43:07 +01:00
Uwe Steinmann
126ee89a5e do not show message for max upload size if not needed 2017-03-20 12:42:29 +01:00
Uwe Steinmann
df27dcf878 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-20 11:54:55 +01:00
Uwe Steinmann
c823981bd9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-03-15 16:45:02 +01:00
Uwe Steinmann
6266fee9e7 change call for inserting fine uploader template and js code 2017-03-15 16:40:41 +01:00
Uwe Steinmann
7d82b73208 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-02-13 12:12:07 +01:00
Uwe Steinmann
d5dc6b125d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-02-08 15:52:00 +01:00
Uwe Steinmann
8516d23684 add support for fine uploader 2017-01-31 17:27:53 +01:00
Uwe Steinmann
d3c12a84fd Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-10-25 10:02:09 +02:00
Uwe Steinmann
bf9e2fa0da Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-25 10:01:00 +02:00
Uwe Steinmann
8cf4901a46 add preset button for attributes
takes over attribute value from previous version
2016-10-20 18:28:25 +02:00
Uwe Steinmann
40e97f7363 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-09-15 17:04:28 +02:00
Uwe Steinmann
a5651d3ce6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-15 14:02:59 +02:00
Uwe Steinmann
bd15584c65 use invalidHandler instead of bind() 2016-09-06 15:34:05 +02:00
Uwe Steinmann
b646e4f9cf Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2016-08-30 13:36:09 +02:00
Uwe Steinmann
5003c54deb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-30 08:46:59 +02:00
Uwe Steinmann
e67ef718cc add jquery validation 2016-08-30 07:59:03 +02:00
Uwe Steinmann
96a4db05bf add more field validation 2016-08-29 09:44:49 +02:00
Uwe Steinmann
e72e7f3f15 Merge branch 'seeddms-5.0.x' into develop 2016-03-22 15:22:19 +01:00
Uwe Steinmann
0577fec1ba Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-22 15:11:42 +01:00
Uwe Steinmann
85bc796629 fix wrong variable name in javascript 2016-03-22 14:47:13 +01:00
Uwe Steinmann
f2b091cb83 Merge branch 'seeddms-5.0.x' into develop 2016-03-21 07:41:30 +01:00
Uwe Steinmann
c1f698c0cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-21 07:41:19 +01:00
Uwe Steinmann
8daa5dadea add printSelectPresetButton[Html|Js]()
button for preseting options is a select box
2016-03-21 07:40:17 +01:00
Uwe Steinmann
7bd77ba43e Merge branch 'seeddms-5.0.x' into develop 2016-03-15 08:50:32 +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
66ec6fb7ce add missing contentEnd() at end of page 2016-03-15 08:30:53 +01:00
Uwe Steinmann
067890345e Merge branch 'seeddms-5.0.x' into develop 2016-02-17 11:44:25 +01:00
Uwe Steinmann
199ba46ce8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-17 11:43:42 +01:00
Uwe Steinmann
a15b83dc99 add setting header of javascript file 2016-02-17 11:43:19 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
41d6f05f88 choose mandatory workflow from list if more than 1 workflow is possible 2016-01-27 16:20:51 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +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
7d88617964 individual approver/reviewer can be take from group 2015-12-04 08:00:50 +01:00
Uwe Steinmann
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +01:00