summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix details for buttons in header and controls barJan-Christoph Borchardt2013-12-031-1/+5
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-0264-33/+124
* make it possible to select foldersBjoern Schiessle2013-12-025-40/+20
* Merge pull request #6148 from owncloud/fix_trash_restoreVincent Petry2013-12-024-18/+39
|\
| * check explicitely all possible dir valuesBjoern Schiessle2013-12-021-2/+3
| * set delete all to true if a complete folder was deletedBjoern Schiessle2013-12-021-1/+2
| * fix delete files from trash binBjoern Schiessle2013-12-023-16/+34
| * fix restore from files in sub-foldersBjoern Schiessle2013-11-292-2/+3
* | Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).Andreas Fischer2013-11-291-8/+1
* | Merge pull request #6123 from owncloud/extstorage-deletedirs2Vincent Petry2013-11-293-7/+33
|\ \
| * | Fixed FTP and SMB to use rmdir() when deleting foldersVincent Petry2013-11-293-7/+33
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-298-3/+23
* | Merge pull request #6111 from owncloud/non-floating-trash-button-chromeFrank Karlitschek2013-11-291-1/+1
|\ \ | |/ |/|
| * Fix resize issue for trash button in chrome and overflowing spinner in .updat...Morris Jobke2013-11-281-1/+1
* | Merge pull request #6099 from owncloud/fix_source_not_found_warningsMorris Jobke2013-11-284-23/+67
|\ \
| * | use better coding styleBjoern Schiessle2013-11-281-1/+2
| * | make sure that we don't try to access an already deleted files, fixes some fi...Bjoern Schiessle2013-11-284-23/+66
* | | Merge pull request #6106 from owncloud/fix_preview_creationMorris Jobke2013-11-282-4/+11
|\ \ \ | |_|/ |/| |
| * | remove duplicateBjoern Schiessle2013-11-281-1/+0
| * | detect mimetype from the original filename, without the versioning timestampBjoern Schiessle2013-11-281-2/+3
| * | detect mimetype from the original filename, without the delete timestampBjoern Schiessle2013-11-281-2/+9
| |/
* | Merge pull request #6090 from ganomi/summaryfixganomi2013-11-281-1/+1
|\ \
| * | Fix filellist/rename/summary problemganomi2013-11-271-1/+1
* | | Merge pull request #6097 from owncloud/extstorage-ftptrailingslashMorris Jobke2013-11-282-0/+15
|\ \ \
| * | | Add trailing slash in FTP root path when missingVincent Petry2013-11-282-0/+15
* | | | Merge pull request #6098 from owncloud/files-renamediriconfixMorris Jobke2013-11-281-0/+6
|\ \ \ \
| * | | | Fixed directory icon after renameVincent Petry2013-11-281-0/+6
* | | | | loginname is not necessarily usernameArthur Schiwon2013-11-281-4/+5
|/ / / /
* | | | Merge pull request #6089 from owncloud/files-mimetyperefreshafterrenameFrank Karlitschek2013-11-283-26/+73
|\ \ \ \
| * | | | Fixed unit tests for ajax renameVincent Petry2013-11-271-19/+44
| * | | | Update file list entry on renameVincent Petry2013-11-272-7/+29
* | | | | Merge pull request #6096 from owncloud/files-txtextfornewfilesVincent Petry2013-11-282-5/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Moved new file extension out of the translated stringVincent Petry2013-11-281-1/+1
| * | | | New file box now has default file name + extensionVincent Petry2013-11-282-5/+15
| | |/ / | |/| |
* | | | Merge pull request #6094 from owncloud/enc_fix_resharesVincent Petry2013-11-281-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix path reconstruction for resharesBjoern Schiessle2013-11-271-2/+2
| |/ /
* | | Merge pull request #6048 from owncloud/encryption_initial_enc_indicatorMorris Jobke2013-11-274-16/+75
|\ \ \
| * | | improve encryption messageMorris Jobke2013-11-271-1/+1
| * | | some small js fixesBjoern Schiessle2013-11-271-2/+2
| * | | add spinner to the template so that it can be loaded in timeBjoern Schiessle2013-11-271-1/+1
| * | | switch to large spinnerBjoern Schiessle2013-11-271-2/+2
| * | | switch from "name" attribute to "id"Bjoern Schiessle2013-11-271-2/+2
| * | | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-2720-144/+426
| |\| |
| * | | with the latest changes in master $this-userID is always the correct ID, so w...Bjoern Schiessle2013-11-272-25/+21
| * | | Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-2615-27/+118
| |\ \ \ | | | |/ | | |/|
| * | | added a small version of the dark loading gif, looks nicer on the blue backgr...Bjoern Schiessle2013-11-261-1/+1
| * | | use POST instead of GETBjoern Schiessle2013-11-262-3/+3
| * | | fix typo in var nameBjoern Schiessle2013-11-261-1/+1
| * | | remove debug outputBjoern Schiessle2013-11-251-1/+0
| * | | show a message at the log-in screen if inital encryption take placeBjoern Schiessle2013-11-254-6/+70