summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8556 from owncloud/kill-legacy-code-masterThomas Müller2014-05-1227-94/+94
|\
| * remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-1224-86/+86
| * remove legacy aka deprecated code: OC_CacheThomas Müller2014-05-122-2/+2
| * remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-124-6/+6
* | Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldapLukas Reschke2014-05-1213-384/+689
|\ \ | |/ |/|
| * Use array as typeLukas Reschke2014-05-121-1/+1
| * That's bool and not always trueLukas Reschke2014-05-111-1/+1
| * Use WizardResult|false instead of mixedLukas Reschke2014-05-111-2/+2
| * Use @return instead of @returnsLukas Reschke2014-05-113-9/+9
| * Fix TypoLukas Reschke2014-05-111-1/+1
| * Use proper PHPDoc and variable names in the LDAP libLukas Reschke2014-05-1112-378/+683
* | Merge pull request #8041 from owncloud/files-sortcolumnsVincent Petry2014-05-1212-74/+507
|\ \
| * | Clear selection on reload (when changing sort)Vincent Petry2014-04-292-2/+9
| * | typos, indentation and remove of unused codeThomas Müller2014-04-283-7/+7
| * | html input tag has no closing tagThomas Müller2014-04-281-2/+3
| * | $RUNTIME_APPTYPES is no longer used - left over from pre OC4Thomas Müller2014-04-281-5/+0
| * | Added unit test in files app for sort function in helper classVincent Petry2014-04-282-6/+113
| * | Set default sort of trashbin to timestamp descendingVincent Petry2014-04-282-4/+2
| * | Add sorting to files list, trashbin and public filesVincent Petry2014-04-2810-57/+382
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-127-4/+29
* | | $owner is not defined hereLukas Reschke2014-05-111-1/+1
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-114-5/+8
* | Merge pull request #8520 from owncloud/jslint_polishing_in_file_uploadLukas Reschke2014-05-101-45/+61
|\ \
| * | polish jslint for files-upload.jsJörn Friedrich Dreyer2014-05-091-45/+61
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1014-0/+104
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-094-1/+38
* | Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-082-6/+61
|\ \
| * | Added unit test for sharing ext storage mount pointsVincent Petry2014-05-081-2/+55
| * | Fix sharing of ext storage mount pointsVincent Petry2014-05-081-4/+6
* | | Merge pull request #8293 from owncloud/files_external_fix_readDataVincent Petry2014-05-081-19/+18
|\ \ \
| * | | Permit personal mount points to be used for sharingRobin McCorkell2014-04-211-19/+18
* | | | Merge pull request #8221 from owncloud/type-hinting-sharingVincent Petry2014-05-083-2/+13
|\ \ \ \
| * \ \ \ Merge branch 'master' into type-hinting-sharingBart Visscher2014-04-28203-1314/+1506
| |\ \ \ \
| * | | | | Fix PHPdoc in apps/files_sharingBart Visscher2014-04-154-1/+15
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-081-0/+2
* | | | | | Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanupBjoern Schiessle2014-05-072-2/+2
|\ \ \ \ \ \
| * | | | | | Fix endless loop on windows serversJoas Schilling2014-05-072-2/+2
* | | | | | | remove error_log outputBjoern Schiessle2014-05-071-2/+1
|/ / / / / /
* | | | / / we can take the permission directly from the share, no need to call the share...Bjoern Schiessle2014-05-071-20/+6
| |_|_|/ / |/| | | |
* | | | | check if we have a fileinfoBjoern Schiessle2014-05-071-1/+5
* | | | | ignore part filesBjoern Schiessle2014-05-071-0/+6
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-079-0/+42
* | | | | Merge pull request #8456 from owncloud/extstorage-unittestssuiteThomas Müller2014-05-053-5/+1
|\ \ \ \ \
| * | | | | Added ext storage app in autotest unit test runVincent Petry2014-05-053-5/+1
* | | | | | Merge pull request #8386 from owncloud/fix_6946_masterVincent Petry2014-05-052-39/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Group Database backend must not gather user details itself but ask userArthur Schiwon2014-04-282-39/+1
* | | | | | Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-masterThomas Müller2014-05-056-53/+78
|\ \ \ \ \ \
| * | | | | | load image via javascript and use $(document).width() to determine the proper...Thomas Müller2014-05-022-48/+62
| * | | | | | Images on public sharing get downscaled to increase use experience - this wil...Thomas Müller2014-05-025-9/+20
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-055-0/+23