summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-27102-262/+228
|
* Merge pull request #4461 from ↵Morris Jobke2017-04-261-0/+1
|\ | | | | | | | | danxuliu/fix-closing-details-view-when-viewing-file-in-folder Fix details view not closed when viewing a file in its folder
| * Fix closing details view when viewing file in folderDaniel Calviño Sánchez2017-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The Files app active view is set to "files" in silent mode to avoid an unneeded load of the "/" directory. However, this also prevents the details view from being automatically closed, so it has to be explicitly closed by the Goto plugin; the approach used is the same that would have been used by OCA.Files.App._onNavigationChanged if not silenced. Fixes #1448 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #4518 from nextcloud/downstream-25838Roeland Jago Douma2017-04-262-7/+88
|\ \ | | | | | | Fix share indicator handling
| * | Fix share indicator handlingVincent Petry2017-04-262-7/+88
| | | | | | | | | | | | | | | Properly update the fileInfoModel with the updated share types, which also updates the file list row indicator properly
* | | Merge pull request #4374 from nextcloud/contactsmenu_popoverLukas Reschke2017-04-263-3/+25
|\ \ \ | | | | | | | | add contacts popover
| * | | fix CommentsTabsView js testGeorg Ehrke2017-04-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | add contactsmenu popover to commentsGeorg Ehrke2017-04-262-2/+24
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #4503 from nextcloud/downstream-27281Roeland Jago Douma2017-04-261-0/+1
|\ \ \ \ | | | | | | | | | | fix objectstore rename
| * | | | fix objectstore renameJoas Schilling2017-04-251-0/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4512 from nextcloud/fix-translations-2Morris Jobke2017-04-263-6/+18
|\ \ \ \ | |_|_|/ |/| | | Fix translations
| * | | Use correct plural form and add special strings for tomorrow and todayJoas Schilling2017-04-262-2/+14
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix past tenseJoas Schilling2017-04-261-4/+4
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4478 from nextcloud/improve_settings_helpJoas Schilling2017-04-268-18/+16
|\ \ \ | |_|/ |/| | adding some documentation hints and some smaller cleanup
| * | Wording fixesJan-Christoph Borchardt2017-04-253-6/+4
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Small layout fixes to settings hintsJan-Christoph Borchardt2017-04-252-3/+3
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | change the headline as suggestedFrank Karlitschek2017-04-251-2/+1
| | |
| * | one more hintFrank Karlitschek2017-04-251-0/+1
| | |
| * | adding some documentation hints and some smaller cleanupFrank Karlitschek2017-04-255-11/+11
| |/
* | Merge pull request #4500 from nextcloud/downstream-27118Morris Jobke2017-04-263-26/+20
|\ \ | | | | | | Restrict proppatch to the proper nodes
| * | Restrict proppatch to the proper nodesVincent Petry2017-04-253-26/+20
| |/ | | | | | | | | | | | | Need to fetch the node earlier because cancelling from within the handler is not possible. Well, it is but it prevents other node types using the same property names to run because the failure marks the property with status 403.
* | Merge pull request #4416 from gvmura/avoid-duplicate-files-googleMorris Jobke2017-04-261-0/+13
|\ \ | | | | | | Avoid duplicate files in google with the same name
| * | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
| | | | | | | | | | | | Signed-off-by: gvmura <gvmura@uniss.it>
* | | Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwoMorris Jobke2017-04-256-13/+332
|\ \ \ | | | | | | | | user_ldap: Add support for gidNumber
| * | | Fix usersInGroup retrievalArthur Schiwon2017-04-252-14/+39
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | fix method name due to changes in masterArthur Schiwon2017-04-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2Arthur Schiwon2017-04-256-8/+302
| |\ \ \
| | * | | user_ldap: Add support for gidNumberXuanwo2017-04-256-8/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is based on the work of @dleeuw (https://github.com/dleeuw) (See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details). The difference is user & group data will be written into cache to have better performance, and functions splited from primaryGroupID series to make them more readable. Fixed https://github.com/nextcloud/server/issues/2640 Signed-off-by: Xuanwo <xuanwo@yunify.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-2636-20/+348
| | | | |
* | | | | Audit log for enabling/disabling a userJoas Schilling2017-04-252-0/+18
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletionJoas Schilling2017-04-252-0/+35
|\ \ \ \ | | | | | | | | | | Audit group creation/deletion
| * | | | 4190Roger Szabo2017-04-252-0/+35
| |/ / / | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | Merge pull request #3531 from nextcloud/theming-scssMorris Jobke2017-04-255-709/+328
|\ \ \ \ | | | | | | | | | | Theming using SCSS variables
| * | | | Mock itJoas Schilling2017-04-251-12/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Logo and background URLs must be relativeJoas Schilling2017-04-252-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are used way to often for such a change Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix theming testsJulius Härtl2017-04-252-30/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-255-681/+293
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> Add Scss variables to example theme and theming app Signed-off-by: Julius Haertl <jus@bitgrid.net> Use SCSSCacher to build theming css Signed-off-by: Julius Härtl <jus@bitgrid.net> Update theming.scss Signed-off-by: Julius Härtl <jus@bitgrid.net> Code cleanup Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix tests Signed-off-by: Julius Härtl <jus@bitgrid.net> Inject SCSSCacher for easier testing Signed-off-by: Julius Härtl <jus@bitgrid.net> Fix typehint Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Generate absolute URLs Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Fix tests to always use absolute urls for theming images Signed-off-by: Julius Härtl <jus@bitgrid.net> MailheaderColor -> ColorPrimary Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / Fix invalid characterJoas Schilling2017-04-252-2/+2
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2516-20/+30
| | |
* | | Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casingMorris Jobke2017-04-242-84/+92
|\ \ \ | | | | | | | | Fix storage info with wrong casing
| * | | Remove dead argumentsJoas Schilling2017-04-242-45/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix similar issues with the group idJoas Schilling2017-04-242-4/+8
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix the storage info and other checks when the user has wrong casingJoas Schilling2017-04-242-35/+83
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4463 from ↵Roeland Jago Douma2017-04-241-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | danxuliu/fix-working-icon-placement-on-password-save Fix working icon placement on password save
| * | | | Fix working icon placement on password saveDaniel Calviño Sánchez2017-04-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the icon appeared below the text input for the password. Now, it appears inside the text input, to the right end. The CSS was adjusted based on other icons shown in that position for other text inputs in the Share tab view, like the information icon or the clipboard icon. Fixes #4135 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warningsRoeland Jago Douma2017-04-243-4/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix sinon.stub deprecation warnings
| * | | | | Fix sinon.stub deprecation warningsChristoph Wurst2017-04-243-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by the deprecation warning. This makes the js unit testing output readable again. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #1023 from GitHubUser4234/ldap_password_renew_prblizzz2017-04-2435-175/+972
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle password expiry in user_ldap
| * | | | | | unit test adjustmentRoger Szabo2017-04-072-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | | | lower case for attributesRoger Szabo2017-04-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 05:08:53 +0000