aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12618 from owncloud/initial-work-migrate-to-appframeworkLukas Reschke2014-12-0826-397/+1332
|\
| * React on other statuscodes than 200Lukas Reschke2014-12-086-89/+54
| * Merge branch 'initial-work-migrate-to-appframework' of https://github.com/own...Lukas Reschke2014-12-081-7/+5
| |\
| | * fix updated URL schema in JS unit testsMorris Jobke2014-12-081-7/+5
| * | Add statuscodesLukas Reschke2014-12-084-23/+113
| * | Fix urlLukas Reschke2014-12-081-1/+1
| |/
| * Add REST route for user & group managementLukas Reschke2014-12-0825-340/+1222
* | Merge pull request #12704 from owncloud/fix-12647-2Lukas Reschke2014-12-082-3/+9
|\ \
| * | add docArthur Schiwon2014-12-081-0/+1
| * | preserve an asterisk at the start when escaping a search termArthur Schiwon2014-12-082-3/+8
* | | Merge pull request #12621 from owncloud/add-right-marginJoas Schilling2014-12-081-3/+2
|\ \ \
| * | | Add right margin to codestyle fileLukas Reschke2014-12-041-3/+2
* | | | Merge pull request #12696 from owncloud/trashbin-selected-deleteRobin Appelman2014-12-081-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix deleting selected files in the trashbinRobin Appelman2014-12-081-0/+4
| | |/ | |/|
* | | Merge pull request #12452 from owncloud/server2server-ng-ocsMorris Jobke2014-12-0814-55/+612
|\ \ \
| * | | OCS API for server-to-server sharingBjoern Schiessle2014-12-0414-55/+612
* | | | Merge pull request #12691 from owncloud/i-shall-improve-my-grep-skillsMorris Jobke2014-12-081-1/+1
|\ \ \ \
| * | | | Remove unexisting `htAccessWorkinght`Lukas Reschke2014-12-081-1/+1
| | |/ / | |/| |
* | | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-083-128/+314
|\ \ \ \ | |/ / / |/| | |
| * | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-243-128/+314
* | | | Merge pull request #12657 from owncloud/ajaxify-htaccess-checkMorris Jobke2014-12-084-20/+10
|\ \ \ \
| * | | | Check for working .htaccess via AJAXLukas Reschke2014-12-064-20/+10
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0880-68/+18
* | | | | Remove changes which were inadvertently pushed to masterOlivier Paroz2014-12-081-78/+0
* | | | | Dump Arrays, Objects and Exceptions to the logOlivier Paroz2014-12-081-0/+78
* | | | | Merge pull request #12644 from owncloud/add-hack-for-configLukas Reschke2014-12-071-1/+9
|\ \ \ \ \
| * | | | | Create config if it does not existsLukas Reschke2014-12-061-1/+9
| |/ / / /
* | | | | Merge pull request #12668 from owncloud/keepspaceThomas Müller2014-12-071-1/+1
|\ \ \ \ \
| * | | | | Keep spaces out of the stringVolkan Gezer2014-12-071-1/+1
| |/ / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-0732-4/+40
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0694-252/+62
* | | | Merge pull request #12636 from owncloud/fix-ie9-placeholderRaghu Nayyar2014-12-061-1/+8
|\ \ \ \
| * | | | fix placeholder fake in IE8 & 9 that brokes group listing in user management ...Morris Jobke2014-12-051-1/+8
* | | | | Merge pull request #12646 from owncloud/remove-safe-magic-quotesRobin Appelman2014-12-053-25/+1
|\ \ \ \ \
| * | | | | Remove checks for safe mode and magic quotesLukas Reschke2014-12-053-25/+1
* | | | | | Merge pull request #12166 from helmutschneider/aws-2.7.5Lukas Reschke2014-12-0551-254/+710
|\ \ \ \ \ \
| * | | | | | Upgrade AWS sdk to 2.7.5Johan Björk2014-11-1351-254/+710
* | | | | | | Merge pull request #11485 from brumsoel/masterLukas Reschke2014-12-052-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Modified filesort test cases to test for large sizes & timestampsbrumsel2014-12-031-2/+2
| * | | | | | | Merge remote-tracking branch 'upstream/master'brumsel2014-12-033887-91956/+151926
| |\ \ \ \ \ \ \
| * | | | | | | | Fix timestamp comparator return valuebrumsoel2014-10-081-1/+1
* | | | | | | | | Merge pull request #12477 from rjaeckel/masterLukas Reschke2014-12-051-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blocked 3rdparty instead of l10nRobert Jäckel2014-11-271-1/+1
| * | | | | | | | | restrict access to public files onlyRobert Jäckel2014-11-271-0/+2
* | | | | | | | | | Merge pull request #12523 from owncloud/port-11747Vincent Petry2014-12-051-3/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-12-011-3/+28
* | | | | | | | | | Merge pull request #12561 from oparoz/vectoriconMorris Jobke2014-12-055-43/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | PNG and SVG have been compressedOlivier Paroz2014-12-052-167/+37
| * | | | | | | | | | Improve the bitmap and vector mime iconsOlivier Paroz2014-12-025-56/+171
* | | | | | | | | | | Merge pull request #12583 from owncloud/trim-portMorris Jobke2014-12-053-10/+42
|\ \ \ \ \ \ \ \ \ \ \