summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Where is your data?"Roeland Jago Douma2019-03-2021-766/+180
|
* Merge pull request #14713 from nextcloud/fix/admin-2fa-collapse-disableMorris Jobke2019-03-205-65/+93
|\ | | | | Collapse 2FA admin detail settings if disabled
| * Collapse 2FA admin detail settings if disabledChristoph Wurst2019-03-205-65/+93
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #14674 from CamilionEU/masterMorris Jobke2019-03-201-4/+3
|\ | | | | [app:files] Use current directory for hashing.
| * [app:files] Use current directory for hashing.Evilham2019-03-131-4/+3
| | | | | | | | | | | | | | | | | | | | This fixes collisions that were causing uploads to break in a very terrible way. Kudos to @kesselb for finding the problematic place and to @hottwister for the proposed solution. Fixes #10527.
* | Merge pull request #14691 from nextcloud/rename-mountpoint-within-mountpointRoeland Jago Douma2019-03-201-11/+6
|\ \ | | | | | | always allow moving mountpoints inside the same mountpoint
| * | always allow moving mountpoints inside the same mountpointRobin Appelman2019-03-191-11/+6
| | | | | | | | | | | | | | | | | | even if that mountpoint isn't normally a valid target for moving mounts into Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2019-03-2036-64/+78
| | |
* | | Merge pull request #14664 from ↵Roeland Jago Douma2019-03-1928-200/+695
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/absolute-paths-of-images-for-linked-collaboration-resources Replace the icon-class with an absolute link to an image
| * | | Return 200 instead of 404 when asking for collections of a resourceJoas Schilling2019-03-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Bump bundlesJulius Härtl2019-03-1912-11/+599
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Bump nextcloud-vue-collectionsJulius Härtl2019-03-192-8/+14
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Adjust gitattributes to ignore all files_sharing scripts in diffJulius Härtl2019-03-191-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Adjust resource type to fileJulius Härtl2019-03-193-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Dispatch event to allow apps to load their script for collectionsJulius Härtl2019-03-195-17/+26
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Use rich objects instead of name, link and iconJoas Schilling2019-03-196-161/+49
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Replace the icon-class with an absolute link to an imageJoas Schilling2019-03-196-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise the icon can not be displayed in mobile apps Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #14747 from nextcloud/fix/access_list_external_storageMorris Jobke2019-03-191-1/+7
|\ \ \ \ | | | | | | | | | | Fix getting the access list on external storage
| * | | | Fix getting the access list on external storageRoeland Jago Douma2019-03-191-1/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | If a file is on external storage there is no owner. WHich means we can't check. So just return an empty array then. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #14744 from ↵Christoph Wurst2019-03-191-5/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/bugfix/noid/fix-push-notifications-for-updatenotifications Always register the Notifier
| * | | Always register the NotifierJoas Schilling2019-03-191-5/+5
| |/ / | | | | | | | | | | | | | | | ... so background jobs without a user can prepare push notifications Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #14739 from ↵Roeland Jago Douma2019-03-192-2/+3
|\ \ \ | |/ / |/| | | | | | | | nextcloud/bugfix/noid/header-link-navigation-style-is-too-catchy Style of navigation links in header is too catchy
| * | Also style the "too many apps" menuJoas Schilling2019-03-191-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Style of navigation links in header is too catchyJoas Schilling2019-03-182-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #14571 from cowai/optimize-files_external-notifyMorris Jobke2019-03-191-15/+40
|\ \ \ | | | | | | | | Use index to mark parent as outdated, fixes: #14537
| * | | Use two queries to mark parent as outdatedAri Selseng2019-03-181-15/+40
| | | | | | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
* | | | [tx-robot] updated from transifexNextcloud bot2019-03-19184-410/+562
| | | |
* | | | Merge pull request #14737 from ↵Roeland Jago Douma2019-03-181-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/improve-starting-speed-of-acceptance-tests Improve startup speed of acceptance tests
| * | | | Improve startup speed of acceptance testsJoas Schilling2019-03-181-1/+12
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #14736 from nextcloud/fix/do_not_load_showpasswordMorris Jobke2019-03-183-5/+0
|\ \ \ \ | | | | | | | | | | Fix showpassword loads
| * | | | Fix showpassword loadsRoeland Jago Douma2019-03-183-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is bundled by default. So trying to load it throws a warning in the logs. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #14724 from nextcloud/enh/nonce_for_iframesMorris Jobke2019-03-181-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | CSP: set nonce for iframes
| * | | | CSP: set nonce for iframesRoeland Jago Douma2019-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This for now uses the jsNonce. That way we can easily backport it. For 17 I will fix it properly. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #14666 from nextcloud/design/settings-headerMorris Jobke2019-03-183-2/+23
|\ \ \ \ \ | |_|/ / / |/| | | | Don't show 'Personal' header in settings when Admin section is not there
| * | | | Adjust acceptance testsMorris Jobke2019-03-182-1/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Don't show 'Personal' header in settings when Admin section is not thereJan-Christoph Borchardt2019-03-171-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #14721 from nextcloud/fix/14639/trash_delete_permRoeland Jago Douma2019-03-183-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Trashbin: Delete => Delete permanently
| * | | | | Trashbin: Delete => Delete permanentlyRoeland Jago Douma2019-03-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #14639 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #14719 from nextcloud/fix/14639/fix_preview_size_trashRoeland Jago Douma2019-03-181-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use higher preview resolution in trashbin
| * | | | | | Use higher preview resolution in trashbinRoeland Jago Douma2019-03-161-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #14639 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | / / / / [tx-robot] updated from transifexNextcloud bot2019-03-1826-82/+194
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2019-03-1736-80/+380
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2019-03-1672-160/+474
| | | |
* | | | Merge pull request #14643 from nextcloud/setup-page-db-selectRoeland Jago Douma2019-03-152-5/+10
|\ \ \ \ | | | | | | | | | | fix database select styling in setup page
| * | | | Removed radio and shadow on activeJohn Molakvoæ (skjnldsv)2019-03-151-1/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | remove dangling spaceRobin Appelman2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | fix database select styling in setup pageRobin Appelman2019-03-121-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #14705 from ↵Roeland Jago Douma2019-03-153-20/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/deprecate/marked-escapeHTML-formatDate-getURLParameter-humanFileSize-relative_modified_date-select2 Deprecate marked, escapeHTML, formatDate, getURLParameter, humanFileS…
| * | | | | Deprecate marked, escapeHTML, formatDate, getURLParameter, humanFileSize, ↵John Molakvoæ (skjnldsv)2019-03-153-20/+36
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | relative_modified_date and select2 Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #14689 from nextcloud/rename-moveable-mount-readonly-parentRoeland Jago Douma2019-03-151-1/+9
|\ \ \ \ \ | | | | | | | | | | | | allow renaming the root of a movable mount even if the parent folder …
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 10:28:21 +0000