aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 CI
| * Fix docker image naming issue for CIMorris Jobke2016-07-061-11/+12
| | | | | | | | | | * wrongly named PHP7 - it is PHP 5.6 * moved integration tests at the very end
* | Merge pull request #319 from nextcloud/config-sampleRoeland Douma2016-07-061-1/+1
|\ \ | |/ |/| Fix config sample text
| * Fix config sample textMorris Jobke2016-07-061-1/+1
|/
* Merge pull request #311 from Bugsbane/masterJoas Schilling2016-07-052-2/+2
|\ | | | | Update system tags icon
| * Replace tag svg with optimized versionBugsbane2016-07-051-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 functionBugsbane2016-07-050-0/+0
| |
| * Update system tags iconBugsbane2016-07-052-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/masterBjörn Schießle2016-07-051-1/+1
|\ | | | | Changed the creation of the update notification link
| * 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 ↵Thomas Pulzer2016-07-041-1/+1
| | | | | | | | object from concated string.
* | Merge pull request #306 from nextcloud/sidebar-preview-textMarius Blüm2016-07-045-87/+193
|\ \ | | | | | | Add large sidebar previews for text files
| * | 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-extension
| * | Add mimetype for fb2-extensionAlexander Yamshanov2016-07-032-0/+2
| | |
* | | Merge pull request #305 from Faldon/masterLukas Reschke2016-07-0412-19/+19
|\ \ \ | | | | | | | | Changing name of default logfile
| * \ \ 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 twice
| * | | 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
|\ \ \ | | | | | | | | Collapse logs and lists with HTML5 support of github
| * | | 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\SystemTagManager
| * | [master] Use paramterized parameter for \OC\SystemTag\SystemTagManagerLukas Reschke2016-07-031-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-linkMorris Jobke2016-07-041-1/+1
|\ \ | |/ |/| We have our own Transifex org now ;)
| * 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
|\ | | | | [Master] Sync upstream
| * 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 karma
| | | * 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-nextpage
| | | * | Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-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 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-versionrevertpermsVincent Petry2016-06-294-2/+78
| | |\ \ | | | | | | | | | | Hide revert button when no permission to revert
| | | * | Hide revert button when no permission to revertVincent Petry2016-06-284-2/+78
| | | | |
| | * | | get only vcards which match both the address book id and the vcard uri (#25294)Björn Schießle2016-06-292-1/+5
| | | | |
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2944-10/+486
| | |/ /
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-28148-138/+686
| | | |
| | * | Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-272-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage
| | * | Login hooks (#25260)Christoph Wurst2016-06-272-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 Appelman2016-06-272-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability