| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into sync-master | Morris Jobke | 2016-07-07 | 811 | -3207/+9572 |
| |\ | |||||
| | * | Merge pull request #323 from Faldon/database_port | Morris Jobke | 2016-07-07 | 5 | -7/+26 |
| | |\ | |||||
| | | * | Changed the input option for database-port to required when parameter was pro... | Thomas Pulzer | 2016-07-06 | 3 | -5/+5 |
| | | * | Added occ install option for database-port. | Thomas Pulzer | 2016-07-06 | 5 | -7/+26 |
| | * | | Merge pull request #327 from nextcloud/add-php-5.4-5.5 | Roeland Douma | 2016-07-06 | 1 | -0/+14 |
| | |\ \ | |||||
| | | * | | Add PHP 5.4 and 5.5 jobs to CI | Morris Jobke | 2016-07-06 | 1 | -0/+14 |
| | * | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-06 | 458 | -1899/+1499 |
| | |/ / | |||||
| | * | | Merge pull request #324 from nextcloud/fix-naming-issue-drone | Morris Jobke | 2016-07-06 | 1 | -11/+12 |
| | |\ \ | |||||
| | | * | | Fix docker image naming issue for CI | Morris Jobke | 2016-07-06 | 1 | -11/+12 |
| | * | | | Merge pull request #319 from nextcloud/config-sample | Roeland Douma | 2016-07-06 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Fix config sample text | Morris Jobke | 2016-07-06 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #311 from Bugsbane/master | Joas Schilling | 2016-07-05 | 2 | -2/+2 |
| | |\ \ | |||||
| | | * | | Replace tag svg with optimized version | Bugsbane | 2016-07-05 | 1 | -79/+3 |
| | | * | | Clean the svg with inkscapes clean document function | Bugsbane | 2016-07-05 | 0 | -0/+0 |
| | | * | | Update system tags icon | Bugsbane | 2016-07-05 | 2 | -3/+79 |
| | |/ / | |||||
| | * | | Merge pull request #309 from Faldon/master | Björn Schießle | 2016-07-05 | 1 | -1/+1 |
| | |\| | |||||
| | | * | Added escaping html code when building link to documentation. | Thomas Pulzer | 2016-07-05 | 1 | -1/+1 |
| | | * | Changed the creation of the update notification link to generate the js objec... | Thomas Pulzer | 2016-07-04 | 1 | -1/+1 |
| | * | | Merge pull request #306 from nextcloud/sidebar-preview-text | Marius Blüm | 2016-07-04 | 5 | -87/+193 |
| | |\ \ | |||||
| | | * | | for text use max-height to trim whitespace | Morris Jobke | 2016-07-04 | 1 | -1/+1 |
| | | * | | adjust padding of text preview | Morris Jobke | 2016-07-04 | 1 | -2/+3 |
| | | * | | Add large sidebar previews for text files | Robin Appelman | 2016-07-04 | 4 | -10/+83 |
| | | * | | Factor out handling sidebar previews | Robin Appelman | 2016-07-04 | 3 | -81/+113 |
| | * | | | Merge pull request #296 from ayamshanov/add_fb2_mimetype | Lukas Reschke | 2016-07-04 | 2 | -0/+2 |
| | |\ \ \ | | |_|/ | |/| | | |||||
| | | * | | Add mimetype for fb2-extension | Alexander Yamshanov | 2016-07-03 | 2 | -0/+2 |
| | * | | | Merge pull request #305 from Faldon/master | Lukas Reschke | 2016-07-04 | 12 | -19/+19 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'master' of https://github.com/nextcloud/server | Thomas Pulzer | 2016-07-04 | 2 | -5/+23 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | | Changed name of default logfile from owncloud.log to nextcloud.log. | Thomas Pulzer | 2016-07-04 | 12 | -19/+19 |
| | * | | | | Merge pull request #284 from nextcloud/cleanup-after-sync | Morris Jobke | 2016-07-04 | 1 | -4/+2 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | | * | | | we don't need to check permissions twice | Bjoern Schiessle | 2016-07-04 | 1 | -4/+2 |
| | | | |/ | | |/| | |||||
| | * | | | Merge pull request #303 from nextcloud/collapse-logs-in-github-issue-template | Morris Jobke | 2016-07-04 | 1 | -1/+22 |
| | |\ \ \ | |||||
| | | * | | | Fix summary | Morris Jobke | 2016-07-04 | 1 | -2/+2 |
| | | * | | | Collapse logs and lists with HTML5 support of github | Joas Schilling | 2016-07-04 | 1 | -1/+22 |
| | | | |/ | | |/| | |||||
| | * | | | Merge pull request #299 from nextcloud/master-use-parameterized-query | Morris Jobke | 2016-07-04 | 1 | -4/+1 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | [master] Use paramterized parameter for \OC\SystemTag\SystemTagManager | Lukas Reschke | 2016-07-03 | 1 | -4/+1 |
| | | |/ | |||||
| | * | | Merge pull request #290 from nextcloud/update-transifex-link | Morris Jobke | 2016-07-04 | 1 | -1/+1 |
| | |\ \ | | |/ | |/| | |||||
| | | * | We have our own Transifex org now ;) | Marius Blüm | 2016-07-02 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge pull request #275 from nextcloud/master-sync-upstream | Björn Schießle | 2016-07-01 | 202 | -227/+3213 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-07-01 | 202 | -227/+3213 |
| | | |\ | |||||
| | * | \ | Merge pull request #281 from nextcloud/update-3rdparty-master | Björn Schießle | 2016-07-01 | 1 | -0/+0 |
| | |\ \ \ | |||||
| | | * | | | update to 3rdparty master | Morris Jobke | 2016-07-01 | 1 | -0/+0 |
| | | |/ / | |||||
| | * | | | Merge pull request #278 from nextcloud/master-traversal-directory-js | Björn Schießle | 2016-07-01 | 2 | -2/+15 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Match on 405 | Lukas Reschke | 2016-07-01 | 2 | -1/+6 |
| | | * | | Match for /../ | Lukas Reschke | 2016-07-01 | 2 | -1/+5 |
| | | * | | Do not allow directory traversal using "../" | Lukas Reschke | 2016-07-01 | 2 | -1/+5 |
| | |/ / | |||||
| | * | | Merge pull request #255 from nextcloud/dav-permission-check | Björn Schießle | 2016-06-30 | 4 | -3/+96 |
| | |\ \ | |||||
| | | * | | fix error message | Bjoern Schiessle | 2016-06-30 | 1 | -1/+1 |
| | | * | | Fix tests | Lukas Reschke | 2016-06-30 | 1 | -0/+20 |
| | | * | | Add proper throws PHP docs | Lukas Reschke | 2016-06-30 | 1 | -2/+13 |
| | | * | | Add required $message parameter | Lukas Reschke | 2016-06-30 | 1 | -2/+2 |
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |