summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-182-62/+62
* Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-urlLukas Reschke2017-03-183-7/+23
|\
| * Always suggest the overwrite.cli.urlJoas Schilling2017-03-173-7/+23
* | Merge pull request #3892 from nextcloud/downstream-27101Joas Schilling2017-03-171-1/+5
|\ \ | |/ |/|
| * Redirect unlink to rmdir (#27101)Vincent Petry2017-03-161-1/+5
* | Merge pull request #3883 from nextcloud/downstream-26968blizzz2017-03-171-2/+16
|\ \
| * | Ignore exception when deleting keys of deleted userVincent Petry2017-03-171-2/+16
* | | Merge pull request #3878 from nextcloud/downstream-26303Joas Schilling2017-03-171-1/+2
|\ \ \
| * | | Fixed failing test which was ignoring a required (not null) column (#26303)Philipp Schaffrath2017-03-171-1/+2
| |/ /
* | | Merge pull request #3885 from nextcloud/downstream-26529Joas Schilling2017-03-171-0/+12
|\ \ \
| * | | Skip FailedStorage in background scanVincent Petry2017-03-171-0/+12
| |/ /
* | | Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backendRoeland Jago Douma2017-03-171-3/+3
|\ \ \
| * | | Don't call function in constructorLukas Reschke2017-03-161-7/+3
| * | | Escape like parameters in database user backendLukas Reschke2017-03-151-3/+7
* | | | Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policyRoeland Jago Douma2017-03-171-0/+1
|\ \ \ \
| * | | | Add base-uri to CSP policyLukas Reschke2017-03-161-0/+1
* | | | | Merge pull request #3619 from nextcloud/fix-scss-for-appsMorris Jobke2017-03-164-7/+94
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Properly calculate webdir using the serverrootRoeland Jago Douma2017-03-102-5/+13
| * | | | SCSS files don't exist on the default fs so just add them to theRoeland Jago Douma2017-03-101-1/+49
| * | | | Fix SCSS usage in appsMorris Jobke2017-03-101-1/+32
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-172-0/+464
| |_|_|/ |/| | |
* | | | Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-161-0/+1
|\ \ \ \
| * | | | Move social buttons to menuRoeland Jago Douma2017-03-031-1/+0
| * | | | Add social sharingRoeland Jago Douma2017-03-031-0/+2
* | | | | Merge pull request #3008 from nextcloud/appmenu-experimentMorris Jobke2017-03-162-8/+77
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make app management icon act like a normal app iconJulius Haertl2017-03-161-0/+6
| * | | | Fix menu issuesJulius Haertl2017-03-161-6/+19
| * | | | Generate seperate menu list for header barJulius Haertl2017-03-162-3/+43
| * | | | Move active app to the first slotJulius Haertl2017-03-161-9/+19
| | |_|/ | |/| |
* | | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-162-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Check that set_time_limit is not disabled before calling itKo-2017-03-112-2/+6
* | | | Merge pull request #3843 from nextcloud/encryption-fix-mail-shareJoas Schilling2017-03-151-3/+3
|\ \ \ \
| * | | | take share by mail into consideration if we calculate the access listBjoern Schiessle2017-03-141-3/+3
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-152-2/+20
* | | | | Merge pull request #3838 from Xuanwo/basename-fixRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \
| * | | | | [OC/Files/Cache]: Fix wrong usage of basenameXuanwo2017-03-141-1/+2
| |/ / / /
* | | | | Merge pull request #3836 from nextcloud/do-not-double-check-app-updateRoeland Jago Douma2017-03-142-9/+4
|\ \ \ \ \
| * | | | | Do not double cherck app updateMorris Jobke2017-03-132-9/+4
* | | | | | Merge pull request #3600 from coletivoEITA/masterRoeland Jago Douma2017-03-143-0/+16
|\ \ \ \ \ \
| * | | | | | added method needsPartFile() in StorageVinicius Cubas Brand2017-03-143-0/+16
* | | | | | | Merge pull request #3783 from andrius-kulbis/masterRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix detecting deleted shares in object storeAndrius2017-03-091-1/+2
* | | | | | | dont allow empty wildcard searchRobin Appelman2017-03-131-0/+4
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3780 from GitHubUser4234/audit_log_agentLukas Reschke2017-03-131-0/+3
|\ \ \ \ \ \
| * | | | | | author updateRoger Szabo2017-03-101-0/+1
| * | | | | | improvement of userAgent variable assigmentRoger Szabo2017-03-101-1/+1
| * | | | | | log user agent globally insteadRoger Szabo2017-03-101-0/+2
* | | | | | | Merge pull request #3772 from nextcloud/favorite-searchMorris Jobke2017-03-134-7/+70
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Allow searching for favoritesRobin Appelman2017-03-084-7/+70
| |/ / / / /
* | | | | | Merge pull request #3739 from fti7/masterLukas Reschke2017-03-111-0/+1
|\ \ \ \ \ \