Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7646 from owncloud/fix_ocs_api_unshare | Thomas Müller | 2014-03-10 | 2 | -7/+40 |
|\ | |||||
| * | we need the file_source to delete a share successfully | Bjoern Schiessle | 2014-03-10 | 2 | -7/+40 |
* | | Merge pull request #7398 from owncloud/trash_dont_rely_on_db | Vincent Petry | 2014-03-10 | 7 | -150/+78 |
|\ \ | |||||
| * | | fix mimetype detection, introduce fake etag to identify preview images | Bjoern Schiessle | 2014-03-10 | 1 | -1/+2 |
| * | | get trash size from file cache | Bjoern Schiessle | 2014-03-10 | 4 | -77/+10 |
| * | | only enable previews if the encryption is disabled | Bjoern Schiessle | 2014-03-10 | 1 | -1/+5 |
| * | | if file is not in db, fall back to restore file to the users root | Bjoern Schiessle | 2014-03-10 | 4 | -72/+62 |
* | | | Merge pull request #7629 from owncloud/files-allfileswarningtypo | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed log warning when deleting a single file | Vincent Petry | 2014-03-07 | 1 | -1/+1 |
* | | | | Merge pull request #7631 from ichEben/master | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | only initialise upload dropZone if public upload is allowed | IchEben | 2014-03-07 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #7624 from owncloud/enc-encryptedusedspacefix | Vincent Petry | 2014-03-10 | 2 | -0/+27 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Return unencrypted_size of folder when queried | Vincent Petry | 2014-03-07 | 2 | -0/+27 |
| | |/ | |/| | |||||
* | | | Merge pull request #7529 from owncloud/getlocalfile-cache | icewind1991 | 2014-03-07 | 1 | -99/+94 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add caching for getLocalFile on remote storages | Robin Appelman | 2014-03-04 | 1 | -99/+94 |
* | | | Merge pull request #7592 from owncloud/fixstoragefreespace | Vincent Petry | 2014-03-06 | 2 | -499/+633 |
|\ \ \ | |||||
| * | | | Fixed upload issue when free space is not known | Vincent Petry | 2014-03-06 | 1 | -1/+3 |
| * | | | Added unit tests for "add()" method for file upload | Vincent Petry | 2014-03-06 | 2 | -499/+631 |
* | | | | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 17 | -63/+184 |
|\| | | | |||||
| * | | | Merge pull request #7575 from owncloud/issue/7571 | Vincent Petry | 2014-03-05 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Do not set #dir when on public.php | Joas Schilling | 2014-03-05 | 1 | -2/+2 |
| * | | | | Merge pull request #7354 from pschmitt/master | Lukas Reschke | 2014-03-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Use 'command -v' to detect whether and where software is installed (instead o... | Philipp Schmitt | 2014-02-21 | 1 | -1/+1 |
| * | | | | | Merge pull request #7531 from owncloud/dont_create_shared_folder | Björn Schießle | 2014-03-05 | 5 | -26/+61 |
| |\ \ \ \ \ | |||||
| | * | | | | | don't allow to create a file or folder named 'Shared' in the root folder, als... | Bjoern Schiessle | 2014-03-05 | 5 | -26/+61 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | fix some spaces to tabs issues reported by Scrutinizer | Jan-Christoph Borchardt | 2014-03-05 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #7261 from owncloud/issue/6793 | Jan-Christoph Borchardt | 2014-03-05 | 5 | -13/+74 |
| |\ \ \ \ | |||||
| | * | | | | Allow admins to disable certain external storages for users | Joas Schilling | 2014-02-26 | 5 | -13/+74 |
| * | | | | | Merge pull request #7556 from owncloud/enc_dont_create_files_folder | Vincent Petry | 2014-03-05 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | don't create files folder, let ownCloud core handle it | Bjoern Schiessle | 2014-03-05 | 1 | -1/+0 |
| * | | | | | | Merge pull request #7012 from owncloud/display-share-owner-master | Vincent Petry | 2014-03-05 | 4 | -13/+30 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge branch 'master' into display-share-owner-master | Thomas Müller | 2014-02-28 | 32 | -150/+831 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Improve jQuery element selector | Morris Jobke | 2014-02-20 | 1 | -1/+1 |
| | * | | | | | | uppercase text and fix dialog popup | Thomas Müller | 2014-02-20 | 1 | -4/+4 |
| | * | | | | | | show share owner within shared folders as well | Thomas Müller | 2014-02-20 | 1 | -0/+3 |
| | * | | | | | | remove duplicate selectors and declaration | Thomas Müller | 2014-02-20 | 1 | -7/+6 |
| | * | | | | | | update share owner | Thomas Müller | 2014-02-20 | 1 | -0/+8 |
| | * | | | | | | store the share owner in a data-attribute instead of a separate span | Thomas Müller | 2014-02-20 | 1 | -5/+9 |
| | * | | | | | | adding share owner information to the file list | Thomas Müller | 2014-02-20 | 2 | -5/+8 |
| * | | | | | | | Merge pull request #7508 from owncloud/ldap-configkeycasing | Vincent Petry | 2014-03-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fixed configkey casing for PostgreSQL | Vincent Petry | 2014-03-03 | 1 | -1/+1 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #7525 from owncloud/fix_S3string | Thomas Müller | 2014-03-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | fix https://github.com/owncloud/core/issues/6825 | Frank Karlitschek | 2014-03-04 | 1 | -1/+1 |
| * | | | | | | | remove remaining testing artefact | Arthur Schiwon | 2014-03-03 | 1 | -1/+1 |
| * | | | | | | | intendetion. where did the whitespaces come from? | Arthur Schiwon | 2014-03-03 | 1 | -2/+2 |
| * | | | | | | | LDAP: let proxy for multiple server access methods from Access | Arthur Schiwon | 2014-03-03 | 1 | -4/+13 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | fixing download url in files app | Thomas Müller | 2014-03-02 | 1 | -1/+1 |
* | | | | | | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 3 | -3/+6 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #7455 from owncloud/rawlist-fileinfo | icewind1991 | 2014-02-28 | 1 | -31/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update rawlist to work with new fileinfo object | Robin Appelman | 2014-02-27 | 1 | -31/+28 |