summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-0738-174/+258
* Merge pull request #323 from Faldon/database_portMorris Jobke2016-07-075-7/+26
|\
| * Changed the input option for database-port to required when parameter was pro...Thomas Pulzer2016-07-063-5/+5
| * Added occ install option for database-port.Thomas Pulzer2016-07-065-7/+26
* | Merge pull request #327 from nextcloud/add-php-5.4-5.5Roeland Douma2016-07-061-0/+14
|\ \
| * | Add PHP 5.4 and 5.5 jobs to CIMorris Jobke2016-07-061-0/+14
* | | [tx-robot] updated from transifexNextcloud bot2016-07-06458-1899/+1499
|/ /
* | Merge pull request #324 from nextcloud/fix-naming-issue-droneMorris Jobke2016-07-061-11/+12
|\ \
| * | Fix docker image naming issue for CIMorris Jobke2016-07-061-11/+12
* | | Merge pull request #319 from nextcloud/config-sampleRoeland Douma2016-07-061-1/+1
|\ \ \ | |/ / |/| |
| * | Fix config sample textMorris Jobke2016-07-061-1/+1
|/ /
* | Merge pull request #311 from Bugsbane/masterJoas Schilling2016-07-052-2/+2
|\ \
| * | Replace tag svg with optimized versionBugsbane2016-07-051-79/+3
| * | Clean the svg with inkscapes clean document functionBugsbane2016-07-050-0/+0
| * | Update system tags iconBugsbane2016-07-052-3/+79
|/ /
* | Merge pull request #309 from Faldon/masterBjörn Schießle2016-07-051-1/+1
|\|
| * Added escaping html code when building link to documentation.Thomas Pulzer2016-07-051-1/+1
| * Changed the creation of the update notification link to generate the js objec...Thomas Pulzer2016-07-041-1/+1
* | Merge pull request #306 from nextcloud/sidebar-preview-textMarius Blüm2016-07-045-87/+193
|\ \
| * | for text use max-height to trim whitespaceMorris Jobke2016-07-041-1/+1
| * | adjust padding of text previewMorris Jobke2016-07-041-2/+3
| * | Add large sidebar previews for text filesRobin Appelman2016-07-044-10/+83
| * | Factor out handling sidebar previewsRobin Appelman2016-07-043-81/+113
* | | Merge pull request #296 from ayamshanov/add_fb2_mimetypeLukas Reschke2016-07-042-0/+2
|\ \ \ | |_|/ |/| |
| * | Add mimetype for fb2-extensionAlexander Yamshanov2016-07-032-0/+2
* | | Merge pull request #305 from Faldon/masterLukas Reschke2016-07-0412-19/+19
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/nextcloud/serverThomas Pulzer2016-07-042-5/+23
| |\ \ \ | | | |/ | | |/|
| * | | Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-0412-19/+19
* | | | Merge pull request #284 from nextcloud/cleanup-after-syncMorris Jobke2016-07-041-4/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | we don't need to check permissions twiceBjoern Schiessle2016-07-041-4/+2
| | |/ | |/|
* | | Merge pull request #303 from nextcloud/collapse-logs-in-github-issue-templateMorris Jobke2016-07-041-1/+22
|\ \ \
| * | | Fix summaryMorris Jobke2016-07-041-2/+2
| * | | Collapse logs and lists with HTML5 support of githubJoas Schilling2016-07-041-1/+22
| | |/ | |/|
* | | Merge pull request #299 from nextcloud/master-use-parameterized-queryMorris Jobke2016-07-041-4/+1
|\ \ \ | |/ / |/| |
| * | [master] Use paramterized parameter for \OC\SystemTag\SystemTagManagerLukas Reschke2016-07-031-4/+1
| |/
* | Merge pull request #290 from nextcloud/update-transifex-linkMorris Jobke2016-07-041-1/+1
|\ \ | |/ |/|
| * We have our own Transifex org now ;)Marius Blüm2016-07-021-1/+1
|/
* Merge pull request #275 from nextcloud/master-sync-upstreamBjörn Schießle2016-07-01202-227/+3213
|\
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-01202-227/+3213
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-07-018-0/+126
| | * Merge pull request #25304 from owncloud/local-karmaVincent Petry2016-06-301-13/+1
| | |\
| | | * always use local karmaHendrik Leppelsack2016-06-291-13/+1
| | * | Merge pull request #25310 from owncloud/search-preventinfiniteloopVincent Petry2016-06-301-2/+5
| | |\ \
| | | * | Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-2/+5
| | |/ /
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-308-2/+32
| | * | fix version stringDaniel Molkentin2016-06-291-1/+1
| | * | 9.1.0 RC 1Daniel Molkentin2016-06-291-2/+2
| | * | Various database migration fixes (#25209)Thomas Müller2016-06-2912-4/+1692
| | * | Merge pull request #25288 from owncloud/fix-versionrevertpermsVincent Petry2016-06-294-2/+78
| | |\ \
| | | * | Hide revert button when no permission to revertVincent Petry2016-06-284-2/+78