summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-122-0/+4
* add test for needsRebundling() checkBjoern Schiessle2016-07-111-1/+11
* Merge pull request #347 from nextcloud/drop-windows-fooLukas Reschke2016-07-115-50/+17
|\
| * Remove unneeded checks if it runs on a Windows machineMorris Jobke2016-07-085-50/+17
* | Merge pull request #350 from nextcloud/fix-check-certificate-bundlesJoas Schilling2016-07-111-1/+2
|\ \
| * | always check the mtime of the system bundle and additionally the user specifi...Bjoern Schiessle2016-07-081-1/+2
| |/
* / Sanitize more config options and stack tracesMorris Jobke2016-07-082-0/+7
|/
* [tx-robot] updated from transifexNextcloud bot2016-07-0816-10/+42
* Merge pull request #314 from jernst/masterLukas Reschke2016-07-071-8/+15
|\
| * Disallow certain malformed domain names even if they match the trusted domain...Johannes Ernst2016-07-061-3/+6
| * Trusted domain wildcard checking made shorter, supporting multiple *Johannes Ernst2016-07-061-32/+8
| * Duh, no 'next' in PHP.Johannes Ernst2016-07-061-2/+2
| * Allow wildcard * to be used in trusted domains, to support setups where no re...Johannes Ernst2016-07-051-2/+30
* | Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-076-27/+16
|\ \
| * | Revert "occ web executor (#24957)"Morris Jobke2016-07-072-18/+4
| * | Revert "Bypass upgrade page when occ controller is requested"Morris Jobke2016-07-071-15/+3
| * | Merge branch 'master' into sync-masterMorris Jobke2016-07-0777-587/+303
| |\ \
| * | | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-0712-50/+0
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-074-0/+6
| * | | Use named parameter instead of direct value for system tags search param (#25...Vincent Petry2016-07-061-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-062-0/+4
| * | | Merge pull request #25356 from owncloud/checkupgrade-bypassVincent Petry2016-07-051-3/+15
| |\ \ \
| | * | | Bypass upgrade page when occ controller is requestedVictor Dubiniuk2016-07-051-3/+15
| * | | | fix swift primary object store test (#25281)Thomas Müller2016-07-051-1/+1
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-052-0/+2
| |/ / /
| * | | Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-042-7/+7
| |\ \ \
| | * | | remove png references in coreHendrik Leppelsack2016-07-012-7/+7
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-042-0/+22
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-032-0/+4
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-022-0/+12
| |/ / /
* | / / [tx-robot] updated from transifexNextcloud bot2016-07-072-18/+18
| |/ / |/| |
* | | Merge pull request #323 from Faldon/database_portMorris Jobke2016-07-074-7/+23
|\ \ \
| * | | Changed the input option for database-port to required when parameter was pro...Thomas Pulzer2016-07-062-4/+4
| * | | Added occ install option for database-port.Thomas Pulzer2016-07-064-7/+23
| | |/ | |/|
* / | [tx-robot] updated from transifexNextcloud bot2016-07-0660-516/+180
|/ /
* | Merge branch 'master' of https://github.com/nextcloud/serverThomas Pulzer2016-07-041-4/+1
|\ \
| * | [master] Use paramterized parameter for \OC\SystemTag\SystemTagManagerLukas Reschke2016-07-031-4/+1
* | | Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-042-4/+4
|/ /
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-0113-45/+197
|\|
| * Various database migration fixes (#25209)Thomas Müller2016-06-295-1/+93
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-294-0/+30
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-282-0/+4
| * Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-271-1/+6
| * Login hooks (#25260)Christoph Wurst2016-06-271-40/+61
| * handle unavailable fed shares while testing for availability (#25277)Robin Appelman2016-06-271-3/+3
* | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-284-11/+47
|\ \
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-274-11/+47
| |\|
| | * Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-272-6/+24
| | |\
| | | * Repair step to adjust link share delete permissionsVincent Petry2016-06-241-0/+23
| | | * Add explicit delete permission to link sharesVincent Petry2016-06-241-6/+1