summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12527 from owncloud/js-pluginsystemRobin Appelman2014-12-121-0/+1
|\ | | | | Simple Plugin system for Javascript
| * Simple Plugin system for JavascriptVincent Petry2014-12-011-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-10108-0/+108
| |
* | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-091-2/+2
| |
* | reduce OC_Preferences, OC_Config and \OCP\Config usageMorris Jobke2014-12-081-2/+4
| | | | | | | | | | | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container
* | Merge pull request #12696 from owncloud/trashbin-selected-deleteRobin Appelman2014-12-081-0/+4
|\ \ | | | | | | Fix deleting selected files in the trashbin
| * | Fix deleting selected files in the trashbinRobin Appelman2014-12-081-0/+4
| | |
* | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-081-15/+28
|\ \ \ | |/ / |/| | Improve FileActions JS to allow for custom rendering
| * | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-241-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the OCA.Files.FileActions class to support passing a "render" function in the action object. The default function "_defaultRenderFunction" is used by default and renders actions in the usual actions container. Moved "Rename" and "Delete" to custom render functions.
* | | Merge pull request #12382 from owncloud/enc_reorganize_folders2Morris Jobke2014-12-031-152/+29
|\ \ \ | | | | | | | | [encryption] reorganize folder structure (second try to make Jenkins happy)
| * | | new folder structure for keysBjoern Schiessle2014-11-261-152/+29
| | | | | | | | | | | | | | | | | | | | | | | | all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey
* | | | Autoload exception from files_trashbinJoas Schilling2014-12-022-2/+0
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-282-0/+10
|/ /
* / Replace deprecated constant with new class constantJoas Schilling2014-11-251-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-216-0/+48
|
* Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-208-58/+0
|\ | | | | cleanup languages. closes #11274
| * cleanup languages. closes #11274Volkan Gezer2014-11-208-58/+0
| |
* | Make apps/ extend the \Test\TestCase and fix overwritten methodsJoas Schilling2014-11-191-3/+11
|/
* Merge pull request #12276 from ↵Morris Jobke2014-11-192-0/+36
|\ | | | | | | | | owncloud/undelete-only-if-files-trashin-is-enabled Only show undelete capability if files_trashbin is enabled
| * Only show undelete capability if files_trashbin is enabledLukas Reschke2014-11-182-0/+36
| | | | | | | | Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-192-4/+4
|/
* Merge pull request #9177 from owncloud/jsdocexperimentVincent Petry2014-11-132-3/+22
|\ | | | | Improved JS Docs + added build script for JS Docs
| * Improved Javascript docs for JSDocVincent Petry2014-10-312-3/+22
| | | | | | | | | | | | Added namespaces so that JSDoc can find them. Fixed a few warnings. Improved some comments.
* | Merge pull request #11853 from owncloud/close-session-for-trashbinVincent Petry2014-11-055-0/+6
|\ \ | | | | | | Close session for files_trashbin
| * | Close session for files_trashbinLukas Reschke2014-10-295-0/+6
| | | | | | | | | | | | When restoring huge folders the interface will be unresponsive otherwise
* | | Only rescan trash folder when checking deleted versionsVincent Petry2014-11-041-1/+1
| |/ |/| | | | | | | This fix prevents the file scanner to rescan the WHOLE storage and reset the etags by mistake.
* | remove unnecessary require calls - the ownCloud class loader is supposed to ↵Thomas Müller2014-10-301-2/+0
| | | | | | | | take care of this
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-304-0/+20
|/
* update all translation files to js and jsonThomas Müller2014-10-29231-918/+1836
|
* Added OC.L10N namespace with translation functionsVincent Petry2014-10-291-0/+2
| | | | | | | | | | | Added addTranslations and fixed de.js file Fixed de.js to use OC.L10N.register() and use to correct expected format. Added JS unit tests for OC.L10N class Include translations JS script for all apps
* Add type hinting to functionsLukas Reschke2014-10-241-10/+25
| | | | It's only reasonable to have proper type hinting here which might even help us to catch bugs.
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-231-0/+1
|
* Fix SPACE_UNKNOWN constantRobin Appelman2014-10-161-1/+1
|
* make trashbin compatible with objectstore, replace glob with search in ↵Jörn Friedrich Dreyer2014-10-161-5/+13
| | | | cache, make unknown free space work like unlimited free space
* introduce new app page layoutThomas Müller2014-10-151-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter installed and not-installed apps properly kill unneeded file load category 'Installed' on page load adding documentation links new apps mgmt: first style adjustment apps mgmt: only show license and preview if they exist adding buttons new apps mgmt: fix for mobile use app icon if available new apps mgmt: position enable/disable toggle to the right new apps mgmt: proper display of icons or previews new apps mgmt: fix loading spinner reenable group selection for apps new apps mgmt: position enable button normally again new apps mgmt: clarify wording from 'Installed' to 'Enabled' reintroduce enable/disable Move rating image path generation to client-side Move expression outside of l10n fix group handling add buttons for 'More apps' and 'Add your app' again disable changed date of app for now adding recommended label style 'Recommended' app tag fixing php warning sort by rating adding meta-category 'Recommended' Only show existing documentation links lacy loading of screenshots making group based app activation work again adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg' adding app.svg for all core apps query string '?installed' is not longer needed update and uninstall is back + error feedback remove unneeded parameter fix alignment of 'recommended' label
* Add support for keys in the info.xmlLukas Reschke2014-10-091-0/+3
| | | | | | This allows to have links to different doc base URLs a.
* Merge pull request #11474 from owncloud/fix_trash_permission_checkMorris Jobke2014-10-091-1/+1
|\ | | | | check if I can create a file at the location
| * check if I can create a file at the locationBjoern Schiessle2014-10-081-1/+1
| |
* | Forgot a '.'MTRichards2014-10-081-1/+1
| |
* | Updated info.xml app descriptionMTRichards2014-10-081-11/+2
|/ | | Made app description paralell in structure to other app descriptions
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-281-1/+1
|
* Merge pull request #11234 from owncloud/fix-icon-classesJan-Christoph Borchardt2014-09-232-4/+4
|\ | | | | Fix icon classes, disappeared delete icon
| * correct progress-icon to icon-loading-smallJan-Christoph Borchardt2014-09-222-4/+4
| |
| * correct delete-icon to icon-delete, fix #11128Jan-Christoph Borchardt2014-09-222-4/+4
| |
* | Merge pull request #11137 from owncloud/enc-pregfixVincent Petry2014-09-231-5/+1
|\ \ | |/ |/| Fix share key pattern matching
| * Fix share key finding algorithm in various casesVincent Petry2014-09-231-5/+1
| | | | | | | | | | | | | | | | | | | | | | Instead of inaccurate pattern matching, use the list of users who we know have access to the file to build the list of share keys. This covers the following cases: - Move/copy files into a subfolder within a share - Unsharing from a user - Deleting files directlry / moving share keys to trashbin
* | Added extra check to avoid deleting key foldersVincent Petry2014-09-191-0/+26
|/ | | | | | | | | | | | Whenever a delete operation is called twice in a row, it could happen that the first call already deleted the file. The second call would return an empty $ownerPath because the file does not exist. That empty $ownerPath would run the key deletion operation on the wrong path. This fix adds checks in many places to make sure we don't use $ownerPath when it's empty or null.
* Merge pull request #11081 from owncloud/trash_fix_expireLukas Reschke2014-09-161-1/+1
|\ | | | | also expire file if timestamp = limit, happens if trashbin_retention_obl...
| * also expire file if timestamp = limit, happens if ↵Bjoern Schiessle2014-09-151-1/+1
| | | | | | | | trashbin_retention_obligation is set to zero
* | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-162-5/+53
|\ \ | | | | | | Show original path information in trashbin and for shares