summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove stray generateUrlVincent Petry2014-11-191-5/+0
* Added function to load translations from JSVincent Petry2014-11-183-2/+111
* Merge pull request #11741 from owncloud/delete_all_children_preview_2Vincent Petry2014-11-171-16/+94
|\
| * delete all children's previews when deleting a folderGeorg Ehrke2014-10-301-16/+94
* | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-1748-415/+784
|\ \
| * | Correctly restore previous root mount point after testingJoas Schilling2014-11-1715-55/+203
| * | Correctly refresh the apps list after removing the mockJoas Schilling2014-11-171-0/+3
| * | Fix Files\Storage\Home::testRoot()Joas Schilling2014-11-171-1/+6
| * | Make it possible to cleanPath() absolute Windows pathsJoas Schilling2014-11-171-2/+11
| * | Correctly close handle of directory when listing certificatesJoas Schilling2014-11-172-3/+4
| * | Fix single run of encryption tests and usages of uniqid() and fopen()Joas Schilling2014-11-1712-259/+376
| * | Skip some more tests on Windows which just can not work at allJoas Schilling2014-11-177-10/+37
| * | Windows does not support CHMOD, therefor we can not test not writable foldersJoas Schilling2014-11-102-0/+12
| * | Test LargeFileHelperGetFileSize also with ascii only charactersJoas Schilling2014-11-061-18/+37
| * | Do not use uniqid in Group and User tests as it is not unique on windowsJoas Schilling2014-11-067-67/+62
| * | Testcase base classJoas Schilling2014-11-061-0/+33
* | | Merge pull request #12031 from owncloud/app-managerRobin Appelman2014-11-175-0/+406
|\ \ \
| * | | Add \OC\App\Manager to handle enabling/disabling appsRobin Appelman2014-11-105-0/+406
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1740-60/+126
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-164-64/+64
* | | | Merge pull request #12186 from owncloud/fix-12182Morris Jobke2014-11-153-13/+31
|\ \ \ \
| * | | | do not output DB information, and do not set headerArthur Schiwon2014-11-143-7/+28
| * | | | errors are already loggedArthur Schiwon2014-11-142-3/+0
| * | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182Arthur Schiwon2014-11-143-7/+7
* | | | | Merge pull request #12189 from owncloud/checkIfAppIsEnabledMorris Jobke2014-11-152-2/+13
|\ \ \ \ \
| * | | | | Check if app is enabled for userLukas Reschke2014-11-152-2/+13
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-158-14/+22
* | | | | Merge pull request #11029 from owncloud/fix-share-downloadClark Tomlinson2014-11-1414-246/+751
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added download size on public sharingVincent Cloutier2014-11-143-2/+4
| * | | | Refactor file sharing public link handlingLukas Reschke2014-11-1414-245/+748
|/ / / /
* | | | Merge pull request #12181 from owncloud/resubmit-second-failThomas Müller2014-11-141-1/+1
|\ \ \ \
| * | | | Fail...Lukas Reschke2014-11-141-1/+1
|/ / / /
* | | | Merge pull request #12177 from owncloud/skip-mail-test-forThomas Müller2014-11-141-0/+6
|\ \ \ \
| * | | | Mark skipped until #12085 is mergedLukas Reschke2014-11-141-0/+6
|/ / / /
* | | | Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamenameJörn Friedrich Dreyer2014-11-141-4/+1
|\ \ \ \
| * | | | Do not remove dir entry if it has the same name as the parentVincent Petry2014-11-131-4/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-148-2/+16
* | | | | Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroupMorris Jobke2014-11-131-0/+4
|\ \ \ \ \
| * | | | | cleanup group admin(s) on deleteGroupmichag862014-10-081-0/+4
* | | | | | Merge pull request #12157 from owncloud/fix-autotest-conditionVincent Petry2014-11-131-1/+1
|\ \ \ \ \ \
| * | | | | | this allows a non-existant config/config.php for starting the autotest.shMorris Jobke2014-11-131-1/+1
* | | | | | | Merge pull request #12158 from owncloud/drop-snapjsMorris Jobke2014-11-131-785/+0
|\ \ \ \ \ \ \
| * | | | | | | remove unneeded snap.js - followup to #11985 - ref #12156Morris Jobke2014-11-131-785/+0
* | | | | | | | Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change...Morris Jobke2014-11-131-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | removal of wrong/double implemented checkmichag862014-11-131-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #12005 from owncloud/bower-multiselectblizzz2014-11-135-3/+23
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Migrate multiselect to user_ldapMorris Jobke2014-11-135-3/+23
* | | | | | | Run preupdate before an updateLukas Reschke2014-11-132-5/+17
* | | | | | | Merge pull request #9177 from owncloud/jsdocexperimentVincent Petry2014-11-1325-71/+446
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Improved Javascript docs for JSDocVincent Petry2014-10-3123-71/+403