summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | [tx-robot] updated from transifexNextcloud bot2017-02-0940-1092/+1300
| | |
* | | Merge pull request #3400 from ↵Joas Schilling2017-02-087-12/+103
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport-3023-filter-out-sensitive-appconfigs [stable11] Filter out sensitive appconfig values
| * | | Fix testsJoas Schilling2017-02-073-1/+29
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Filter out sensitive appconfig valuesJoas Schilling2017-02-074-11/+74
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3399 from ↵Lukas Reschke2017-02-081-2/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/backport-3163-wrong-page-title-on-non-nonce-browser [stable11] Use correct theming when returning the defaults
| * | | | Use correct theming when returning the defaultsJoas Schilling2017-02-071-2/+22
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-0816-2/+1086
| | | |
* | | | Merge pull request #3363 from ↵Morris Jobke2017-02-072-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/2787/busy_also_for_creator_bug_stable11 fix shared-as-busy events for owner
| * | | | fix shared-as-busy events for ownerGeorg Ehrke2017-02-032-6/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #3397 from ↵Morris Jobke2017-02-071-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/backport-3359-fix-sharing-app-description [stable11] Fix Sharing app description
| * | | | Fix Sharing app descriptionJoas Schilling2017-02-071-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-0722-72/+702
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-0616-60/+128
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-0510-0/+50
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-042-0/+4
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-02-0310-14/+30
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-02-0242-60/+274
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-02-0136-88/+1104
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-3116-82/+244
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-3014-62/+202
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-2910-16/+452
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-2884-286/+550
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-2728-8/+370
| |/ |/|
* | Merge pull request #3213 from nextcloud/ldap-ocs-stable11Morris Jobke2017-01-259-19/+545
|\ \ | | | | | | [stable] 11 LDAP OCS API
| * | LDAP OCS API (Part 1)Arthur Schiwon2017-01-239-19/+545
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP OCS Api for create config Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> LDAP OCS Api for delete config Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> fix and extend behat tests Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> add LDAP OCS Api for modifying a configuration Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> test against OCS v2 instead Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> LDAP OCS Api for show config Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> also, let ldap integration tests run Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> fix indentation Signed-off-by: Morris Jobke <hey@morrisjobke.de> enable user_ldap app for tests Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> LDAP PUT command now supports setting multiple keys at once Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> fix deletion for configIDs < s10 Also move ensureConfigIDExists checks into try, it might throw DB related exceptions Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> remove outdated scenario covered by "Delete a non-existing configuration" Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #3115 from nextcloud/backport-3106-spreed-calls-are-objectsMorris Jobke2017-01-251-0/+25
|\ \ \ | | | | | | | | [stable11] Define spreed calls
| * | | Add call-type in case the information shall be used for styling or something ↵Joas Schilling2017-01-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | else in the future Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Define spreed callsJoas Schilling2017-01-171-0/+19
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-2682-92/+160
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-2532-50/+128
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-24190-452/+480
| |/ |/|
* | Merge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldapJoas Schilling2017-01-234-9/+18
|\ \ | | | | | | [stable11] Use login name to fix password confirm with ldap users
| * | Remove warningJoas Schilling2017-01-051-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix testsJoas Schilling2017-01-051-1/+13
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make sure the loginname is set when logging in via cookieJoas Schilling2017-01-051-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use login name to fix password confirm with ldap usersJoas Schilling2017-01-051-7/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-01-236-8/+8
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-2210-16/+16
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-2110-28/+30
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-208-10/+124
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-01-194-28/+28
| | |
* | | Merge pull request #3138 from ↵Christoph Wurst2017-01-181-1/+9
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport-2776-prevent-quotes-from-being-a-problem [stable11] Escape the name for the jquery selector
| * | | Escape the name for the jquery selectorJoas Schilling2017-01-181-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3143 from senden9/patch-2Morris Jobke2017-01-181-1/+1
|\ \ \ \ | |/ / / |/| | | Fix style in comment.
| * | | Fix style in comment.Stefano Probst2017-01-181-1/+1
|/ / / | | | | | | Add missing grave accent to fix the highlighting in the documentation.
* | | [tx-robot] updated from transifexNextcloud bot2017-01-1810-60/+290
| | |
* | | Merge pull request #3117 from ↵Joas Schilling2017-01-1718-51/+625
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/backport-1594-markdown-support-for-app-descriptions [stable11] Markdown support for app descriptions
| * | add a bit of space around paragraphsMorris Jobke2017-01-171-0/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | fix list style of app descriptionMorris Jobke2017-01-172-4/+18
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Allow ordered lists as wellJoas Schilling2017-01-171-1/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>