summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-112-8/+201
|\
| * add 'received_from' info to the share, so that every share can have a differe...Bjoern Schiessle2014-03-111-2/+4
| * fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-111-6/+197
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-11293-970/+866
|/
* Merge pull request #7646 from owncloud/fix_ocs_api_unshareThomas Müller2014-03-102-7/+40
|\
| * we need the file_source to delete a share successfullyBjoern Schiessle2014-03-102-7/+40
* | Merge pull request #7398 from owncloud/trash_dont_rely_on_dbVincent Petry2014-03-107-150/+78
|\ \
| * | fix mimetype detection, introduce fake etag to identify preview imagesBjoern Schiessle2014-03-101-1/+2
| * | get trash size from file cacheBjoern Schiessle2014-03-104-77/+10
| * | only enable previews if the encryption is disabledBjoern Schiessle2014-03-101-1/+5
| * | if file is not in db, fall back to restore file to the users rootBjoern Schiessle2014-03-104-72/+62
* | | Merge pull request #7629 from owncloud/files-allfileswarningtypoVincent Petry2014-03-101-1/+1
|\ \ \
| * | | Fixed log warning when deleting a single fileVincent Petry2014-03-071-1/+1
* | | | Merge pull request #7631 from ichEben/masterVincent Petry2014-03-101-1/+1
|\ \ \ \
| * | | | only initialise upload dropZone if public upload is allowedIchEben2014-03-071-1/+1
| |/ / /
* | | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefixVincent Petry2014-03-102-0/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Return unencrypted_size of folder when queriedVincent Petry2014-03-072-0/+27
| | |/ | |/|
* | | Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-99/+94
|\ \ \ | |/ / |/| |
| * | Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-99/+94
* | | Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-062-499/+633
|\ \ \
| * | | Fixed upload issue when free space is not knownVincent Petry2014-03-061-1/+3
| * | | Added unit tests for "add()" method for file uploadVincent Petry2014-03-062-499/+631
* | | | Merge branch 'master' into fix-7307Thomas Müller2014-03-0617-63/+184
|\| | |
| * | | Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
| |\ \ \
| | * | | Do not set #dir when on public.phpJoas Schilling2014-03-051-2/+2
| * | | | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-051-1/+1
| |\ \ \ \
| | * | | | Use 'command -v' to detect whether and where software is installed (instead o...Philipp Schmitt2014-02-211-1/+1
| * | | | | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-055-26/+61
| |\ \ \ \ \
| | * | | | | don't allow to create a file or folder named 'Shared' in the root folder, als...Bjoern Schiessle2014-03-055-26/+61
| | | |_|/ / | | |/| | |
| * | | | | fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-051-1/+1
| | |_|/ / | |/| | |
| * | | | Merge pull request #7261 from owncloud/issue/6793Jan-Christoph Borchardt2014-03-055-13/+74
| |\ \ \ \
| | * | | | Allow admins to disable certain external storages for usersJoas Schilling2014-02-265-13/+74
| * | | | | Merge pull request #7556 from owncloud/enc_dont_create_files_folderVincent Petry2014-03-051-1/+0
| |\ \ \ \ \
| | * | | | | don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
| * | | | | | Merge pull request #7012 from owncloud/display-share-owner-masterVincent Petry2014-03-054-13/+30
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-2832-150/+831
| | |\ \ \ \ \
| | * | | | | | Improve jQuery element selectorMorris Jobke2014-02-201-1/+1
| | * | | | | | uppercase text and fix dialog popupThomas Müller2014-02-201-4/+4
| | * | | | | | show share owner within shared folders as wellThomas Müller2014-02-201-0/+3
| | * | | | | | remove duplicate selectors and declarationThomas Müller2014-02-201-7/+6
| | * | | | | | update share ownerThomas Müller2014-02-201-0/+8
| | * | | | | | store the share owner in a data-attribute instead of a separate spanThomas Müller2014-02-201-5/+9
| | * | | | | | adding share owner information to the file listThomas Müller2014-02-202-5/+8
| * | | | | | | Merge pull request #7508 from owncloud/ldap-configkeycasingVincent Petry2014-03-041-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed configkey casing for PostgreSQLVincent Petry2014-03-031-1/+1
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #7525 from owncloud/fix_S3stringThomas Müller2014-03-041-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fix https://github.com/owncloud/core/issues/6825Frank Karlitschek2014-03-041-1/+1
| * | | | | | | remove remaining testing artefactArthur Schiwon2014-03-031-1/+1
| * | | | | | | intendetion. where did the whitespaces come from?Arthur Schiwon2014-03-031-2/+2
| * | | | | | | LDAP: let proxy for multiple server access methods from AccessArthur Schiwon2014-03-031-4/+13
| | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 22:51:12 +0000