summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add expected values to default config as wellLukas Reschke2015-02-212-0/+2
* Add helper to check for `ini` values in `OC_Util::checkServer`Lukas Reschke2015-02-211-1/+27
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-2120-4/+44
* Merge pull request #13777 from owncloud/close-cursorLukas Reschke2015-02-204-37/+51
|\
| * fix indentionBernhard Posselt2015-01-291-7/+6
| * add tests for closing the cursorBernhard Posselt2015-01-292-10/+16
| * ignore cursorclosingBernhard Posselt2015-01-293-29/+38
* | Merge pull request #13767 from owncloud/issue/13764-mimetype-raceconditionThomas Müller2015-02-201-3/+7
|\ \
| * | Use insertIfNotExists() and reload mimetypes after inserting oneJoas Schilling2015-02-021-3/+7
* | | Merge pull request #14325 from owncloud/fix-plurals-with-quotesLukas Reschke2015-02-201-2/+5
|\ \ \
| * | | Correctly create the expected key for plurals with quotesJoas Schilling2015-02-181-2/+5
* | | | Merge pull request #14278 from owncloud/fix-indexLukas Reschke2015-02-202-16/+277
|\ \ \ \
| * | | | Check if the offset exists before accessingLukas Reschke2015-02-172-16/+277
* | | | | Merge pull request #14359 from owncloud/add-satisfy-allLukas Reschke2015-02-201-0/+1
|\ \ \ \ \
| * | | | | Add `Satisfy All`Lukas Reschke2015-02-191-0/+1
* | | | | | Merge pull request #13645 from owncloud/fix-breadcrumb-backslashMorris Jobke2015-02-204-1/+32
|\ \ \ \ \ \
| * | | | | | apply backslash fix to _setCurrentDirThomas Müller2015-02-192-1/+6
| * | | | | | Parse backslash as directory separator in breadcrumbLukas Reschke2015-01-242-0/+26
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-20266-126/+2354
* | | | | | | Merge pull request #14366 from owncloud/remove-old-l10n-filesLukas Reschke2015-02-1918-108/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove some old l10n files they arent loaded anymoreJoas Schilling2015-02-1918-108/+0
* | | | | | | | Merge pull request #14199 from owncloud/cast-type-manuallyMorris Jobke2015-02-1947-131/+131
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `int` instead of `string`Lukas Reschke2015-02-161-1/+1
| * | | | | | | | Do not change behaviour of 'false'Joas Schilling2015-02-131-2/+2
| * | | | | | | | This is an arrayLukas Reschke2015-02-131-1/+1
| * | | | | | | | Manually type-case all AJAX filesLukas Reschke2015-02-1347-133/+133
* | | | | | | | | Merge pull request #13505 from owncloud/streamline-scanning-codeThomas Müller2015-02-191-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Streamline auth and CSRF check in scan.phpLukas Reschke2015-01-201-1/+5
* | | | | | | | | | Merge pull request #14267 from owncloud/encode-eventsourceThomas Müller2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Encode requesttokenLukas Reschke2015-02-161-1/+1
* | | | | | | | | | | Merge pull request #14295 from owncloud/encode-request-token-for-avatarsThomas Müller2015-02-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Encode Requesttoken for avatarsLukas Reschke2015-02-171-2/+2
* | | | | | | | | | | | Merge pull request #14311 from raimund-schluessler/Fix#14310Thomas Müller2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix #14310Raimund Schlüßler2015-02-171-1/+1
* | | | | | | | | | | | | Merge pull request #14377 from owncloud/port-14041Thomas Müller2015-02-191-3/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Port of #14041 to masterArthur Schiwon2015-02-191-3/+37
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #14338 from owncloud/fix-nav-heigtMorris Jobke2015-02-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | if no link text has been set for the navigation show the link nonethelessBernhard Posselt2015-02-181-0/+1
* | | | | | | | | | | | | Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-viewThomas Müller2015-02-192-6/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add some basic PHPDoc to functionsLukas Reschke2015-02-181-6/+124
| * | | | | | | | | | | | | Prevent directory traversals in ctr of \OC\Files\ViewLukas Reschke2015-02-182-0/+25
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1944-170/+236
* | | | | | | | | | | | | | Merge pull request #13836 from owncloud/part-no-cache-updateThomas Müller2015-02-192-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Dont bother updating the cache when working with part filesRobin Appelman2015-02-051-0/+12
| * | | | | | | | | | | | | Dont update the cache after fopenRobin Appelman2015-02-051-1/+1
* | | | | | | | | | | | | | Merge pull request #14349 from owncloud/contributetrackerupdateThomas Müller2015-02-181-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add documentation issue trackers and use https everywhereVolkan Gezer2015-02-181-6/+10
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #12213 from sebomoto/add-loadfeedbackJan-Christoph Borchardt2015-02-183-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | changed image to classed div for spinner animationSebastian Bolt2015-02-043-1/+9
* | | | | | | | | | | | | | Merge pull request #13989 from owncloud/enhancment/security/11857Clark Tomlinson2015-02-188-22/+529
|\ \ \ \ \ \ \ \ \ \ \ \ \ \