summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20034 from owncloud/icewind_streams_0.3.0Thomas Müller2015-11-191-0/+9
|\
| * Follow the interface againRoeland Jago Douma2015-11-191-0/+9
* | Adjust the method name to reflect it's behaviourJoas Schilling2015-11-191-1/+1
* | Merge pull request #20563 from owncloud/systemtags-interfaceThomas Müller2015-11-195-0/+352
|\ \ | |/ |/|
| * Core interfaces for system tags and its managerVincent Petry2015-11-195-0/+352
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-194-2/+26
* | Handle non existing users as owner in the viewRobin Appelman2015-11-181-5/+20
* | Merge pull request #20438 from owncloud/memcache-key-length-fixThomas Müller2015-11-181-8/+30
|\ \
| * | Handle errors on memcached level - fixes #17397Thomas Müller2015-11-101-8/+30
* | | Merge pull request #20540 from owncloud/fix-format-call-in-loggerThomas Müller2015-11-181-2/+5
|\ \ \
| * | | fixes #20538Thomas Müller2015-11-161-2/+5
| | |/ | |/|
* | | Merge pull request #20494 from owncloud/storage-forbidden-exceptionThomas Müller2015-11-184-0/+64
|\ \ \
| * | | Allow storage wrappers to through a forbidden exception with retry informationJoas Schilling2015-11-174-0/+64
* | | | Merge pull request #20551 from owncloud/notification-fix-testsThomas Müller2015-11-182-1/+4
|\ \ \ \
| * | | | Add tests for the "return $this" and fix it on the new methodJoas Schilling2015-11-172-1/+4
| |/ / /
* | | | Merge pull request #20188 from owncloud/webdav-exposeshareownerThomas Müller2015-11-172-0/+14
|\ \ \ \
| * | | | Add getOwner() method to FileInfo and Node APIVincent Petry2015-11-132-0/+14
* | | | | Merge pull request #20544 from owncloud/move-index-to-appframeworkThomas Müller2015-11-171-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move index.php from files to AppFrameworkLukas Reschke2015-11-161-0/+4
| | |/ / | |/| |
* | | | Merge pull request #20539 from owncloud/notification-api-adjustmentThomas Müller2015-11-174-72/+61
|\ \ \ \ | |/ / / |/| | |
| * | | Remove the icon for nowJoas Schilling2015-11-164-72/+0
| * | | Add "is primary action" to actionsJoas Schilling2015-11-163-0/+61
| |/ /
* | | Merge pull request #20465 from owncloud/forms.cssThomas Müller2015-11-161-0/+1
|\ \ \
| * | | move form styles from styles.css to inputs.cssHendrik Leppelsack2015-11-131-0/+1
* | | | [Share2.0] OCS Share API getShare uses new codeRoeland Jago Douma2015-11-163-17/+70
| |/ / |/| |
* | | Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precisionThomas Müller2015-11-121-1/+1
|\ \ \
| * | | enable microseconds in log timestampsChristian Schnidrig2015-11-121-1/+1
* | | | Merge pull request #17920 from andyboeh/masterThomas Müller2015-11-121-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add hook 'pre_displayLoginPage'Andreas Böhler2015-07-281-8/+1
| * | | Add possibility for alternative logins to force redirection of login pageAndreas Böhler2015-07-281-0/+8
* | | | Merge pull request #20461 from owncloud/assetpipeline-on-upgradeThomas Müller2015-11-121-0/+11
|\ \ \ \
| * | | | Do not use the asset pipeline when doing updatesJoas Schilling2015-11-111-0/+11
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-126-0/+26
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-11100-108/+198
| |_|/ |/| |
* | | Merge pull request #20224 from owncloud/fileinfo-ownerRobin Appelman2015-11-104-7/+44
|\ \ \
| * | | Add getOwner to FileInfoRobin Appelman2015-11-104-7/+44
* | | | Merge pull request #20428 from owncloud/add-log-statement-for-trusted-domain-...Thomas Müller2015-11-101-0/+9
|\ \ \ \
| * | | | Add warning log entry when user accesses untrusted domainLukas Reschke2015-11-101-0/+9
| |/ / /
* | | | Merge pull request #20389 from owncloud/storage_not_availableThomas Müller2015-11-101-1/+16
|\ \ \ \ | |/ / / |/| | |
| * | | use a HintException to have some useful user output in case of an errorBjörn Schießle2015-11-101-1/+16
* | | | Merge pull request #20373 from owncloud/use-random-int-if-it-existsThomas Müller2015-11-102-6/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Use native CSPRNG if availableLukas Reschke2015-11-092-6/+21
| |/ /
* | | Merge pull request #16604 from owncloud/cache-escape-likeRobin Appelman2015-11-106-62/+101
|\ \ \
| * | | escape like parameter for move queriesRobin Appelman2015-11-051-1/+1
| * | | Add escapeLikeParameter to IDBConnectionRobin Appelman2015-11-053-0/+28
| * | | define escape character for like statements on oracleRobin Appelman2015-11-051-0/+1
| * | | define escape character for like statements on sqliteRobin Appelman2015-11-051-0/+1
| * | | move from OC_DB to IDBConnectionRobin Appelman2015-11-051-62/+71
* | | | Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirementThomas Müller2015-11-101-0/+15
|\ \ \ \
| * | | | Do not allow two different version requirementsJoas Schilling2015-11-091-0/+15
| | |/ / | |/| |