Commit Graph

72 Commits

Author SHA1 Message Date
Uwe Steinmann
574cc53075 Merge branch 'seeddms-5.0.x' into develop 2015-12-03 15:24:41 +01:00
Uwe Steinmann
c93bc1bfa1 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-03 15:24:29 +01:00
Uwe Steinmann
1f77a749be Merge branch 'seeddms-5.0.x' into develop 2015-11-27 16:09:11 +01:00
Uwe Steinmann
44ee028bcd send notification mails when document ist deleted 2015-11-26 13:01:20 +01:00
Uwe Steinmann
250400a9cb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-25 17:01:52 +01:00
Uwe Steinmann
eda80242ea some reorganization of email notification 2015-11-25 16:49:09 +01:00
Uwe Steinmann
ecf8f311d9 set propper Content-Type 2015-11-05 13:43:49 +01:00
Uwe Steinmann
50ef190ae7 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 09:03:45 +01:00
Uwe Steinmann
f2b1dd8fc8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 09:03:33 +01:00
Uwe Steinmann
e35cc9f3c6 fix setting of Content-Type in header (Closes: #233) 2015-10-22 13:36:23 +02:00
Uwe Steinmann
aa49c5b0b1 Merge branch 'seeddms-5.0.x' into develop 2015-08-10 21:58:16 +02:00
Uwe Steinmann
65fda6daee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-10 21:53:27 +02:00
Uwe Steinmann
8ffcfab6e4 use new fulltext index interface with support for sqlitefts 2015-08-10 21:43:15 +02:00
Uwe Steinmann
4a034d395b pass previewer to mainClipboard() 2015-07-15 08:21:51 +02:00
Uwe Steinmann
e17bcc714a initialize all arrays for return value in menutasks 2015-07-10 10:51:56 +02:00
Uwe Steinmann
f25c090039 command mytasks also returns documents to receipt and revise 2015-07-09 18:28:08 +02:00
Uwe Steinmann
863d203133 add command 'mytasks' 2015-07-09 07:59:30 +02:00
Uwe Steinmann
3583962085 new task menutask in op/op.Ajax.php which calls menuTask() 2015-07-08 18:58:38 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
db3d563e3f do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:47:03 +02:00
Uwe Steinmann
44ce6619c0 do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:46:55 +02:00
Uwe Steinmann
d46d2b265d do not use mimetype delivered by server if overrideMimeType is set 2015-06-23 07:45:18 +02:00
Uwe Steinmann
6f3594d294 add cmd [remove|update]transmittalitem 2015-05-13 17:34:50 +02:00
Uwe Steinmann
fa43001824 use propper name of converters array in settings 2015-05-02 08:05:51 +02:00
Uwe Steinmann
15ce32ca24 use propper name of converters array in settings 2015-05-02 08:05:46 +02:00
Uwe Steinmann
a7763c8cc4 use propper name of converters array in settings 2015-05-02 08:04:41 +02:00
Uwe Steinmann
1fda236179 pass proper array converters to SeedDMS_Lucence_IndexedDocument 2015-04-16 14:16:03 +02:00
Uwe Steinmann
6481d230a6 pass proper array converters to SeedDMS_Lucence_IndexedDocument 2015-04-16 08:06:15 +02:00
Uwe Steinmann
1aa08781b2 Merge branch 'seeddms-4.3.14' into develop
Conflicts:
	Makefile
	SeedDMS_Core/Core/inc.ClassFolder.php
2015-01-29 18:22:19 +01:00
Uwe Steinmann
75ef47f6e1 expiration date of documents can be preset in settings 2015-01-29 17:28:40 +01:00
Uwe Steinmann
e486254d80 include inc/inc.Init.php, new order of include files 2014-12-08 14:47:32 +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
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
a800f74a75 fix almost unrestricted fast upload (Bug #175) 2014-11-11 15:42:07 +01: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
0ee577fb11 add command for uploading documents 2014-07-11 08:38:26 +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
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
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
2014-05-22 08:21:22 +02:00