summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12639 from owncloud/bad_mtime_formatMorris Jobke2014-12-132-3/+29
|\
| * Return ? if mtime is 0 or -1Robin McCorkell2014-12-122-3/+29
* | Merge pull request #12795 from owncloud/files-layoutchangesMorris Jobke2014-12-133-39/+59
|\ \
| * | Replace input checkbox CSS selector with .electCheckBoxVincent Petry2014-12-112-22/+18
| * | Move file thumbnail into the label elementVincent Petry2014-12-113-18/+42
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-132-2/+2
* | | Merge pull request #12527 from owncloud/js-pluginsystemRobin Appelman2014-12-121-0/+6
|\ \ \
| * | | Simple Plugin system for JavascriptVincent Petry2014-12-011-0/+6
* | | | Merge pull request #12698 from owncloud/handle_readonly_shared_filesMorris Jobke2014-12-124-8/+54
|\ \ \ \ | |_|/ / |/| | |
| * | | show readonly message in file conflict dialog, make it always selectedJörn Friedrich Dreyer2014-12-114-8/+54
| | |/ | |/|
* | | Merge pull request #11892 from owncloud/remove_triggerupdateThomas Müller2014-12-102-34/+32
|\ \ \
| * | | make path absoluteJörn Friedrich Dreyer2014-12-101-7/+11
| * | | add quiet option, ref #8794Jörn Friedrich Dreyer2014-12-041-9/+18
| * | | remove triggerupdate, ref #11872Jörn Friedrich Dreyer2014-12-042-26/+11
| |/ /
* | | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-092-0/+2
|\ \ \
| * | | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-092-0/+2
* | | | Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-091-1/+1
|\ \ \ \
| * | | | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-091-1/+1
| |/ / /
* | | | Merge pull request #12688 from owncloud/rename-altLukas Reschke2014-12-091-0/+1
|\ \ \ \
| * | | | introduce alt text for rename icon - fixes #12067Morris Jobke2014-12-081-0/+1
* | | | | Merge pull request #12709 from owncloud/fix-11955Morris Jobke2014-12-091-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Skip headers that can not be splitVictor Dubiniuk2014-12-081-0/+3
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-09148-254/+0
|/ / /
* | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-082-113/+286
|\ \ \
| * | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-242-113/+286
* | | | Merge pull request #11485 from brumsoel/masterLukas Reschke2014-12-052-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Modified filesort test cases to test for large sizes & timestampsbrumsel2014-12-031-2/+2
| * | | Merge remote-tracking branch 'upstream/master'brumsel2014-12-03385-5520/+11283
| |\ \ \
| * | | | Fix timestamp comparator return valuebrumsoel2014-10-081-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-042-0/+2
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-032-2/+2
* | | | Merge pull request #12333 from owncloud/delete-selected-filesMorris Jobke2014-12-023-10/+42
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add js unit testRobin Appelman2014-11-261-7/+27
| * | | Dont show the delete button for selected files if one of the selected files i...Robin Appelman2014-11-261-2/+12
| * | | Check if files are deletable before trying to delete themRobin Appelman2014-11-261-1/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-282-0/+2
* | | | Don't show favicon to prevent iteration through subfoldersLukas Reschke2014-11-261-1/+1
|/ / /
* | | Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permissio...Morris Jobke2014-11-261-3/+3
|\ \ \
| * | | Replace deprecated constant with new class constantJoas Schilling2014-11-251-3/+3
* | | | we no longer need to keep the session open for encryptionBjoern Schiessle2014-11-251-6/+2
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2014-11-222-0/+2
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-218-0/+166
* | Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-208-166/+0
|\ \
| * | cleanup languages. closes #11274Volkan Gezer2014-11-208-166/+0
* | | Make apps/ extend the \Test\TestCase and fix overwritten methodsJoas Schilling2014-11-191-2/+1
* | | Use base class to reset the file mapperJoas Schilling2014-11-191-2/+2
|/ /
* | Only show undelete capability if files_trashbin is enabledLukas Reschke2014-11-181-1/+0
* | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-171-2/+12
|\ \
| * | Correctly restore previous root mount point after testingJoas Schilling2014-11-171-2/+12
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-152-8/+8