summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-07-2462-112/+484
* Merge pull request #5713 from nextcloud/datepicker-redesignMarius Blüm2017-07-236-4/+85
|\
| * Fix font-weight for datepicker title.Marin Treselj2017-07-231-1/+1
| * Make weekday names brighter, lighter month/year title.Marin Treselj2017-07-231-1/+3
| * Make dates slightly larger and perfectly rounded.Marin Treselj2017-07-231-29/+21
| * Remove deprecationMarin Treselj2017-07-231-2/+1
| * Add padding to popoverMarin Treselj2017-07-231-0/+1
| * Fixes issues mentioned in comments.Marin Treselj2017-07-232-15/+19
| * Redesign jQuery UI datepickerMarin Treselj2017-07-236-4/+87
* | Merge pull request #5840 from nextcloud/phpstorm_inspectMorris Jobke2017-07-2313-181/+179
|\ \ | |/ |/|
| * Some phpstorm inspection fixesRoeland Jago Douma2017-07-2213-181/+179
* | [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 strlenArtem Kochnev2017-07-201-1/+1
* | Merge pull request #5827 from nextcloud/improve-public-share-headerMorris Jobke2017-07-222-4/+16
|\ \
| * | Add filename and sharer in public pageMorris Jobke2017-07-212-4/+16
* | | [tx-robot] updated from transifexNextcloud bot2017-07-2256-4/+162
* | | Merge pull request #5596 from nextcloud/mount-renameMorris Jobke2017-07-212-11/+14
|\ \ \
| * | | fix parsing of dav permissionsRobin Appelman2017-07-171-3/+2
| * | | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
* | | | Merge pull request #5823 from nextcloud/improve-error-handlingMorris Jobke2017-07-213-13/+22
|\ \ \ \
| * | | | use OCSv2 to make sure that the error also arrives at the web front-endBjoern Schiessle2017-07-211-2/+2
| * | | | improved error handlingBjoern Schiessle2017-07-212-11/+20
* | | | | Merge pull request #5785 from nextcloud/path-repair-steps-storageMorris Jobke2017-07-213-5/+42
|\ \ \ \ \
| * | | | | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-213-5/+42
| | |_|/ / | |/| | |
* | | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domainLukas Reschke2017-07-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
* | | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixesRoeland Jago Douma2017-07-214-4/+4
|\ \ \ \ \
| * | | | | Minor typosMarcel Waldvogel2017-07-213-3/+3
| * | | | | The app password avoids 1Il etc. Adapted comment accordinglyMarcel Waldvogel2017-07-211-1/+1
* | | | | | 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 remoteRobin Appelman2017-07-171-2/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5795 from nextcloud/ci-for-archive-tarRoeland Jago Douma2017-07-211-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Adjust third-party refLukas Reschke2017-07-211-0/+0
* | | | | | Merge pull request #5802 from nextcloud/rm_dep_controller_functionsLukas Reschke2017-07-212-174/+1
|\ \ \ \ \ \
| * | | | | | Remove deprecated Controller FunctionsRoeland Jago Douma2017-07-202-174/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5818 from nextcloud/ocs_privatedataRoeland Jago Douma2017-07-218-455/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | PrivateData to appRoeland Jago Douma2017-07-218-455/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5803 from nextcloud/fix-public-linksMorris Jobke2017-07-211-1/+3
|\ \ \ \ \
| * | | | | fix preview for public linksBjoern Schiessle2017-07-201-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelfMorris Jobke2017-07-214-0/+103
|\ \ \ \ \
| * | | | | Emit hook postUnshareFromSelf when the recipient of a share unshares itPauli Järvinen2017-07-204-0/+103
* | | | | | Merge pull request #5819 from benediktg/add-mastdon-linkMorris Jobke2017-07-211-0/+1
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Exclude build/.phan/ from PHP 5.6 syntax checkLukas Reschke2017-07-201-1/+1
| * | | | | | Add Phan plugin to check for SQL injectionsLukas Reschke2017-07-2023-0/+310
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-21350-1080/+460
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #5629 from nextcloud/add-recovery-key-on-public-uploadBjörn Schießle2017-07-201-2/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | make sure that we always have a ownerBjoern Schiessle2017-07-201-4/+17