summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Don't log LDAP password when server is not availableJoas Schilling2017-09-061-3/+9
* [tx-robot] updated from transifexNextcloud bot2017-09-062-0/+2
* Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-055-24/+26
|\
| * Merge setMetaData into constructorJoas Schilling2017-09-045-24/+26
* | Update autoloaderMorris Jobke2017-09-042-0/+2
* | 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-044-5/+5
|\ \ \ \
| * | | | update autoloaderBjoern Schiessle2017-09-042-2/+2
| * | | | 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
* | | | [tx-robot] updated from transifexNextcloud bot2017-09-022-0/+2
|/ / /
* | | Merge pull request #6296 from nextcloud/improve_2faRoeland Jago Douma2017-08-312-4/+77
|\ \ \
| * | | Improve 2FARoeland Jago Douma2017-08-292-4/+77
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-314-0/+6
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-302-0/+8
* | | | Add shareWith to email template metadataMorris Jobke2017-08-291-0/+1
* | | | Merge pull request #6288 from nextcloud/master-6287Morris Jobke2017-08-291-2/+2
|\ \ \ \
| * | | | Allow the expiration date to be set to nullMorris Jobke2017-08-281-2/+2
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-294-0/+8
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-284-158/+162
* | | | 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-263-2/+34
|\ \ \ \
| * | | | Add meta information to emails for better customisationJoas Schilling2017-08-243-2/+34
* | | | | Merge pull request #6177 from nextcloud/properly-add-slo-urlMorris Jobke2017-08-263-27/+25
|\ \ \ \ \
| * | | | | Inject \OCP\IURLGenerator to make tests workLukas Reschke2017-08-182-3/+4
| * | | | | Properly allow \OCP\Authentication\IApacheBackend to specify logout URLLukas Reschke2017-08-183-26/+23
* | | | | | Merge pull request #6189 from nextcloud/circle-tokenMorris Jobke2017-08-261-0/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | link to getShareByTokenMaxence Lange2017-08-201-0/+9
* | | | | | Bump autoloaderRoeland Jago Douma2017-08-262-0/+2
* | | | | | Allow 2FA providers to specify their custom CSPChristoph Wurst2017-08-261-0/+38
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-262-0/+2
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-2518-0/+40
* | | | | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-246-13/+163
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update autoloaderRoeland Jago Douma2017-08-102-0/+2
| * | | | | 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
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-244-26/+34
* | | | | 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