summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* use path instead of text inside desktop app badgeHendrik Leppelsack2016-02-051-2/+32
|
* update google play and apple badgeHendrik Leppelsack2016-02-053-0/+129
|
* fix font in desktopapp.svgHendrik Leppelsack2016-02-051-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-052-2/+8
|
* Merge pull request #22133 from owncloud/add-check-for-contentThomas Müller2016-02-041-1/+1
|\ | | | | Add check for content
| * Add check for contentLukas Reschke2016-02-041-1/+1
| | | | | | | | | | | | The response may be a redirect which is always followed by jQuery. Thus leading to false positives depending on the server configuration (e.g. when it issues a 302) To prevent that there is also a check performed on the response content.
* | Merge pull request #22130 from owncloud/fix-jsunit-filesclientThomas Müller2016-02-042-148/+142
|\ \ | | | | | | Fix jsunit filesclient
| * | Fix JS DAV files client unit testsVincent Petry2016-02-041-146/+140
| | | | | | | | | | | | | | | Instead of trying to mock the promise, just stub davclient.js' request object.
| * | Small fixes in Dav files clientVincent Petry2016-02-041-2/+2
| |/ | | | | | | | | Remove double leading slash in path. Add utf-8 in default content type.
* | Merge pull request #21766 from farukuzun/masterThomas Müller2016-02-041-0/+4
|\ \ | | | | | | Add some mimetypes
| * | Introduce some mimetypes for richdocumentsFaruk Uzun2016-02-041-0/+4
| |/ | | | | | | | | | | | | * application/vnd.lotus-wordpro * application/vnd.visio * application/vnd.wordperfect * application/msonenote
* | Merge pull request #22111 from owncloud/use-intermediate-certificateThomas Müller2016-02-041-4/+6
|\ \ | |/ |/| Use intermediate root authority + sign other release channels
| * Allow specifing the signing pathLukas Reschke2016-02-031-4/+6
| |
* | Merge pull request #22103 from ErikPel/tag-css-fixThomas Müller2016-02-041-1/+7
|\ \ | | | | | | Fixes #22097
| * | Fixes #22097Erik Pellikka2016-02-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Updated with more specific css selector Moved the curly brace to the same line as the selector firefox fix
| * | Revert "setting to skip migration tests by default"Morris Jobke2016-02-032-12/+0
| | |
* | | Merge pull request #22101 from owncloud/comments-filerowThomas Müller2016-02-032-0/+4
|\ \ \ | |_|/ |/| | Add file row indicator for unread comments
| * | Add file row indicator for unread commentsVincent Petry2016-02-032-0/+4
| |/
| * Merge pull request #22090 from owncloud/skip-migration-tests-settingThomas Müller2016-02-032-0/+12
| |\ | | | | | | setting to skip migration tests by default
| | * setting to skip migration tests by defaultMorris Jobke2016-02-032-0/+12
| | | | | | | | | | | | | | | | | | | | | * if you install owncloud via package it is not possible to skip migration tests * this also allows to disable migration tests for an instance by default
* | | Merge pull request #22086 from RealRancor/RealRancor-patch-1Thomas Müller2016-02-031-1/+0
|\ \ \ | | | | | | | | Remove files_locking from shipped.json
| * | | Remove files_locking from shipped.jsonRealRancor2016-02-031-1/+0
| |/ /
* / / host and hostname are different thingsRoeland Jago Douma2016-02-031-2/+19
|/ / | | | | | | | | | | | | | | | | | | host can contain the port (host of http://example.com:1234 is example.com:1234) while hostname never contains a port. They can however be similar. If you navigate to http://example.com then both host and hostname will be example.com. * Fixed docs * added getHostName function
* | Merge pull request #21961 from owncloud/comments-guiThomas Müller2016-02-035-23/+67
|\ \ | |/ |/| Comments GUI in files sidebar
| * Fix parsing empty Webdav property nodesVincent Petry2016-02-022-2/+2
| | | | | | | | Return empty string instead of undefined
| * Expose display name in JS sideVincent Petry2016-02-022-1/+33
| | | | | | | | | | Adds a new method `OC.getCurrentUser` to get both the user id and display name Could be used for a future Js
| * Add pagination support for comments GUIVincent Petry2016-02-022-20/+31
| |
| * Comments GUIVincent Petry2016-02-021-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-032-4/+4
|/
* Merge pull request #22054 from vincchan/vincchan/fix#20199Thomas Müller2016-02-023-27/+79
|\ | | | | Move data protection check to javascript
| * changed variables to lowercaseVincent Chan2016-02-021-5/+5
| |
| * Move data protection check to javascriptVincent Chan2016-02-013-27/+79
| | | | | | | | fixes #20199
* | Merge pull request #22023 from owncloud/interruptable-commandsThomas Müller2016-02-021-0/+38
|\ \ | | | | | | Interruptable commands
| * | Move signal handling to the base class to allow other commands to reuse this ↵Thomas Müller2016-02-011-0/+38
| | | | | | | | | | | | feature
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-024-0/+20
| |/ |/|
* | Merge pull request #21953 from owncloud/make-enable_avatars-more-robustThomas Müller2016-02-011-1/+1
|\ \ | | | | | | Make enable_avatars setting more robust
| * | Make enable_avatars setting more robustMorris Jobke2016-01-271-1/+1
| | | | | | | | | | | | | | | * handles the setting in the same way everywhere * fixes #21949
* | | Merge pull request #22034 from matthias-g/patch-1Thomas Müller2016-02-011-2/+2
|\ \ \ | |_|/ |/| | Update explanation in comment of how to enable the debug mode
| * | Update explanation of how to enable debug modematthias-g2016-01-301-2/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3118-2/+134
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3012-0/+26
| |
* | Merge pull request #21992 from owncloud/share-dialog-error-handlingThomas Müller2016-01-292-7/+158
|\ \ | | | | | | Properly forward error messages in share dialog
| * | Properly forward error messages in share dialogVincent Petry2016-01-282-7/+158
| | |
* | | Merge pull request #21981 from owncloud/systemtags-trim-nameThomas Müller2016-01-291-5/+6
|\ \ \ | | | | | | | | Trim tag names to avoid problems
| * | | Trim tag names to avoid problemsJoas Schilling2016-01-281-5/+6
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-01-29130-326/+28
|/ /
* | Fix share default expiration date calculationVincent Petry2016-01-282-9/+8
| | | | | | | | Now using UTC dates with moment js to accurately add the number of days
* | Share dialog use OCS APIVincent Petry2016-01-288-537/+611
| |
* | Merge pull request #21958 from owncloud/systemtags-styleThomas Müller2016-01-285-25/+46
|\ \ | | | | | | Use boxes for system tags, shorten permission text
| * | Use boxes for system tags, shorten permission textVincent Petry2016-01-285-25/+46
| |/ | | | | | | | | | | | | | | Permission text now doesn't appear when all permissions are there, or shows as "invisible" or "not assignable", which should better cover all use cases. Changed select2 style to use boxes in the input field.