Commit Graph

2339 Commits

Author SHA1 Message Date
Uwe Steinmann
e364c3dd92 Merge branch 'seeddms-4.3.10' into develop
Conflicts:
	Makefile
2014-10-22 14:26:52 +02:00
Uwe Steinmann
ff3e41f988 new version 4.3.10 2014-10-22 14:15:28 +02:00
Uwe Steinmann
a7a6d8d8ac new version 4.3.10 2014-10-22 14:15:16 +02:00
Uwe Steinmann
188d7d9d09 add changes for 4.3.10 2014-10-22 14:14:36 +02:00
Uwe Steinmann
627c6f8248 use ClassAccessOperation 2014-10-22 14:00:50 +02:00
Uwe Steinmann
1a5b808d10 some more translation updates 2014-10-22 11:24:25 +02: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
3b7be443db some more language updates 2014-10-16 17:25:58 +02:00
Uwe Steinmann
604823252c fix use of "'" in some phrases 2014-08-22 17:06:30 +02:00
Uwe Steinmann
414873e402 remove all engl. phrases 2014-08-22 17:06:06 +02:00
Uwe Steinmann
76bb674a57 set accessobj for view (Closes Bug #168) 2014-08-21 21:33:00 +02:00
Uwe Steinmann
ca6b3c3795 add missing access operation check 2014-08-20 16:35:38 +02:00
Uwe Steinmann
a1fae7a6f6 various updates
major update of zh_TW
2014-08-19 10:47:45 +02:00
Uwe Steinmann
cf7515c8eb Merge branch 'seeddms-4.3.9' 2014-07-30 09:10:43 +02:00
Uwe Steinmann
8d95c3a6e0 Merge branch 'seeddms-4.3.9' into develop 2014-07-30 09:10:29 +02:00
Uwe Steinmann
f84b9c5f69 update release date 2014-07-30 08:57:05 +02:00
Uwe Steinmann
42ab639a95 Merge branch 'seeddms-4.3.9' into develop 2014-07-28 09:54:52 +02:00
Uwe Steinmann
670247ae25 pass accessobject to view 2014-07-28 09:52:31 +02:00
Uwe Steinmann
9ef3b6aa37 Merge branch 'seeddms-4.3.9' into develop 2014-07-24 13:20:23 +02:00
Uwe Steinmann
7ebaab55f1 fix counting folders in search() 2014-07-24 13:06:45 +02: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
9da8b713b8 pass SeedDMS_AccessOperation to view 2014-07-24 07:54:08 +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
5641b5b067 propperly initialize $totalDocs in search() 2014-07-24 07:52:43 +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
37f2705e6b fix syntax error 2014-07-23 20:28:10 +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
30acacb10c add note about new database search 2014-07-23 20:24:19 +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
4aed5b103e add new search behaviour 2014-07-23 20:13:13 +02:00
Uwe Steinmann
52fa3f1bf8 reorganize database search form 2014-07-23 20:12:55 +02:00
Uwe Steinmann
c5b41095a2 pass folder attributes to search form 2014-07-23 20:12:29 +02:00
Uwe Steinmann
0acc1fad4d fix searching for folders by attributes
do not search documents if not at least one search criteria is given
2014-07-23 20:11:36 +02:00
Uwe Steinmann
b1fe82f193 add phrases for filter_for_documents and filter_for_folders 2014-07-23 20:10:37 +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
f5af648b37 set release date 2014-07-23 06:54:33 +02:00
Uwe Steinmann
a011433d28 remove not used file upload code 2014-07-22 17:34:08 +02:00
Uwe Steinmann
45bdb43043 Merge branch 'seeddms-4.3.9' into develop 2014-07-22 07:59:34 +02:00
Uwe Steinmann
7ece30f858 major update of portugese, some french corrections 2014-07-22 07:59:01 +02:00
Uwe Steinmann
54d70a889d major update of portugese, some french corretions 2014-07-22 07:57:18 +02:00
Uwe Steinmann
7830837e61 Merge branch 'seeddms-4.3.9' into develop 2014-07-21 07:40:22 +02:00
Uwe Steinmann
b0a7fcc670 change document_updated_email_xxx, new zh_TW translations 2014-07-21 07:39:50 +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
0b772d8420 some missing it and nl phrases 2014-07-15 14:14:10 +02:00
Uwe Steinmann
065e7962b2 add missing phrases 2014-07-14 14:31:28 +02:00
Uwe Steinmann
c941a418b4 add some missing polish and chines translations 2014-07-11 16:14:49 +02:00
Uwe Steinmann
baee5292be Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.ViewFolder.php
2014-07-11 13:01:16 +02:00