summaryrefslogtreecommitdiffstats
Commit message (Expand)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 disabledChristoph Wurst2019-03-205-65/+93
|/
* Merge pull request #14674 from CamilionEU/masterMorris Jobke2019-03-201-4/+3
|\
| * [app:files] Use current directory for hashing.Evilham2019-03-131-4/+3
* | Merge pull request #14691 from nextcloud/rename-mountpoint-within-mountpointRoeland Jago Douma2019-03-201-11/+6
|\ \
| * | always allow moving mountpoints inside the same mountpointRobin Appelman2019-03-191-11/+6
* | | [tx-robot] updated from transifexNextcloud bot2019-03-2036-64/+78
* | | Merge pull request #14664 from nextcloud/bugfix/noid/absolute-paths-of-images...Roeland Jago Douma2019-03-1928-200/+695
|\ \ \
| * | | Return 200 instead of 404 when asking for collections of a resourceJoas Schilling2019-03-191-1/+1
| * | | Bump bundlesJulius Härtl2019-03-1912-11/+599
| * | | Bump nextcloud-vue-collectionsJulius Härtl2019-03-192-8/+14
| * | | Adjust gitattributes to ignore all files_sharing scripts in diffJulius Härtl2019-03-191-2/+2
| * | | Adjust resource type to fileJulius Härtl2019-03-193-3/+2
| * | | Dispatch event to allow apps to load their script for collectionsJulius Härtl2019-03-195-17/+26
| * | | Use rich objects instead of name, link and iconJoas Schilling2019-03-196-161/+49
| * | | Replace the icon-class with an absolute link to an imageJoas Schilling2019-03-196-16/+21
* | | | Merge pull request #14747 from nextcloud/fix/access_list_external_storageMorris Jobke2019-03-191-1/+7
|\ \ \ \
| * | | | Fix getting the access list on external storageRoeland Jago Douma2019-03-191-1/+7
| |/ / /
* | | | Merge pull request #14744 from nextcloud/bugfix/noid/fix-push-notifications-f...Christoph Wurst2019-03-191-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Always register the NotifierJoas Schilling2019-03-191-5/+5
| |/ /
* | | Merge pull request #14739 from nextcloud/bugfix/noid/header-link-navigation-s...Roeland Jago Douma2019-03-192-2/+3
|\ \ \ | |/ / |/| |
| * | Also style the "too many apps" menuJoas Schilling2019-03-191-0/+1
| * | Style of navigation links in header is too catchyJoas Schilling2019-03-182-2/+2
* | | Merge pull request #14571 from cowai/optimize-files_external-notifyMorris Jobke2019-03-191-15/+40
|\ \ \
| * | | Use two queries to mark parent as outdatedAri Selseng2019-03-181-15/+40
* | | | [tx-robot] updated from transifexNextcloud bot2019-03-19184-410/+562
* | | | Merge pull request #14737 from nextcloud/improve-starting-speed-of-acceptance...Roeland Jago Douma2019-03-181-1/+12
|\ \ \ \
| * | | | Improve startup speed of acceptance testsJoas Schilling2019-03-181-1/+12
| | |/ / | |/| |
* | | | Merge pull request #14736 from nextcloud/fix/do_not_load_showpasswordMorris Jobke2019-03-183-5/+0
|\ \ \ \
| * | | | Fix showpassword loadsRoeland Jago Douma2019-03-183-5/+0
* | | | | Merge pull request #14724 from nextcloud/enh/nonce_for_iframesMorris Jobke2019-03-181-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | CSP: set nonce for iframesRoeland Jago Douma2019-03-161-1/+5
* | | | | Merge pull request #14666 from nextcloud/design/settings-headerMorris Jobke2019-03-183-2/+23
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adjust acceptance testsMorris Jobke2019-03-182-1/+20
| * | | | Don't show 'Personal' header in settings when Admin section is not thereJan-Christoph Borchardt2019-03-171-1/+3
* | | | | Merge pull request #14721 from nextcloud/fix/14639/trash_delete_permRoeland Jago Douma2019-03-183-4/+4
|\ \ \ \ \
| * | | | | Trashbin: Delete => Delete permanentlyRoeland Jago Douma2019-03-163-4/+4
* | | | | | Merge pull request #14719 from nextcloud/fix/14639/fix_preview_size_trashRoeland Jago Douma2019-03-181-2/+2
|\ \ \ \ \ \
| * | | | | | Use higher preview resolution in trashbinRoeland Jago Douma2019-03-161-2/+2
| |/ / / / /
* | / / / / [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
|\ \ \ \
| * | | | Removed radio and shadow on activeJohn Molakvoæ (skjnldsv)2019-03-151-1/+9
| * | | | remove dangling spaceRobin Appelman2019-03-121-1/+1
| * | | | fix database select styling in setup pageRobin Appelman2019-03-121-3/+0
* | | | | Merge pull request #14705 from nextcloud/deprecate/marked-escapeHTML-formatDa...Roeland Jago Douma2019-03-153-20/+36
|\ \ \ \ \
| * | | | | Deprecate marked, escapeHTML, formatDate, getURLParameter, humanFileSize, rel...John Molakvoæ (skjnldsv)2019-03-153-20/+36
| | |/ / / | |/| | |
* | | | | Merge pull request #14689 from nextcloud/rename-moveable-mount-readonly-parentRoeland Jago Douma2019-03-151-1/+9
|\ \ \ \ \