summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-10226-26/+12096
|
* Merge pull request #7112 from nextcloud/theming-imagemagick-hintMorris Jobke2017-11-094-0/+21
|\ | | | | Theming: add hint about favicon generation
| * Fix unit testsMorris Jobke2017-11-091-0/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Theming: add hint about favicon generationJulius Härtl2017-11-083-0/+17
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2017-11-092-0/+2
| |
* | Merge pull request #7046 from ↵Morris Jobke2017-11-092-0/+43
|\ \ | | | | | | | | | | | | nextcloud/hide-summary-file-actions-when-selected-file-does-not-match Hide summary file actions when a selected file does not match
| * | Hide summary file actions when a selected file does not matchDaniel Calviño Sánchez2017-11-022-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When several files are selected and one of them can not be deleted the "Delete" file action is not shown in the summary. This commit extends that behaviour too to the other file actions in the summary ("Move or copy" and "Download"), so now an action is shown in the summary only if it can be executed on all the currently selected files. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #6846 from nextcloud/filelist-confict-pathMorris Jobke2017-11-091-14/+17
|\ \ \ | | | | | | | | still trigger conflict resolution for existing entries when the curre…
| * | | never show '/' as path for conflicting file namesRobin Appelman2017-11-071-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | still trigger conflict resolution for existing entries when the current ↵Robin Appelman2017-11-071-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | entry doesn't need it Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5568 from nextcloud/ldap-agent-credentials-safeLukas Reschke2017-11-096-20/+62
|\ \ \ \ | | | | | | | | | | Ldap agent credentials save
| * | | | fix saving changes…Arthur Schiwon2017-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | add some whitespace around credential elementsArthur Schiwon2017-10-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (…in a stupid way) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix creating an empty configurationArthur Schiwon2017-10-271-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | add save button for setting LDAP Agent DN and PasswordArthur Schiwon2017-10-273-4/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Fix regression: undesired writes to the DBArthur Schiwon2017-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | LDAP: only write actually changes values to the DBArthur Schiwon2017-10-271-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | first, remove the hackArthur Schiwon2017-10-272-12/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-11-09102-138/+340
| | | | |
* | | | | Merge pull request #6788 from staabm/masterLukas Reschke2017-11-088-10/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | Prevent XSS in links which open a new browser window
| * | | | Prevent XSS in links which open a new browser windowMarkus Staab2017-10-198-10/+10
| | | | |
* | | | | Merge pull request #7064 from nextcloud/popover-fixRoeland Jago Douma2017-11-082-52/+46
|\ \ \ \ \ | | | | | | | | | | | | Fix popover layout
| * | | | | Fixed sharing popover and removed unused old codeJohn Molakvoæ (skjnldsv)2017-11-071-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Reduce spread of css selector for a.actionJohn Molakvoæ (skjnldsv)2017-11-071-41/+44
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0836-58/+1342
| | | | | |
* | | | | | Merge pull request #7042 from ↵Lukas Reschke2017-11-073-8/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects ensure uid for calendar objects is unique
| * | | | | | ensure uid for calendar objects is uniqueGeorg Ehrke2017-11-063-8/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | Merge pull request #7075 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-11-077-24/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused variables
| * | | | | | | Remove unused variablesMorris Jobke2017-11-067-24/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Theming: expose element color though capabilities APIJulius Härtl2017-11-073-5/+8
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0754-0/+3214
| | | | | | |
* | | | | | | Change @georgehrke's emailMorris Jobke2017-11-0663-48/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Update license headersMorris Jobke2017-11-06558-451/+1689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-0637-173/+2801
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Implement plugins infrastructure in User_LDAP
| * | | | | | | User_LDAP plugins: smaller fixesVinicius Cubas Brand2017-11-0313-63/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
| * | | | | | | Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-0333-172/+2736
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | | | | | | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-064-48/+375
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Enhance calendar invitation emails
| * | | | | | | fancify invitation emailsGeorg Ehrke2017-11-032-45/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | | | Correctly use the email templatingJoas Schilling2017-11-031-80/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Language depending datesJoas Schilling2017-11-031-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Fix phpStorm complaintsJoas Schilling2017-11-033-52/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | DAV: Initial email customization supportLeon Klingele2017-11-033-16/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-Off-By: Leon Klingele <leon@struktur.de> Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | | Merge pull request #7074 from nextcloud/use-proper-whitespaceChristoph Wurst2017-11-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use proper whitespace
| * | | | | | | | Use proper whitespaceMorris Jobke2017-11-061-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-066-34/+40
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-052-0/+2
| |_|_|/ / / / |/| | | | | |
* | | | | | | Add variable for border-radiusJan-Christoph Borchardt2017-11-032-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #7049 from nextcloud/fix-actions-menuJan-Christoph Borchardt2017-11-032-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix opening the file actions menu in mobile
| * | | | | | Fix opening the file actions menu in mobileMorris Jobke2017-11-032-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #7048 from nextcloud/flexbox-cssJan-Christoph Borchardt2017-11-031-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Vendor prefix for flexbox not needed anymore