summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-112-2/+2
* [tx-robot] updated from transifexNextcloud bot2016-07-096-20/+24
* [tx-robot] updated from transifexNextcloud bot2016-07-084-54/+60
* Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-07120-325/+35
|\
| * Revert "occ web executor (#24957)"Morris Jobke2016-07-073-161/+0
| * Merge branch 'master' into sync-masterMorris Jobke2016-07-07144-563/+707
| |\
| * | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-0718-240/+20
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-078-2/+10
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-062-12/+12
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-052-2/+116
| * | Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-04116-163/+34
| |\ \
| | * | adjusts tests to removal of svg fallbackHendrik Leppelsack2016-07-011-38/+1
| | * | remove svg classesHendrik Leppelsack2016-07-019-20/+20
| | * | remove png references in coreHendrik Leppelsack2016-07-011-11/+4
| | * | remove png actions, fileicons, etcHendrik Leppelsack2016-07-01105-0/+0
| | * | remove javascript png fallback for svgHendrik Leppelsack2016-07-011-94/+9
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-044-0/+76
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-032-6/+12
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-024-0/+16
| |/ /
| * | Merge pull request #25262 from owncloud/fed-sharing-errorVincent Petry2016-07-011-1/+1
| |\ \
| | * | better detect errors in fed sharing responseRobin Appelman2016-06-241-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2016-07-072-26/+26
| |_|/ |/| |
* | | Merge pull request #323 from Faldon/database_portMorris Jobke2016-07-071-0/+3
|\ \ \
| * | | Changed the input option for database-port to required when parameter was pro...Thomas Pulzer2016-07-061-1/+1
| * | | Added occ install option for database-port.Thomas Pulzer2016-07-061-0/+3
* | | | [tx-robot] updated from transifexNextcloud bot2016-07-0672-266/+254
|/ / /
* | | Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-042-2/+2
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-0110-8/+512
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-014-0/+122
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-302-2/+12
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-298-8/+356
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-282-0/+24
* | | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-2812-175/+27
|\ \ \
| * | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2712-175/+27
| |\| |
| | * | Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsi...Christoph Wurst2016-06-271-0/+3
| | |\ \
| | | * | Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-0/+3
| | | |/
| | * | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-271-1/+1
| | |\ \
| | | * | Add explicit delete permission to link sharesVincent Petry2016-06-241-1/+1
| | | |/
| | * | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-278-181/+9
| | |\ \
| | | * | remove ie8+9 supportHendrik Leppelsack2016-06-238-181/+9
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-272-0/+14
* | | | | Migrate logic to dynamic controllerLukas Reschke2016-06-272-1/+2
|/ / / /
* | | | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-2611-4/+200
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-262-2/+30
| | |/ | |/|
| * | Merge pull request #25239 from owncloud/setupchecks-preventreloadVincent Petry2016-06-241-2/+4
| |\ \ | | |/ | |/|
| | * Don't reload page in case of auth errors during setup checksVincent Petry2016-06-231-2/+4
| * | Init the headers in iedavclient.jsVincent Petry2016-06-221-0/+1
| * | occ web executor (#24957)VicDeo2016-06-223-0/+161
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-224-0/+4
| |/
* | to NextcloudJoachim Sokolowski2016-06-226-22/+22