summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-264-18/+20
* Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-265-3/+14
|\
| * Merge pull request #4499 from nextcloud/downstream-26984Morris Jobke2017-04-251-1/+5
| |\
| | * Trigger change when a user is enabled/disabledJoas Schilling2017-04-251-1/+5
| * | Merge pull request #4479 from nextcloud/auth-flowMorris Jobke2017-04-252-0/+2
| |\ \
| | * | Add new auth flowLukas Reschke2017-04-252-0/+2
| * | | Merge pull request #4495 from nextcloud/downstream-27638Roeland Jago Douma2017-04-252-2/+7
| |\ \ \ | | |/ / | |/| |
| | * | Catch session already closed exception in destructorVictor Dubiniuk2017-04-252-2/+7
| | |/
* | | Update composer autoloaderChristoph Wurst2017-04-254-6/+8
* | | Use absolute URI for action iconsChristoph Wurst2017-04-251-3/+9
* | | Don't show contacts an entry for themselvesChristoph Wurst2017-04-253-4/+10
* | | Let apps register contact menu provider via info.xmlChristoph Wurst2017-04-252-14/+45
* | | Show mail address in popover menuChristoph Wurst2017-04-251-3/+1
* | | Contacts menuChristoph Wurst2017-04-2518-8/+963
|/ /
* / Responsive app menuJulius Härtl2017-04-252-70/+0
|/
* Merge pull request #3531 from nextcloud/theming-scssMorris Jobke2017-04-254-17/+99
|\
| * Use theming cachebuster for server resourcesJulius Härtl2017-04-251-1/+3
| * Implement scss variable injection by OC_DefaultsJulius Haertl2017-04-254-16/+96
* | Merge pull request #4462 from danxuliu/fix-sharing-password-protected-linkRoeland Jago Douma2017-04-251-24/+31
|\ \ | |/ |/|
| * Extract updateSharePasswordIfNeeded functionDaniel Calviño Sánchez2017-04-241-22/+30
| * Join if block to preceding if chainDaniel Calviño Sánchez2017-04-241-3/+2
| * Fix double hashing of shared link passwordsDaniel Calviño Sánchez2017-04-241-1/+1
* | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-2446-80/+0
|\ \ | |/ |/|
| * Remove unused use statementsMorris Jobke2017-04-2246-80/+0
* | Merge pull request #4444 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-04-241-1/+0
|\ \
| * | Remove unused variablesMorris Jobke2017-04-221-1/+0
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-04-242-0/+12
* | [tx-robot] updated from transifexNextcloud bot2017-04-232-0/+10
* | [tx-robot] updated from transifexNextcloud bot2017-04-224-0/+18
|/
* Merge pull request #4396 from nextcloud/scan-non-existingRoeland Jago Douma2017-04-211-0/+5
|\
| * check for existence before we start the db transactionRobin Appelman2017-04-201-3/+3
| * Add PHPDoc and handle exception in ScanAppData as wellMorris Jobke2017-04-191-0/+1
| * show error when trying to scan non existing pathRobin Appelman2017-04-191-0/+4
* | Merge pull request #4428 from nextcloud/file-by-id-limit-userRoeland Jago Douma2017-04-213-6/+19
|\ \
| * | limit the user when searching for a file by id if we know the user alreadyRobin Appelman2017-04-213-6/+19
* | | Merge pull request #4406 from nextcloud/fix-unit-test-problemsRoeland Jago Douma2017-04-214-92/+1
|\ \ \
| * | | Fix theming testsJoas Schilling2017-04-201-1/+1
| * | | Kill dead codeJoas Schilling2017-04-203-91/+0
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2114-0/+32
* | | respect password policy for auto generated passwordsBjoern Schiessle2017-04-201-1/+3
* | | allow admin to enforce password on mail sharesBjoern Schiessle2017-04-201-1/+2
|/ /
* | Merge pull request #4398 from nextcloud/fix_accesslistcodeJoas Schilling2017-04-201-2/+7
|\ \
| * | Get proper accesslist for userFolderRoeland Jago Douma2017-04-201-2/+7
| |/
* | Merge pull request #4381 from nextcloud/2954_take_2Joas Schilling2017-04-201-7/+1
|\ \
| * | Revert "Match slashes in ../{id} resource routes"Roeland Jago Douma2017-04-181-7/+1
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2014-2/+58
* | | Rename renderHTML to renderHtmlMorris Jobke2017-04-192-4/+4
| |/ |/|
* | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-191-1/+3
|\ \
| * | Add "Reply-To" on ShareByMailProvider mailsLukas Reschke2017-04-181-1/+3
| |/
* | Merge pull request #4371 from nextcloud/dont-allow-dot-usernamesMorris Jobke2017-04-181-1/+5
|\ \