Commit Graph

127 Commits

Author SHA1 Message Date
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
184811f9b6 remove container around search result 2014-06-11 11:02:50 +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
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
a152a57735 use new code for printing delete document icon 2014-06-04 19:21:59 +02:00
Uwe Steinmann
783a7a3d37 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 21:41:56 +02:00
Uwe Steinmann
c550d7f11d use preview image width from settings 2014-04-10 21:38:33 +02:00
Uwe Steinmann
50d939cd8e Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.RemoveFolder.php
2014-02-26 23:12:40 +01:00
Uwe Steinmann
0be40d61c8 fix vulnerablity against xss attack 2014-02-26 22:42:26 +01:00
Uwe Steinmann
5d879a3439 Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.Ajax.php
	styles/bootstrap/application.js
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-02-21 22:04:22 +01:00
Uwe Steinmann
5e2ede8fd5 set variable with preview width
next step will be to make this configurable
2014-02-21 21:51:53 +01:00
Uwe Steinmann
2a6ff25765 Merge branch 'seeddms-4.3.1' into develop 2013-09-09 07:34:42 +02:00
Uwe Steinmann
b87aa2b8c7 add missing placeholdes in chzn select box (fixes bug #87) 2013-09-09 07:31:06 +02:00
Uwe Steinmann
91a4c65b6c add translation text in select boxes (fixes bug #87)
if select box is managed by chosen and no match could be found
2013-09-09 07:16:18 +02:00
Uwe Steinmann
3da2a086fb call hook documentListItem 2013-07-31 21:44:46 +02:00
Uwe Steinmann
6b5fcb98f3 use ajax call to add item to clipboard 2013-06-18 18:19:45 +02:00
Uwe Steinmann
a49ec3b0cf output correct number of folders/documents found 2013-06-14 19:06:38 +02:00
Uwe Steinmann
51162628b9 show attributes in form again, add icon to add folder/document to clipboard 2013-06-14 16:08:50 +02:00
Uwe Steinmann
9de4684d64 fix some php warnings 2013-06-07 15:26:47 +02:00
Uwe Steinmann
4b798e4fed various improvements
add links for delete/editing object. Fix wrong tagging of submit button.
set start folder appropriately.
2013-06-07 13:06:15 +02:00
Uwe Steinmann
f6ec61359e combine database and fulltext search into one form 2013-06-07 10:12:49 +02:00
Uwe Steinmann
73c6ff9427 major name change from letodms to seeddms 2013-02-14 12:10:53 +01:00
steinm
1819516e2e - output right number of documents and folders found 2013-02-06 17:09:16 +00:00
steinm
ffe54b8662 - added method markQuery() which was previosly globally defined in op.Search.php 2013-01-25 09:39:37 +00:00
steinm
6c6d3c75c6 - added preview images
- put comment of folder/document below of name
2013-01-25 07:36:43 +00:00
steinm
d4d366d5aa new dir with different views 2012-12-14 07:53:13 +00:00