Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use path instead of text inside desktop app badge | Hendrik Leppelsack | 2016-02-05 | 1 | -2/+32 |
| | |||||
* | update google play and apple badge | Hendrik Leppelsack | 2016-02-05 | 3 | -0/+129 |
| | |||||
* | fix font in desktopapp.svg | Hendrik Leppelsack | 2016-02-05 | 1 | -2/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-05 | 2 | -2/+8 |
| | |||||
* | Merge pull request #22133 from owncloud/add-check-for-content | Thomas Müller | 2016-02-04 | 1 | -1/+1 |
|\ | | | | | Add check for content | ||||
| * | Add check for content | Lukas Reschke | 2016-02-04 | 1 | -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-filesclient | Thomas Müller | 2016-02-04 | 2 | -148/+142 |
|\ \ | | | | | | | Fix jsunit filesclient | ||||
| * | | Fix JS DAV files client unit tests | Vincent Petry | 2016-02-04 | 1 | -146/+140 |
| | | | | | | | | | | | | | | | Instead of trying to mock the promise, just stub davclient.js' request object. | ||||
| * | | Small fixes in Dav files client | Vincent Petry | 2016-02-04 | 1 | -2/+2 |
| |/ | | | | | | | | | Remove double leading slash in path. Add utf-8 in default content type. | ||||
* | | Merge pull request #21766 from farukuzun/master | Thomas Müller | 2016-02-04 | 1 | -0/+4 |
|\ \ | | | | | | | Add some mimetypes | ||||
| * | | Introduce some mimetypes for richdocuments | Faruk Uzun | 2016-02-04 | 1 | -0/+4 |
| |/ | | | | | | | | | | | | | * application/vnd.lotus-wordpro * application/vnd.visio * application/vnd.wordperfect * application/msonenote | ||||
* | | Merge pull request #22111 from owncloud/use-intermediate-certificate | Thomas Müller | 2016-02-04 | 1 | -4/+6 |
|\ \ | |/ |/| | Use intermediate root authority + sign other release channels | ||||
| * | Allow specifing the signing path | Lukas Reschke | 2016-02-03 | 1 | -4/+6 |
| | | |||||
* | | Merge pull request #22103 from ErikPel/tag-css-fix | Thomas Müller | 2016-02-04 | 1 | -1/+7 |
|\ \ | | | | | | | Fixes #22097 | ||||
| * | | Fixes #22097 | Erik Pellikka | 2016-02-03 | 1 | -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 Jobke | 2016-02-03 | 2 | -12/+0 |
| | | | |||||
* | | | Merge pull request #22101 from owncloud/comments-filerow | Thomas Müller | 2016-02-03 | 2 | -0/+4 |
|\ \ \ | |_|/ |/| | | Add file row indicator for unread comments | ||||
| * | | Add file row indicator for unread comments | Vincent Petry | 2016-02-03 | 2 | -0/+4 |
| |/ | |||||
| * | Merge pull request #22090 from owncloud/skip-migration-tests-setting | Thomas Müller | 2016-02-03 | 2 | -0/+12 |
| |\ | | | | | | | setting to skip migration tests by default | ||||
| | * | setting to skip migration tests by default | Morris Jobke | 2016-02-03 | 2 | -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-1 | Thomas Müller | 2016-02-03 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Remove files_locking from shipped.json | ||||
| * | | | Remove files_locking from shipped.json | RealRancor | 2016-02-03 | 1 | -1/+0 |
| |/ / | |||||
* / / | host and hostname are different things | Roeland Jago Douma | 2016-02-03 | 1 | -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-gui | Thomas Müller | 2016-02-03 | 5 | -23/+67 |
|\ \ | |/ |/| | Comments GUI in files sidebar | ||||
| * | Fix parsing empty Webdav property nodes | Vincent Petry | 2016-02-02 | 2 | -2/+2 |
| | | | | | | | | Return empty string instead of undefined | ||||
| * | Expose display name in JS side | Vincent Petry | 2016-02-02 | 2 | -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 GUI | Vincent Petry | 2016-02-02 | 2 | -20/+31 |
| | | |||||
| * | Comments GUI | Vincent Petry | 2016-02-02 | 1 | -0/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-03 | 2 | -4/+4 |
|/ | |||||
* | Merge pull request #22054 from vincchan/vincchan/fix#20199 | Thomas Müller | 2016-02-02 | 3 | -27/+79 |
|\ | | | | | Move data protection check to javascript | ||||
| * | changed variables to lowercase | Vincent Chan | 2016-02-02 | 1 | -5/+5 |
| | | |||||
| * | Move data protection check to javascript | Vincent Chan | 2016-02-01 | 3 | -27/+79 |
| | | | | | | | | fixes #20199 | ||||
* | | Merge pull request #22023 from owncloud/interruptable-commands | Thomas Müller | 2016-02-02 | 1 | -0/+38 |
|\ \ | | | | | | | Interruptable commands | ||||
| * | | Move signal handling to the base class to allow other commands to reuse this ↵ | Thomas Müller | 2016-02-01 | 1 | -0/+38 |
| | | | | | | | | | | | | feature | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-02 | 4 | -0/+20 |
| |/ |/| | |||||
* | | Merge pull request #21953 from owncloud/make-enable_avatars-more-robust | Thomas Müller | 2016-02-01 | 1 | -1/+1 |
|\ \ | | | | | | | Make enable_avatars setting more robust | ||||
| * | | Make enable_avatars setting more robust | Morris Jobke | 2016-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * handles the setting in the same way everywhere * fixes #21949 | ||||
* | | | Merge pull request #22034 from matthias-g/patch-1 | Thomas Müller | 2016-02-01 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | Update explanation in comment of how to enable the debug mode | ||||
| * | | Update explanation of how to enable debug mode | matthias-g | 2016-01-30 | 1 | -2/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-31 | 18 | -2/+134 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-30 | 12 | -0/+26 |
| | | |||||
* | | Merge pull request #21992 from owncloud/share-dialog-error-handling | Thomas Müller | 2016-01-29 | 2 | -7/+158 |
|\ \ | | | | | | | Properly forward error messages in share dialog | ||||
| * | | Properly forward error messages in share dialog | Vincent Petry | 2016-01-28 | 2 | -7/+158 |
| | | | |||||
* | | | Merge pull request #21981 from owncloud/systemtags-trim-name | Thomas Müller | 2016-01-29 | 1 | -5/+6 |
|\ \ \ | | | | | | | | | Trim tag names to avoid problems | ||||
| * | | | Trim tag names to avoid problems | Joas Schilling | 2016-01-28 | 1 | -5/+6 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-29 | 130 | -326/+28 |
|/ / | |||||
* | | Fix share default expiration date calculation | Vincent Petry | 2016-01-28 | 2 | -9/+8 |
| | | | | | | | | Now using UTC dates with moment js to accurately add the number of days | ||||
* | | Share dialog use OCS API | Vincent Petry | 2016-01-28 | 8 | -537/+611 |
| | | |||||
* | | Merge pull request #21958 from owncloud/systemtags-style | Thomas Müller | 2016-01-28 | 5 | -25/+46 |
|\ \ | | | | | | | Use boxes for system tags, shorten permission text | ||||
| * | | Use boxes for system tags, shorten permission text | Vincent Petry | 2016-01-28 | 5 | -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. |