summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3192 from nextcloud/fix-app-settings-layout-minorMorris Jobke2017-01-232-1/+11
|\ | | | | Fix gap by filter svg and empty search message overflow
| * Add classJohn Molakvoæ (skjnldsv)2017-01-232-2/+2
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix gap by filter svg and empty search message overflowFelix A. Epp2017-01-222-1/+11
| | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | Merge pull request #3212 from mwalbeck/mimetype-hidden-filesRobin Appelman2017-01-232-0/+8
|\ \ | | | | | | Mimetype detection for hidden files
| * | Reduced code for filename trimMagnus Walbeck2017-01-231-3/+1
| | | | | | | | | | | | Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
| * | Mimetype detection for hidden filesMagnus Walbeck2017-01-232-0/+10
| | | | | | | | | | | | Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
* | | Merge pull request #3209 from nextcloud/fix-theming-typoMorris Jobke2017-01-231-1/+1
|\ \ \ | | | | | | | | Fix typo in theming description
| * | | Fix typo in theming descriptionJoas Schilling2017-01-231-1/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3157 from nextcloud/fcloseafterkillMorris Jobke2017-01-234-0/+5
|\ \ \ | | | | | | | | [uc] Prevent PHP request to get killed when using fclose callback (#26775)
| * | | Prevent PHP request to get killed when using fclose callback (#26775)Vincent Petry2017-01-234-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevent PHP request to get killed when using fclose callback * Add ignore_user_abort everywhere where the time limit is set to 0 Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #3220 from nextcloud/direct-link-open-sidebarMorris Jobke2017-01-231-0/+5
|\ \ \ \ | | | | | | | | | | open the sidebar when opening a permalink
| * | | | open the sidebar when opening a permalinkRobin Appelman2017-01-231-0/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | Also works for search results Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2924 from nextcloud/flexbox-headerMorris Jobke2017-01-235-111/+109
|\ \ \ \ | |/ / / |/| | | Use flexbox for header and rearrange some elements
| * | | fix appname positionChristoph Wurst2017-01-231-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | fix searchbox positionChristoph Wurst2017-01-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | fix public sharing buttonsChristoph Wurst2017-01-232-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | fix log and app nameChristoph Wurst2017-01-231-5/+4
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | more cleanupChristoph Wurst2017-01-232-44/+28
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | fix scssChristoph Wurst2017-01-232-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | use less space for the left part of the headerChristoph Wurst2017-01-231-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | Use flexbox for header and rearrange some elementsChristoph Wurst2017-01-233-62/+74
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #3141 from ↵Joas Schilling2017-01-236-147/+288
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/subadmin-check-on-removing-user-from-group Subadmin check on removing user from group
| * | | Remove the old ajax fileJoas Schilling2017-01-181-92/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use the provisioning api in the user management to handle group membershipsJoas Schilling2017-01-182-28/+51
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow subadmins to add people to groups via provisioning apiJoas Schilling2017-01-182-7/+151
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make sure subadmins can not delete users from their last subadmin groupJoas Schilling2017-01-182-0/+76
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix CamelCasingJoas Schilling2017-01-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | No need to check the subadmin againJoas Schilling2017-01-182-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The user needs to be a subadmin of the group, otherwise they are not allowed to remove anyone from the group Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3118 from nextcloud/newFileMenu-css-guidelinesMorris Jobke2017-01-223-41/+12
|\ \ \ \ | | | | | | | | | | Fit newFileMenu to css guidelines
| * | | | Popover newFolder input fixJohn Molakvoæ (skjnldsv)2017-01-221-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Popover positionning fixJohn Molakvoæ (skjnldsv)2017-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Popover positionning and classesJohn Molakvoæ (skjnldsv)2017-01-223-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | fit newFileMenu to css guidelinesJohn Molakvoæ (skjnldsv)2017-01-223-39/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-236-8/+8
| | | | |
* | | | | Merge pull request #3190 from nextcloud/fix-sharing-popoverJohn Molakvoæ2017-01-224-19/+15
|\ \ \ \ \ | |/ / / / |/| | | | Fix #3174
| * | | | Fix #3174John Molakvoæ (skjnldsv)2017-01-214-19/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #3187 from nextcloud/inputs-scss-optimisationMorris Jobke2017-01-2226-655/+341
|\ \ \ \ \ | | | | | | | | | | | | Inputs.scss rewritting and optimisation
| * | | | | App navigation utils buttons shadow fixJohn Molakvoæ (skjnldsv)2017-01-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed public share download buttonJohn Molakvoæ (skjnldsv)2017-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fix Navigation menu shadow and added rules for icon in buttonJohn Molakvoæ (skjnldsv)2017-01-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed sharing jsJohn Molakvoæ (skjnldsv)2017-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed public share header buttonsJohn Molakvoæ (skjnldsv)2017-01-223-48/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fix download button on public shareJohn Molakvoæ (skjnldsv)2017-01-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Select2 search input fixJohn Molakvoæ (skjnldsv)2017-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Login and authenticate inputs fixesJohn Molakvoæ (skjnldsv)2017-01-222-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Disabled state fixJohn Molakvoæ (skjnldsv)2017-01-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | White checkmark fixJohn Molakvoæ (skjnldsv)2017-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fix loginJohn Molakvoæ (skjnldsv)2017-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed edit icon positionJohn Molakvoæ (skjnldsv)2017-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed multiselect focusJohn Molakvoæ (skjnldsv)2017-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>