gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-07 15:44:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,712 Commits 7 Branches 80 Tags 38 MiB
20a695f571
Commit Graph

581 Commits

Author SHA1 Message Date
Uwe Steinmann
ab07fbfef7 add hooks, put output of attribute into separate function 2015-04-14 19:38:50 +02:00
Uwe Steinmann
c36442303f add new attribute types to select boxes 2015-04-14 19:38:09 +02:00
Uwe Steinmann
db8e3bbfbb Merge branch 'seeddms-4.3.17' into develop 2015-04-14 06:21:12 +02:00
Uwe Steinmann
0994429edd issue warning if ordering of folder contents is != 's' 2015-04-08 06:43:31 +02:00
Uwe Steinmann
72c3207a75 Merge branch 'seeddms-4.3.17' into develop 
Conflicts:
	Makefile
 2015-03-30 16:40:24 +02:00
Uwe Steinmann
7ef7e13c4c show fields for user/group notification 2015-03-27 17:32:51 +01:00
Uwe Steinmann
234d333bfc fix selection of home folder 2015-03-20 08:40:30 +01: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
d2b26fafc4 fix key settings_passwordStrength_desc 2015-03-19 09:38:41 +01:00
Uwe Steinmann
67bd3171b4 approval/review log was mixed up 2015-03-18 11:54:01 +01:00
Uwe Steinmann
e8e24421b4 fix syntax error in javascript 2015-03-17 17:47:27 +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
4c41f560c3 reorganize code 
make one single method which creates to add/update form
 2015-03-17 09:54:59 +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
56b57179f4 use new translation keys add_review and add_approval 2015-03-16 10:37:15 +01:00
Uwe Steinmann
8f96bbaa1d workflow mode can be traditional without review 2015-03-16 08:58:10 +01:00
Uwe Steinmann
53697b37ff do not show copy clipboard icon if clipboard is turned off 
was still visible in search result
 2015-03-13 10:59:44 +01:00
Uwe Steinmann
89ef1a58ec view parameter enableClipboard has been renamed to enableclipboard 2015-03-13 09:31:48 +01:00
Uwe Steinmann
a87e145fda escape quotes in javascript for showing workflow graph 2015-03-11 19:27:09 +01:00
Uwe Steinmann
ed9fbe93e1 set current tab to last one selected when submitting data 2015-03-11 18:24:14 +01:00
Uwe Steinmann
c3b80c1b5d add new option enableNotificationWorkflow 
turns on/off is mail is set to users/groups in next step of workflow
 2015-03-11 18:11:41 +01:00
Uwe Steinmann
6d0a7d4f82 set tab last seen after submit new configuration 2015-03-11 17:48:10 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
c4feea2664 all converters are only used for fulltext 2015-02-24 19:26:38 +01:00
Uwe Steinmann
cb0d7d8d92 enableClipboard takes out all clipboard functions 2015-02-24 17:47:58 +01:00
Uwe Steinmann
5729cd91f1 reviewers/approvers can be taken over from last document version 2015-02-13 17:41:50 +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
Uwe Steinmann
59b50be3be do not use fixed class names for SeedDMЅ_Core_[Folder|Document] 
use instead SeedDMS_Core_DMS::getClassname()
 2015-02-05 07:39:59 +01:00
Uwe Steinmann
8963879f5d htmlencode() the complete content in deletion dialog 
this used to be just the filename, but translations of the text
may also contain qoutes which break the javascript
 2015-02-04 07:41:33 +01:00
Uwe Steinmann
92279dcaf4 minor change in html structure 2015-01-30 08:18:52 +01:00
Uwe Steinmann
061ed035cc Merge branch 'seeddms-4.3.14' into develop 2015-01-29 18:32:16 +01:00
Uwe Steinmann
8a6ff2f48a preset expiration date form settings 2015-01-29 18:31:37 +01:00
Uwe Steinmann
f7afddfa26 set attribute data-date of input field for expiration date 2015-01-29 18:30:54 +01: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
9be1d40624 checkQuota() requires user object as a parameter 2015-01-15 11:12:30 +01:00
Uwe Steinmann
fc2eff631e lots of flags 2015-01-08 15:04:54 +01:00
Uwe Steinmann
9b8fe89730 some code reorganization 2014-12-08 14:50:48 +01:00
Uwe Steinmann
93cb26e79d do not used hard coded class names of SeedDMS_Core_xxx anymore 2014-12-08 14:49:26 +01:00
Uwe Steinmann
8809086014 Merge branch 'seeddms-4.3.13' into develop 2014-11-24 19:42:18 +01:00
Uwe Steinmann
8af69d9cfa Download of documents whose content is gone will not be possible anymore (Bug #185) 2014-11-24 19:23:26 +01:00
Uwe Steinmann
406b4a5a00 Merge branch 'seeddms-4.3.13' into develop 
Conflicts:
	Makefile
 2014-11-24 13:13:38 +01:00
Uwe Steinmann
1cb1ffb436 add button to select all files 2014-11-24 13:11:00 +01:00
Uwe Steinmann
2821e15867 add missing argument of checkQuota() (Bug #184) 2014-11-19 20:36:06 +01:00
Uwe Steinmann
985206f481 make last paramter of printFolderChooser() optional 2014-11-19 20:25:06 +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
f4bb51933f remove strptime() function calls 2014-11-14 20:23:26 +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
2eb4408111 add missing space between icon and text on button 2014-11-13 09:01:39 +01:00
Uwe Steinmann
99590a322d use new method getValueAsArray() for showing attributes 2014-11-13 08:21:49 +01:00
Uwe Steinmann
53389d01d5 extend search on attributes for all object types 2014-11-13 07:55:29 +01:00
Uwe Steinmann
6d6bb02a60 do not show fast upload area if user has no write access of folder 2014-11-11 16:01:36 +01:00
Uwe Steinmann
7c4e5a15aa strip html tags from sitename when using for html title 2014-11-07 08:54:47 +01:00
Uwe Steinmann
15c163274c take out window.close() because there is no window to close anymore 
since bootstraps modal box, the keyword chooser isn't a window anymore.
 2014-11-07 08:06:08 +01:00
Uwe Steinmann
8db94efbf9 Merge branch 'seeddms-4.3.11' into develop 2014-10-31 13:29:21 +01:00
Uwe Steinmann
3ddf1727fd allow passwords to be never expire 2014-10-31 13:20:43 +01:00
Uwe Steinmann
6e793b29f9 change class of body tag 2014-10-31 13:03:20 +01:00
Uwe Steinmann
c1eeba573e Merge branch 'seeddms-4.3.10' into develop 2014-10-16 17:28:11 +02:00
Uwe Steinmann
8d4151893e use " instead of ' in javascript for deleting documents and folders 2014-10-16 17:27:07 +02:00
Uwe Steinmann
6443b9aa8e Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	views/bootstrap/class.Search.php
 2014-07-23 20:26:37 +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
52fa3f1bf8 reorganize database search form 2014-07-23 20:12:55 +02:00
Uwe Steinmann
cbe0574388 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
 2014-07-23 06:55:44 +02:00
Uwe Steinmann
a011433d28 remove not used file upload code 2014-07-22 17:34:08 +02:00
Uwe Steinmann
2b5415e128 some cosmetic changes to ease merging with develop 2014-07-11 12:58:44 +02:00
Uwe Steinmann
6c1993a9fe show id of folder always, not just if inheritAccess is turn on 
don't know how that got into the code
 2014-07-11 12:57:13 +02:00
Uwe Steinmann
4186f6dd7e remove accidently duplicated code 2014-07-11 12:51:50 +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
72798e2ac4 set max file size for drag&drop upload 2014-07-11 12:04:13 +02:00
Uwe Steinmann
3c51f70e07 add drag&drop area for file upload 2014-07-11 08:42:57 +02:00
Uwe Steinmann
458069fba1 div.#main-clipboard doesn't need ondrop-attr anymore 2014-07-11 08:42:17 +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
3a84ec91d4 fix php syntax error 2014-07-08 09:21:47 +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
cc61505825 document/folder chooser even works for forms not named 'form1' 2014-07-07 15:45:24 +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
d3451e0b7b temporarily take out new fileupload 2014-07-03 12:04:11 +02:00
Uwe Steinmann
4ff87c2e7a do not output html page start/end 2014-06-24 16:12:02 +02:00
Uwe Steinmann
3cd1219b81 pass group/user name to htmlspecialchars() before output 2014-06-17 19:07:51 +02:00
Uwe Steinmann
cf7a6becf2 output mandatory reviewers/approvers 2014-06-17 18:11:09 +02:00
Uwe Steinmann
184811f9b6 remove container around search result 2014-06-11 11:02:50 +02:00
Uwe Steinmann
b494e3c248 add title attribute 2014-06-11 11:02:25 +02:00
Uwe Steinmann
f1a9923f57 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
 2014-06-06 15:13:15 +02:00
Uwe Steinmann
3301dbeda5 showing the clipboard will filter out those objects which are no longer available 2014-06-06 15:08:44 +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
216e38378d take out code for show document/folder lines in table 
they have been moved into the new functions printDocumentListRow()
and printFolderListRow()
 2014-06-06 14:00:59 +02:00
Uwe Steinmann
e552294073 add new methods documentListRow(), printLockDocumentBtn() 2014-06-06 14:00:28 +02:00
Uwe Steinmann
df3a55d39b make clipboard ajax aware 2014-06-05 15:02:19 +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
8abed5989f use new folder remove operation 2014-06-05 09:51:20 +02:00
Uwe Steinmann
1d8b73c2f9 add new method printDeleteFolderButton(), fix drag and drop from clipboard 2014-06-05 09:50:21 +02:00
Uwe Steinmann
32d160ed99 show clipboard even if foldertree ist turned off 2014-06-04 21:42:08 +02:00
Uwe Steinmann
854700183c put clipboard into left coŀumn 2014-06-04 21:40:50 +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
7a2bcfb312 use new method for printing delete document icon 2014-06-04 19:22:54 +02:00
Uwe Steinmann
a152a57735 use new code for printing delete document icon 2014-06-04 19:21:59 +02:00
Uwe Steinmann
6b56a5e31f pass formtoken to movedocument and movefolder ajax calls 2014-06-04 19:21:25 +02:00
Uwe Steinmann
b950d22b60 javascript can be collected and output at end of page 
add method to show icon for deleting documents in document/folder list
 2014-06-04 19:20:07 +02:00