summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-176-17/+42
* [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
| * | | Added script to build the JS documentationVincent Petry2014-10-312-0/+43
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1336-24/+80
* | | | Merge pull request #12141 from owncloud/kill-dav-clientMorris Jobke2014-11-121-59/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | OC_DAVClient is not longer used - no need to carry it around anymoreThomas Müller2014-11-121-59/+0
* | | | Merge pull request #12087 from AdamWill/google-touchVincent Petry2014-11-121-1/+4
|\ \ \ \
| * | | | fix touch() when $mtime is set (Google wants RFC3339) #11267Adam Williamson2014-11-101-1/+4
* | | | | Merge pull request #12139 from owncloud/DoNotTouchMeThomas Müller2014-11-121-3/+3
|\ \ \ \ \
| * | | | | Try to read the file only instead of trying to touchLukas Reschke2014-11-121-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #12128 from owncloud/drop-formfactorJan-Christoph Borchardt2014-11-127-118/+20
|\ \ \ \ \
| * | | | | Drop form_factor that is appended to JS, CSS and template filenamesMorris Jobke2014-11-127-118/+20
* | | | | | Merge pull request #12126 from owncloud/remove-debug-statementLukas Reschke2014-11-121-4/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove debug statementLukas Reschke2014-11-121-4/+0
|/ / / / /
* | | | | Merge pull request #12110 from owncloud/fix-12080Thomas Müller2014-11-122-2/+2
|\ \ \ \ \
| * | | | | add 'namespace' for automatically created navigation divs, fixes #12080Arthur Schiwon2014-11-122-2/+2
* | | | | | Merge pull request #12093 from AdamWill/storage-test-touchMorris Jobke2014-11-121-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | storage test: use new file for testTouchCreateFile()Adam Williamson2014-11-101-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #12105 from owncloud/dav-fixcleanpathThomas Müller2014-11-121-0/+2
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 00:49:21 +0000