summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| | |_|/ / / / | |/| | | | |
* | | | | | | fixing download url in files appThomas Müller2014-03-021-1/+1
* | | | | | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-023-3/+6
|/ / / / / /
* | | | | | Merge pull request #7455 from owncloud/rawlist-fileinfoicewind19912014-02-281-31/+28
|\ \ \ \ \ \
| * | | | | | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-271-31/+28
* | | | | | | Merge pull request #7454 from owncloud/enc_remember_fopen_modeBjörn Schießle2014-02-282-6/+29
|\ \ \ \ \ \ \
| * | | | | | | remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
| |/ / / / / /
* | | | | | | Fixed wrong field nameVincent Petry2014-02-271-1/+1
* | | | | | | Merge pull request #7446 from owncloud/etag_assert_fixesThomas Müller2014-02-271-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | use assertSame and assertNotSame for etag checksJörn Friedrich Dreyer2014-02-271-2/+2
* | | | | | | Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_allVincent Petry2014-02-272-0/+16
|\ \ \ \ \ \ \
| * | | | | | | close encryption session after decryption was finishedBjoern Schiessle2014-02-262-0/+16
| |/ / / / / /
* | | | | | | Merge pull request #7421 from owncloud/password-inputThomas Müller2014-02-261-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | disable autocomplete for shared link password input, fix #7419Jan-Christoph Borchardt2014-02-261-1/+4
* | | | | | | Merge pull request #7393 from owncloud/fix_path_in_sharing_resultsBjörn Schießle2014-02-262-0/+69
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fix path in sharing results if it is a file in the Shared folderBjoern Schiessle2014-02-252-0/+69
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #7416 from owncloud/share_api_7311Thomas Müller2014-02-261-6/+6
|\ \ \ \ \ \
| * | | | | | only add "received_from" if a share was foundBjoern Schiessle2014-02-261-6/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-22/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-22/+0
* | | | | | coding style fixes, cut long lines, comments not on same lines, curly bracesJan-Christoph Borchardt2014-02-261-8/+11