summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* More phpstorm inspection fixesRoeland Jago Douma2017-07-2429-99/+99
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #5846 from nextcloud/fix_3186Roeland Jago Douma2017-07-241-1/+1
|\ | | | | Move image-optimization.sh to build dir
| * Move image-optimization.sh to build dirRoeland Jago Douma2017-07-241-1/+1
|/ | | | | | * We should not ship this! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #5783 from nextcloud/outlook-max-widthRoeland Jago Douma2017-07-245-0/+18
|\ | | | | Set max-width of image to 100px in Outlook as well
| * Set max-width of image to 100px in Outlook as wellMorris Jobke2017-07-235-0/+18
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-07-2462-112/+484
| |
* | Merge pull request #5713 from nextcloud/datepicker-redesignMarius Blüm2017-07-236-4/+85
|\ \ | | | | | | Redesign jQuery UI datepicker
| * | Fix font-weight for datepicker title.Marin Treselj2017-07-231-1/+1
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Make weekday names brighter, lighter month/year title.Marin Treselj2017-07-231-1/+3
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Make dates slightly larger and perfectly rounded.Marin Treselj2017-07-231-29/+21
| | | | | | | | | | | | | | | | | | SCSS cleanup, fix fringe cases, add margin between dates, un-bold title. Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Remove deprecationMarin Treselj2017-07-231-2/+1
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Add padding to popoverMarin Treselj2017-07-231-0/+1
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Fixes issues mentioned in comments.Marin Treselj2017-07-232-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - [x] Highlight for selected date should be bold text. - [x] Hover highlight for day should be the same as for the selected date. - [x] Remove hover effect on the week. - [x] Row for days of the week should indeed stay, but non-bold and at 50% opacity so it doesn't take away the focus. - [x] Dates of previous and next months a bit lighter. - [x] Remove marking the weekend blue. - [x] The box centered below the date field, with triangle in the middle. Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Redesign jQuery UI datepickerMarin Treselj2017-07-236-4/+87
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | Merge pull request #5840 from nextcloud/phpstorm_inspectMorris Jobke2017-07-2313-181/+179
|\ \ \ | |/ / |/| | Some phpstorm inspection fixes
| * | Some phpstorm inspection fixesRoeland Jago Douma2017-07-2213-181/+179
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-2334-130/+356
|/ /
* | Merge pull request #5812 from MrJeos/masterMorris Jobke2017-07-221-1/+1
|\ \ | | | | | | Fix for mb strlen
| * | Fix for mb strlenArtem Kochnev2017-07-201-1/+1
| | | | | | | | | Error with moving files with long names in UTF-8
* | | Merge pull request #5827 from nextcloud/improve-public-share-headerMorris Jobke2017-07-222-4/+16
|\ \ \ | | | | | | | | Add filename and sharer in public page
| * | | Add filename and sharer in public pageMorris Jobke2017-07-212-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shows the filename and sharer on the public page * allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting * remove link on logo that redirects to login (fixes #5720) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-2256-4/+162
| | | |
* | | | Merge pull request #5596 from nextcloud/mount-renameMorris Jobke2017-07-212-11/+14
|\ \ \ \ | | | | | | | | | | Fix renaming of non-renamble mounts
| * | | | fix parsing of dav permissionsRobin Appelman2017-07-171-3/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #5823 from nextcloud/improve-error-handlingMorris Jobke2017-07-213-13/+22
|\ \ \ \ \ | | | | | | | | | | | | Improve error handling for accepting federated shares
| * | | | | use OCSv2 to make sure that the error also arrives at the web front-endBjoern Schiessle2017-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | improved error handlingBjoern Schiessle2017-07-212-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check if table was updated successfully and only then send a notification mail and return "true". Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #5785 from nextcloud/path-repair-steps-storageMorris Jobke2017-07-213-5/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | Also repair storage id's when repairing invalid entries
| * | | | | | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-213-5/+42
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domainLukas Reschke2017-07-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix error message on untrusted domain error page
| * | | | | Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5347 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixesRoeland Jago Douma2017-07-214-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Minor documentation fixes
| * | | | | | Minor typosMarcel Waldvogel2017-07-213-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
| * | | | | | The app password avoids 1Il etc. Adapted comment accordinglyMarcel Waldvogel2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
* | | | | | | Merge pull request #5753 from nextcloud/fed-unshare-fail-remoteRoeland Jago Douma2017-07-211-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | still remove the federated share even if we cant notify the remote
| * | | | | | | still remove the federated share even if we cant notify the remoteRobin Appelman2017-07-171-2/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #5795 from nextcloud/ci-for-archive-tarRoeland Jago Douma2017-07-211-0/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Adjust third-party ref
| * | | | | | Adjust third-party refLukas Reschke2017-07-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI commit for https://github.com/nextcloud/3rdparty/pull/59 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #5802 from nextcloud/rm_dep_controller_functionsLukas Reschke2017-07-212-174/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove deprecated Controller Functions
| * | | | | | | Remove deprecated Controller FunctionsRoeland Jago Douma2017-07-202-174/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #5818 from nextcloud/ocs_privatedataRoeland Jago Douma2017-07-218-455/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | PrivateData to app
| * | | | | | PrivateData to appRoeland Jago Douma2017-07-218-455/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PrivateData is an app now: https://github.com/nextcloud/privatedata * No need to load the OCS routes.php (as there is none!) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #5803 from nextcloud/fix-public-linksMorris Jobke2017-07-211-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix preview for public links
| * | | | | | fix preview for public linksBjoern Schiessle2017-07-201-1/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in case a user is already logged in on the same server from which the public link comes from, we need to setup the owners file system in order to show the preview Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelfMorris Jobke2017-07-214-0/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dispatch event postUnshareFromSelf when the recipient of a share unshares it
| * | | | | | Emit hook postUnshareFromSelf when the recipient of a share unshares itPauli Järvinen2017-07-204-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This kind of hook signal used to be emitted in the old Share library but it was missing from Share 2.0 Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
* | | | | | | Merge pull request #5819 from benediktg/add-mastdon-linkMorris Jobke2017-07-211-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add link to mastodon in readme
| * | | | | | | Add link to mastodon in readmeBenedikt Geissler2017-07-211-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #5817 from nextcloud/add-basic-sql-injection-checkerMorris Jobke2017-07-2123-1/+311
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add Phan plugin to check for SQL injections