summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* unify endpoints form core and the the provisioning apiBjoern Schiessle2017-01-253-2/+112
* add data from the users profile to the provisioning apiBjoern Schiessle2017-01-242-4/+65
* Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-...Joas Schilling2017-01-232-26/+236
|\
| * Allow subadmins to add people to groups via provisioning apiJoas Schilling2017-01-182-7/+151
| * Make sure subadmins can not delete users from their last subadmin groupJoas Schilling2017-01-182-0/+76
| * No need to check the subadmin againJoas Schilling2017-01-182-21/+11
* | Merge pull request #3118 from nextcloud/newFileMenu-css-guidelinesMorris Jobke2017-01-223-41/+12
|\ \
| * | Popover newFolder input fixJohn Molakvoæ (skjnldsv)2017-01-221-4/+2
| * | Popover positionning fixJohn Molakvoæ (skjnldsv)2017-01-221-1/+0
| * | Popover positionning and classesJohn Molakvoæ (skjnldsv)2017-01-223-2/+6
| * | fit newFileMenu to css guidelinesJohn Molakvoæ (skjnldsv)2017-01-223-39/+9
* | | [tx-robot] updated from transifexNextcloud bot2017-01-234-4/+4
* | | Merge pull request #3190 from nextcloud/fix-sharing-popoverJohn Molakvoæ2017-01-221-9/+7
|\ \ \ | |/ / |/| |
| * | Fix #3174John Molakvoæ (skjnldsv)2017-01-211-9/+7
* | | Merge pull request #3187 from nextcloud/inputs-scss-optimisationMorris Jobke2017-01-224-53/+28
|\ \ \
| * | | Fixed public share download buttonJohn Molakvoæ (skjnldsv)2017-01-221-2/+2
| * | | Fixed sharing jsJohn Molakvoæ (skjnldsv)2017-01-221-1/+1
| * | | Fixed public share header buttonsJohn Molakvoæ (skjnldsv)2017-01-222-44/+23
| * | | Login and authenticate inputs fixesJohn Molakvoæ (skjnldsv)2017-01-221-6/+2
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-01-228-10/+10
* | | [tx-robot] updated from transifexNextcloud bot2017-01-218-28/+28
* | | [tx-robot] updated from transifexNextcloud bot2017-01-206-10/+122
* | | Merge pull request #3144 from nextcloud/use-data-download-responseMorris Jobke2017-01-192-7/+3
|\ \ \
| * | | Use DataDownloadResponseLukas Reschke2017-01-182-7/+3
* | | | some code cleanup while working on the fileBjoern Schiessle2017-01-191-19/+26
* | | | add brute force protection to 'mount public link' operationBjoern Schiessle2017-01-191-0/+1
| |/ / |/| |
* | | Merge pull request #3150 from nextcloud/highlight-active-navigationJohn Molakvoæ2017-01-192-0/+5
|\ \ \
| * | | theme app navigation menu highlight colorMorris Jobke2017-01-182-0/+5
| |/ /
* | | Merge pull request #3081 from nextcloud/2fa-backup-codes-test-coverageLukas Reschke2017-01-197-17/+184
|\ \ \
| * | | fix file endingChristoph Wurst2017-01-181-1/+1
| * | | make sure files end with emtpy lineChristoph Wurst2017-01-182-2/+2
| * | | ignore code we're unable to testChristoph Wurst2017-01-185-3/+8
| * | | test activity providerChristoph Wurst2017-01-182-0/+136
| * | | increase GenericProvider's test coverageChristoph Wurst2017-01-181-9/+35
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2017-01-194-28/+28
|/ /
* | Merge pull request #3078 from nextcloud/2fa-backup-codes-entropyLukas Reschke2017-01-182-20/+28
|\ \ | |/ |/|
| * use constant and clean up unit testChristoph Wurst2017-01-162-19/+18
| * Increase 2fa backup codes entropyChristoph Wurst2017-01-162-2/+11
* | [tx-robot] updated from transifexNextcloud bot2017-01-182-48/+274
* | Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problemMorris Jobke2017-01-171-1/+9
|\ \
| * | Escape the name for the jquery selectorJoas Schilling2016-12-201-1/+9
* | | Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptionsJoas Schilling2017-01-172-6/+4
|\ \ \
| * | | Fix "broken" app descriptionsJoas Schilling2017-01-132-6/+4
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-176-188/+188
* | | | Merge pull request #3033 from nextcloud/share-by-mail-use-display-nameBjörn Schießle2017-01-161-7/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | generate correct path for owner and use the display name instead of the user idBjoern Schiessle2017-01-121-7/+12
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-1612-12/+12
| |/ / |/| |
* | | Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-134-37/+85
|\ \ \
| * | | create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-104-37/+85
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-128-26/+80
| |/ / |/| |