summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4626 from nextcloud/adjust-shipped-jsonLukas Reschke2017-05-011-4/+0
|\ | | | | Remove apps delivered from the appstore
| * Remove apps delivered from the appstoreLukas Reschke2017-05-011-4/+0
| | | | | | | | | | | | | | | | | | | | Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature. Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore. Fixes https://github.com/nextcloud/server/issues/4605 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4615 from nextcloud/js-reduce-share.js-complexityLukas Reschke2017-05-011-87/+0
|\ \ | | | | | | Remove abandoned methods in OC.Share that refer to old API endpoints
| * | Remove unused methods from OC.ShareMorris Jobke2017-05-011-87/+0
| |/ | | | | | | | | | | | | * they do calls against core/ajax/share.php which doesn't exist anymore * also the methods are not called in any of our apps or any of the apps in the appstore Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4612 from nextcloud/js-fix-long-linesRoeland Jago Douma2017-05-012-2/+8
|\ \ | | | | | | Fix some long lines in JS - JSLinut recommendation
| * | Fix some long lines in JS - JSLinut recommendationMorris Jobke2017-05-012-2/+8
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4613 from nextcloud/remove-unusedRoeland Jago Douma2017-05-011-371/+0
|\ \ \ | | | | | | | | Remove unused JS file
| * | | Remove unused JS fileMorris Jobke2017-05-011-371/+0
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4599 from nextcloud/contactsmenu-mobileLukas Reschke2017-05-011-0/+1
|\ \ \ | | | | | | | | Define max-width for Contacts menu for mobile
| * | | Define max-width for Contacts menu for mobileJan-Christoph Borchardt2017-04-291-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4598 from nextcloud/menu-flashingLukas Reschke2017-05-011-2/+2
|\ \ \ \ | | | | | | | | | | Prevent flashing of apps and user menu on page load
| * | | | Prevent flashing of apps and user menuJan-Christoph Borchardt2017-04-291-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #4610 from nextcloud/js-semicolonsLukas Reschke2017-05-018-16/+16
|\ \ \ \ | | | | | | | | | | Fix semicolon at end of JS lines
| * | | | Fix semicolon at end of JS linesMorris Jobke2017-05-018-16/+16
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplateLukas Reschke2017-05-013-4/+6
|\ \ \ \ | | | | | | | | | | Fix variable definitions in oc dialogs
| * | | | Fix variable definitions in oc dialogsMorris Jobke2017-05-013-4/+6
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | / Fix variable definition in sharedialogview.jsMorris Jobke2017-05-011-7/+4
| |_|/ |/| | | | | | | | | | | | | | | | | * improves readability of conditional statements and fixes warning in JSLint for varibale definition Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-016-0/+34
| | |
* | | Make tooltip intransparentMorris Jobke2017-04-291-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4597 from nextcloud/tooltips-invertMorris Jobke2017-04-291-30/+31
|\ \ | |/ |/| Invert tooltip color to white, fix #4563
| * Invert tooltip color to white, fix #4563Jan-Christoph Borchardt2017-04-291-30/+31
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | optimize SVGsMorris Jobke2017-04-292-20/+4
| |
* | Implemented visual feedback if a user is disabled in admin user menu.Thomas Pulzer2017-04-292-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented visuals for enabling/disabling user from admin user list. Added the controller functions for enabling/disabling a user. Added the route for changing user status (enabled/disabled) and added an additional route handler in the user controller. Finished the visuals to reflect current user status and changed user status respectively. Changed the single icon for enabling/disabling a user into a menu where deletion and state toggling of a user is selectable. Added displaying of disabled user count. Improved style of user action menu. Added proper counting of disabled users. Removed visual indicator for disabled users. Moved pseudo-group detection for disabled users from frontend to the controller. Changed units for newly introduced css values from em to px. Removed unnecessary png and optimized svg with scour. Changed the userlist template to display the user action menu with correct width. Style fixes for better readability and coding style conformity. Changed the icons for enabling, disabling and deleting a user in the action menu.
* | Add verification iconsJan-Christoph Borchardt2017-04-283-0/+12
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-04-294-2/+56
| |
* | Invert new header icons on bright theming colorsJulius Härtl2017-04-281-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2017-04-284-20/+20
| |
* | Merge pull request #4521 from nextcloud/custom-mount-typesRoeland Jago Douma2017-04-281-1/+10
|\ \ | | | | | | allow apps to set custom mount types
| * | allow apps to set custom mount typesRobin Appelman2017-04-281-1/+10
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4574 from nextcloud/rename-extension-pointLukas Reschke2017-04-281-1/+1
|\ \ \ | | | | | | | | Rename extension point
| * | | Rename extension pointLukas Reschke2017-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To align with upstream. Fixes https://github.com/nextcloud/guests/issues/3 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Add sharing types for guestsLukas Reschke2017-04-281-0/+1
|/ / / | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/guests/issues/4 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4562 from nextcloud/contactmenu-second-tooltipJoas Schilling2017-04-281-1/+3
|\ \ \ | |/ / |/| | Show tooltip for second action in contacts menu
| * | Show tooltip for second action.Ivan Sein2017-04-271-1/+3
| |/ | | | | | | Signed-off-by: Ivan Sein <ivan@nextcloud.com>
* | Merge pull request #4570 from ↵Lukas Reschke2017-04-281-7/+3
|\ \ | | | | | | | | | | | | nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade Do not disable 3rdparty apps on occ upgrade
| * | Do not disable 3rdparty apps on occ upgradeMorris Jobke2017-04-271-7/+3
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / [tx-robot] updated from transifexNextcloud bot2017-04-2818-4/+114
|/
* [tx-robot] updated from transifexNextcloud bot2017-04-2720-4/+274
|
* Merge pull request #4529 from nextcloud/fix-filelist-checkboxesMorris Jobke2017-04-261-3/+2
|\ | | | | Fix filelist and checkbox vertical align
| * Fix filelist and checkbox vertical alignJan-Christoph Borchardt2017-04-261-3/+2
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #4518 from nextcloud/downstream-25838Roeland Jago Douma2017-04-262-0/+75
|\ \ | | | | | | Fix share indicator handling
| * | Fix share indicator handlingVincent Petry2017-04-262-0/+75
| |/ | | | | | | | | Properly update the fileInfoModel with the updated share types, which also updates the file list row indicator properly
* | handle 404 separatelyGeorg Ehrke2017-04-262-2/+24
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | unit test jquery.contactsmenuGeorg Ehrke2017-04-261-0/+198
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | better detection whether or not contactsmenu target was clickedGeorg Ehrke2017-04-261-2/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | add contactsmenu popover to resharer infoboxGeorg Ehrke2017-04-262-0/+9
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Contactsmenu popover: show proper message when server throws errorGeorg Ehrke2017-04-261-2/+8
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | don't toggle sharing popover together with contactsmenu popoverGeorg Ehrke2017-04-261-2/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | close menu again when clicking on avatarGeorg Ehrke2017-04-261-29/+26
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | add contactsmenu popoverGeorg Ehrke2017-04-267-2/+153
|/ | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>