Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | ||||
| * | Fix docker image naming issue for CI | Morris Jobke | 2016-07-06 | 1 | -11/+12 |
| | | | | | | | | | | * wrongly named PHP7 - it is PHP 5.6 * moved integration tests at the very end | ||||
* | | Merge pull request #319 from nextcloud/config-sample | Roeland Douma | 2016-07-06 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix config sample text | ||||
| * | 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 |
|\ | | | | | Update system tags icon | ||||
| * | Replace tag svg with optimized version | Bugsbane | 2016-07-05 | 1 | -79/+3 |
| | | | | | | Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour) | ||||
| * | 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 |
|/ | | | Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG. | ||||
* | Merge pull request #309 from Faldon/master | Björn Schießle | 2016-07-05 | 1 | -1/+1 |
|\ | | | | | Changed the creation of the update notification link | ||||
| * | 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 ↵ | Thomas Pulzer | 2016-07-04 | 1 | -1/+1 |
| | | | | | | | | object from concated string. | ||||
* | | Merge pull request #306 from nextcloud/sidebar-preview-text | Marius Blüm | 2016-07-04 | 5 | -87/+193 |
|\ \ | | | | | | | Add large sidebar previews for text files | ||||
| * | | 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 | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Changing name of default logfile | ||||
| * \ \ | 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 | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | Collapse logs and lists with HTML5 support of github | ||||
| * | | | 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 | ||||
| * | | [master] Use paramterized parameter for \OC\SystemTag\SystemTagManager | Lukas Reschke | 2016-07-03 | 1 | -4/+1 |
| |/ | | | | | | | $nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps. | ||||
* | | Merge pull request #290 from nextcloud/update-transifex-link | Morris Jobke | 2016-07-04 | 1 | -1/+1 |
|\ \ | |/ |/| | We have our own Transifex org now ;) | ||||
| * | 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 |
|\ | | | | | [Master] Sync upstream | ||||
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-07-01 | 202 | -227/+3213 |
| |\ | |||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-01 | 8 | -0/+126 |
| | | | |||||
| | * | Merge pull request #25304 from owncloud/local-karma | Vincent Petry | 2016-06-30 | 1 | -13/+1 |
| | |\ | | | | | | | | | Always use local karma | ||||
| | | * | always use local karma | Hendrik Leppelsack | 2016-06-29 | 1 | -13/+1 |
| | | | | |||||
| | * | | Merge pull request #25310 from owncloud/search-preventinfiniteloop | Vincent Petry | 2016-06-30 | 1 | -2/+5 |
| | |\ \ | | | | | | | | | | | Prevent infinite loop in search auto-nextpage | ||||
| | | * | | Prevent infinite loop in search auto-nextpage | Vincent Petry | 2016-06-30 | 1 | -2/+5 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading the next page of search results, make sure that the loop can end if there are no more elements in case the total doesn't match. Also added a check to avoid recomputing the search results whenever the setFilter() is called with the same value. This happens when navigating away to another folder, the search field gets cleared automatically and it calls FileList.setFilter(''). | ||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-30 | 8 | -2/+32 |
| | | | | |||||
| | * | | fix version string | Daniel Molkentin | 2016-06-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | 9.1.0 RC 1 | Daniel Molkentin | 2016-06-29 | 1 | -2/+2 |
| | | | | |||||
| | * | | Various database migration fixes (#25209) | Thomas Müller | 2016-06-29 | 12 | -4/+1692 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating * Adding schema migration tests to prevent unnecessary and non-sense migration steps Fix Oracle autoincrement and unsigned handling * Fix sqlite integer type for autoincrement * Use lower case table names - fixes pg * Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine | ||||
| | * | | Merge pull request #25288 from owncloud/fix-versionrevertperms | Vincent Petry | 2016-06-29 | 4 | -2/+78 |
| | |\ \ | | | | | | | | | | | Hide revert button when no permission to revert | ||||
| | | * | | Hide revert button when no permission to revert | Vincent Petry | 2016-06-28 | 4 | -2/+78 |
| | | | | | |||||
| | * | | | get only vcards which match both the address book id and the vcard uri (#25294) | Björn Schießle | 2016-06-29 | 2 | -1/+5 |
| | | | | | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-29 | 44 | -10/+486 |
| | |/ / | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-28 | 148 | -138/+686 |
| | | | | |||||
| | * | | Fix getting the certificate bundle for dav external storage (#25274) | Robin Appelman | 2016-06-27 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage | ||||
| | * | | Login hooks (#25260) | Christoph Wurst | 2016-06-27 | 2 | -41/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix login hooks * adjust user session tests * fix login return value of successful token logins * trigger preLogin hook earlier; extract method 'loginWithPassword' * call postLogin hook earlier; add PHPDoc | ||||
| | * | | handle unavailable fed shares while testing for availability (#25277) | Robin Appelman | 2016-06-27 | 2 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability |