summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* show a better error message when trying to create a user that already existsRobin Appelman2015-03-201-0/+9
* Merge pull request #14947 from oparoz/repairmimetypes-sqlMorris Jobke2015-03-192-2/+6
|\
| * Adding test cases where the extension is using capital lettersOlivier Paroz2015-03-171-1/+5
| * Make repairmimetypes compatible with case sensitive SQL backendsOlivier Paroz2015-03-171-1/+1
* | Merge pull request #14946 from owncloud/dropbox-root-fixThomas Müller2015-03-191-1/+6
|\ \
| * | Fix root request path for DropboxVincent Petry2015-03-171-1/+6
* | | Merge pull request #15025 from rullzer/ocs_respect_enforced_dateThomas Müller2015-03-193-1/+62
|\ \ \
| * | | Added unit testRoeland Jago Douma2015-03-192-0/+53
| * | | When the expiration date is enforced respect thisRoeland Jago Douma2015-03-191-1/+9
* | | | Merge pull request #14986 from owncloud/fixmapperbackwThomas Müller2015-03-191-3/+17
|\ \ \ \
| * | | | also use backwards compatible method for mapperBernhard Posselt2015-03-181-1/+6
| * | | | fix backwards compatibility for mapper execute methodBernhard Posselt2015-03-181-2/+11
* | | | | Merge pull request #14704 from owncloud/storage-wrapper-mountRobin Appelman2015-03-199-12/+127
|\ \ \ \ \
| * | | | | fix testRobin Appelman2015-03-161-2/+2
| * | | | | fix factory testRobin Appelman2015-03-113-7/+5
| * | | | | Allow setting the watcher policy as mount optionRobin Appelman2015-03-113-1/+18
| * | | | | Copy mount options to the storageRobin Appelman2015-03-114-1/+37
| * | | | | Allow getting all mount options as arrayRobin Appelman2015-03-112-0/+16
| * | | | | Add test for storage factoryRobin Appelman2015-03-111-0/+45
| * | | | | pass mountpoint to storage wrapper callbackRobin Appelman2015-03-113-10/+13
* | | | | | Merge pull request #14537 from owncloud/oci-external-shareRobin Appelman2015-03-193-2/+144
|\ \ \ \ \ \
| * | | | | | Do not make setupMounts() public just because of testingJoas Schilling2015-03-112-12/+12
| * | | | | | Add unit tests for external share manangerRobin Appelman2015-03-102-2/+144
| * | | | | | Fix external shares without password on oracleRobin Appelman2015-02-271-1/+1
* | | | | | | Merge pull request #14980 from owncloud/fix-fileglobalgcThomas Müller2015-03-192-3/+41
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add unit tests for gc() for \OC\Cache\FileGlobalGCRobin McCorkell2015-03-182-2/+38
| * | | | | | Fix fileglobalgc unlink parameter warningsRobin McCorkell2015-03-181-1/+3
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1952-20/+204
* | | | | | | Merge pull request #14995 from owncloud/remove-unrequired-backtick-removalVincent Petry2015-03-182-3/+22
|\ \ \ \ \ \ \
| * | | | | | | Add test for backticks in path and etagJoas Schilling2015-03-181-0/+22
| * | | | | | | Remove unreqired backtick removalLukas Reschke2015-03-181-3/+0
* | | | | | | | fix typo in config.sample.phpMorris Jobke2015-03-181-1/+1
* | | | | | | | Merge pull request #14997 from owncloud/newgroup-empty-disableMorris Jobke2015-03-181-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | disable submit button while groupname is emptyRobin Appelman2015-03-181-0/+13
| |/ / / / / / /
* | | | | | | | Merge pull request #14999 from owncloud/kill-fileoperations-proxyRobin Appelman2015-03-182-40/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | kill fileoperations proxyRobin Appelman2015-03-182-40/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #14994 from owncloud/sabre-customprops-softfailLukas Reschke2015-03-182-2/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Soft fail in custom properties backendVincent Petry2015-03-182-2/+42
| |/ / / / / / /
* | | | | | | | Merge pull request #14992 from owncloud/add-exception-to-memcachbeMorris Jobke2015-03-181-10/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use ArrayCache if ownCloud is not installedLukas Reschke2015-03-181-10/+19
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #14981 from Volker-E/masterJan-Christoph Borchardt2015-03-1812-74/+61
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | addressing #14984 removing redundant type attributesVolker E2015-03-183-6/+6
| * | | | | | addressing #14983 obsolete Google Chrome FrameVolker E2015-03-183-3/+3
| * | | | | | addressing #14982 self-closing tags ending slash doesn't have a purpose & sho...Volker E2015-03-1712-49/+49
| * | | | | | adressing #14979 meta charset declaration should be first in headVolker E2015-03-173-3/+3
| * | | | | | addressing #14978 - remove html root classes targeting IE6/IE7Volker E2015-03-171-6/+2
| * | | | | | addressing #14978 - remove html root classes targeting IE6/IE7Volker E2015-03-172-13/+4
| |/ / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-18180-352/+272
* | | | | | Merge pull request #14972 from owncloud/add-group-styleMorris Jobke2015-03-181-2/+21
|\ \ \ \ \ \
| * | | | | | slight positioning fixes in user mgmt controls barJan-Christoph Borchardt2015-03-171-1/+4