merge filemanager
authorU-METAWAYS\mjatho <mjatho@lapmjatho.hh.metaways.de>
Tue, 6 Sep 2011 09:54:44 +0000 (11:54 +0200)
committerU-METAWAYS\mjatho <mjatho@lapmjatho.hh.metaways.de>
Tue, 6 Sep 2011 09:54:44 +0000 (11:54 +0200)
commit67bc4cb0ddb4b0232147f5558176c3c1861dc3e8
tree865e5f1fb640611a2fa69343b461942b154480ed
parent9d8c675adc15fcf694fd16dd7d2e1ecc0a27d671
parenta9094800be75717f7967c4839ac86d28929aeff9
merge filemanager
24 files changed:
tests/tine20/Tinebase/ContainerTest.php
tine20/ExampleApplication/js/ExampleApplication.js
tine20/ExampleApplication/js/ExampleRecordGridPanel.js
tine20/ExampleApplication/js/Model.js
tine20/Felamimail/js/MessageEditDialog.js
tine20/Felamimail/js/TreePanel.js
tine20/Filemanager/Exception/NodeExists.php
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/en.po
tine20/Setup/Core.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Frontend/Json/Container.php
tine20/Tinebase/Model/Filter/Abstract.php
tine20/Tinebase/Model/Filter/FilterGroup.php
tine20/Tinebase/Model/Tree/NodePathFilter.php
tine20/Tinebase/TempFile.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/User/Abstract.php
tine20/Tinebase/User/Sql.php
tine20/Tinebase/css/Tinebase.css
tine20/Tinebase/js/ux/Percentage.js
tine20/Tinebase/js/widgets/container/TreePanel.js
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/js/widgets/tree/ContextMenu.js