summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-053-16/+22
|\
| * Merge setMetaData into constructorJoas Schilling2017-09-043-16/+22
* | Merge pull request #6254 from nextcloud/async-bus-splitMorris Jobke2017-09-043-77/+126
|\ \
| * | Add proper EOLMorris Jobke2017-09-041-1/+1
| * | allow configuring the command busRobin Appelman2017-08-241-30/+41
| * | split async test bus for easier subclassingRobin Appelman2017-08-243-48/+86
* | | Merge pull request #6064 from nextcloud/fix-5219-absolute-path-must-be-relati...Morris Jobke2017-09-041-6/+13
|\ \ \
| * | | Don't lock in the appdata_ directoryJoas Schilling2017-08-101-1/+1
| * | | Still throw a locked exception when the path is not relative to $user/files/Joas Schilling2017-08-101-5/+12
* | | | Merge pull request #6326 from nextcloud/fix_4654_3375Roeland Jago Douma2017-09-041-3/+4
|\ \ \ \
| * | | | Pass new value to triggerChangeRoeland Jago Douma2017-08-311-3/+4
| | |_|/ | |/| |
* | | | Merge pull request #6331 from nextcloud/update-repair-stepMorris Jobke2017-09-042-3/+3
|\ \ \ \
| * | | | move repair step to stable12Bjoern Schiessle2017-09-012-3/+3
| |/ / /
* | | | Merge pull request #6297 from te-online/add-mimetype-internet-shortcutMorris Jobke2017-09-041-1/+14
|\ \ \ \
| * | | | Add mimetype support for .URL (Windows) and .webloc (macOS) files. Update pla...Thomas Ebert2017-08-311-1/+14
| |/ / /
* / / / Rebuild SCSS files if frontend controller value changesJulius Härtl2017-09-031-1/+2
|/ / /
* | | Merge pull request #6296 from nextcloud/improve_2faRoeland Jago Douma2017-08-312-4/+77
|\ \ \
| * | | Improve 2FARoeland Jago Douma2017-08-292-4/+77
* | | | Add shareWith to email template metadataMorris Jobke2017-08-291-0/+1
* | | | Allow the expiration date to be set to nullMorris Jobke2017-08-281-2/+2
* | | | unlock file when an exception occurs during scanningRobin Appelman2017-08-261-69/+87
* | | | Dont swallow exception when inserting mimetypes if we're inside a transactionRobin Appelman2017-08-261-0/+4
* | | | Merge pull request #6255 from nextcloud/email-meta-dataMorris Jobke2017-08-262-2/+27
|\ \ \ \
| * | | | Add meta information to emails for better customisationJoas Schilling2017-08-242-2/+27
* | | | | Merge pull request #6177 from nextcloud/properly-add-slo-urlMorris Jobke2017-08-262-20/+19
|\ \ \ \ \
| * | | | | Inject \OCP\IURLGenerator to make tests workLukas Reschke2017-08-182-3/+4
| * | | | | Properly allow \OCP\Authentication\IApacheBackend to specify logout URLLukas Reschke2017-08-182-19/+17
* | | | | | Merge pull request #6189 from nextcloud/circle-tokenMorris Jobke2017-08-261-0/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | link to getShareByTokenMaxence Lange2017-08-201-0/+9
| |/ / / /
* | | | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-244-13/+161
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-103-3/+117
| * | | | extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-102-12/+46
| | |/ / | |/| |
* | | | Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failedRoeland Jago Douma2017-08-232-2/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Prevent SQL error message in case of errorLukas Reschke2017-08-172-2/+9
* | | | Ensure log message is UTF-8 encodedLukas Reschke2017-08-171-1/+12
| |_|/ |/| |
* | | Always log cron executionMorris Jobke2017-08-171-1/+0
|/ /
* | Merge pull request #6123 from nextcloud/cleanup-shareItemMorris Jobke2017-08-151-2/+3
|\ \
| * | Cleanup usage of shareItem in internal code baseMorris Jobke2017-08-151-2/+3
* | | Use proper methods for checkPasswordProtectedShareMorris Jobke2017-08-151-1/+1
|/ /
* | Cleanup unused methodsMorris Jobke2017-08-152-676/+3
* | Merge pull request #6004 from nextcloud/forward-5902-repair-drop-account-term...Roeland Jago Douma2017-08-103-3/+63
|\ \
| * | Use the existing array of OC versionsJoas Schilling2017-08-071-3/+1
| * | Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-08-072-0/+62
* | | Merge pull request #6052 from nextcloud/fix_jail_copyMorris Jobke2017-08-101-0/+6
|\ \ \ | |_|/ |/| |
| * | Fix copy from jailed storageRoeland Jago Douma2017-08-091-0/+6
| |/
* | Fix require once for actionIncludeMorris Jobke2017-08-091-1/+1
* | If there is no content don't errorRoeland Jago Douma2017-08-091-1/+1
* | User proper anonymous functionRoeland Jago Douma2017-08-091-5/+6
* | Use non-deprecated INTL_IDNA_VARIANT_UTS46Lukas Reschke2017-08-092-3/+3
* | Make definition compatibleLukas Reschke2017-08-091-1/+1