Commit Graph

449 Commits

Author SHA1 Message Date
Uwe Steinmann
1de8e26289 fix line endings, change sequence of include files 2014-12-08 14:43:50 +01:00
Uwe Steinmann
1be9052c85 put controller code into controller/class.EditFolder.php 2014-12-08 14:43:04 +01:00
Uwe Steinmann
4483fb52cc fix line endingѕ, adjust sequence of include files 2014-12-08 14:41:47 +01:00
Uwe Steinmann
8809086014 Merge branch 'seeddms-4.3.13' into develop 2014-11-24 19:42:18 +01:00
Uwe Steinmann
b39b92e0b0 don't crash if folder/document was deleted (Bug #186) 2014-11-24 19:08:17 +01:00
Uwe Steinmann
0a3f4e1fd7 do not include inc/inc.ClassEmail.php twice 2014-11-24 19:00:04 +01:00
Uwe Steinmann
e9c3696466 Merge branch 'seeddms-4.3.13' into develop
Conflicts:
	Makefile
2014-11-19 17:04:56 +01:00
Uwe Steinmann
03359ca620 fix checking for attribute values
checking for the number of values of a multi value attribute
disregards the maximum number of values if it is 0
2014-11-19 17:00:55 +01:00
Uwe Steinmann
834a8118e6 check for propper number of attribute values 2014-11-17 07:03:57 +01:00
Uwe Steinmann
05ad0d11ad log each operation 2014-11-14 10:06:25 +01:00
Uwe Steinmann
15c5392ed8 Merge branch 'seeddms-4.3.11' into develop
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-11-13 09:21:08 +01:00
Uwe Steinmann
5ff934373d take all attributes for searching into account 2014-11-13 07:54:35 +01:00
Uwe Steinmann
a800f74a75 fix almost unrestricted fast upload (Bug #175) 2014-11-11 15:42:07 +01:00
Uwe Steinmann
31da6d4f5f Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
2014-07-24 07:58:32 +02:00
Uwe Steinmann
f4e7e451e2 check if $_GET["width"] is set before using it 2014-07-24 07:53:36 +02:00
Uwe Steinmann
760da5e2b4 check if pwd is passed in _POST 2014-07-24 07:53:08 +02:00
Uwe Steinmann
0026f8c69c selecting a status or category will not turn of folder search 2014-07-23 20:51:45 +02:00
Uwe Steinmann
b6f60e8c7f reoganize database search form, don't show results without a search criteria 2014-07-23 20:23:07 +02:00
Uwe Steinmann
c5b41095a2 pass folder attributes to search form 2014-07-23 20:12:29 +02:00
Uwe Steinmann
7830837e61 Merge branch 'seeddms-4.3.9' into develop 2014-07-21 07:40:22 +02:00
Uwe Steinmann
8a6acd321a include comment and verison comment in notification mail 2014-07-21 07:34:13 +02:00
Uwe Steinmann
25f0a3588a check if 'theme' is set before using it 2014-07-15 14:21:12 +02:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.ViewFolder.php
2014-07-11 12:49:21 +02:00
Uwe Steinmann
6fc870c9df make notification work when uploading documents 2014-07-11 12:36:22 +02:00
Uwe Steinmann
3590b0859e addtoclipboard set msg in case of succes 2014-07-11 12:02:41 +02:00
Uwe Steinmann
fc334bf43a better error checking for uploaddocuments
first check for upload error, than for filesize
2014-07-11 11:14:27 +02:00
Uwe Steinmann
289649b6ee add file upload via drag&drop
can be enabled in the settings
2014-07-11 08:41:25 +02:00
Uwe Steinmann
0ee577fb11 add command for uploading documents 2014-07-11 08:38:26 +02:00
Uwe Steinmann
48c3f24e01 get rid of some old code 2014-07-11 08:38:05 +02:00
Uwe Steinmann
4d8f9731d5 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-07-08 08:49:14 +02:00
Uwe Steinmann
73bfecb5a8 more general folder chooser
the choosen folder will no longer use targetidformx for the input field
containing the id. It is now independent of the form name.
2014-07-08 08:30:59 +02:00
Uwe Steinmann
eb909aa100 no more php warnings if userid isn't set 2014-07-07 15:44:46 +02:00
Uwe Steinmann
579946d455 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
2014-07-03 12:07:27 +02:00
Uwe Steinmann
3ebfd7aacf extract filetype by using pathinfo() 2014-06-13 17:29:40 +02:00
Uwe Steinmann
6325bd2844 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-06 14:15:39 +02:00
Uwe Steinmann
9d2674e9e4 new command tooglelockdocument, new view documentlistrow 2014-06-06 13:59:12 +02:00
Uwe Steinmann
91dcc5cf1d add more commands
removefromclipboard removes an item from the clipboard
view returns the html of some views
2014-06-05 15:00:44 +02:00
Uwe Steinmann
58cdecfe21 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
2014-06-05 10:03:35 +02:00
Uwe Steinmann
b9ace5f6f7 add command 'deletefolder' 2014-06-05 09:48:45 +02:00
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-06-04 21:25:30 +02:00
Uwe Steinmann
aa80f28de1 set splash message 2014-06-04 19:17:44 +02:00
Uwe Steinmann
e0a49734f0 'movefolder' requires a formtoken 2014-06-04 19:17:08 +02:00
Uwe Steinmann
c09e650c89 add 'deletedocument', 'movedocument' requires a formtoken 2014-06-04 19:15:28 +02:00
Uwe Steinmann
10b609927a Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	op/op.UpdateDocument.php
2014-06-04 08:03:20 +02:00
Uwe Steinmann
3b129502a0 unlock document if updated by admin or owner of document 2014-06-04 08:01:35 +02:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
2014-06-04 07:58:06 +02:00
Uwe Steinmann
51b84868a6 check if document is locked 2014-06-03 17:50:20 +02:00
Uwe Steinmann
858552b743 setting version to 0 will retrieve the latest version 2014-06-03 08:48:27 +02:00
Uwe Steinmann
05d6d9dca5 create preview image if it doesn't exists 2014-05-28 14:58:04 +02:00
Uwe Steinmann
5a8d13e1e7 get latest version if 'version' < 1 2014-05-28 14:54:10 +02:00