aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-2914-28/+52
* [tx-robot] updated from transifexNextcloud bot2017-08-2812-162/+178
* Merge pull request #6245 from nextcloud/postgresRoeland Jago Douma2017-08-271-1/+1
|\
| * Properly quote 7.0 so drone handles it rightRoeland Jago Douma2017-08-261-1/+1
|/
* Merge pull request #6263 from nextcloud/scanner-exception-handlingMorris Jobke2017-08-262-69/+91
|\
| * 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-266-4/+50
|\
| * Allow the expiration date to be set to nullMorris Jobke2017-08-262-2/+4
| * Also for reset passwordJoas Schilling2017-08-241-0/+3
| * Add meta information to emails for better customisationJoas Schilling2017-08-244-4/+45
* | Merge pull request #6177 from nextcloud/properly-add-slo-urlMorris Jobke2017-08-268-38/+46
|\ \
| * | Inject \OCP\IURLGenerator to make tests workLukas Reschke2017-08-184-5/+16
| * | Properly allow \OCP\Authentication\IApacheBackend to specify logout URLLukas Reschke2017-08-188-37/+34
* | | Merge pull request #6253 from nextcloud/update-synfony-componentsMorris Jobke2017-08-261-0/+0
|\ \ \
| * | | update symfony componentsRobin Appelman2017-08-261-0/+0
* | | | Merge pull request #6189 from nextcloud/circle-tokenMorris Jobke2017-08-261-0/+9
|\ \ \ \
| * | | | link to getShareByTokenMaxence Lange2017-08-201-0/+9
* | | | | Merge pull request #6182 from nextcloud/fixes-in-files-drop-jsRoeland Jago Douma2017-08-261-16/+14
|\ \ \ \ \
| * | | | | Do not iterate over the filesDaniel Calviño Sánchez2017-08-181-5/+4
| * | | | | Replace fileName variable with data.files[0].nameDaniel Calviño Sánchez2017-08-181-8/+6
| * | | | | Update the whole file item instead of only its contentsDaniel Calviño Sánchez2017-08-181-7/+8
| * | | | | Remove "errorThrown" parameterDaniel Calviño Sánchez2017-08-181-1/+1
* | | | | | Merge pull request #6250 from nextcloud/twofactor/provider-custom-cspRoeland Jago Douma2017-08-264-1/+47
|\ \ \ \ \ \
| * | | | | | Bump autoloaderRoeland Jago Douma2017-08-262-0/+2
| * | | | | | Allow 2FA providers to specify their custom CSPChristoph Wurst2017-08-262-1/+45
|/ / / / / /
* | | | | | Merge pull request #6252 from nextcloud/only_show1_errorMorris Jobke2017-08-263-0/+6
|\ \ \ \ \ \
| * | | | | | Don't try the actual file upload if the checks already error outRoeland Jago Douma2017-08-263-0/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6157 from nextcloud/smb-2.0.2Morris Jobke2017-08-2613-52/+265
|\ \ \ \ \ \
| * | | | | | update icewind/smb to 2.0.2Robin Appelman2017-08-1613-52/+265
* | | | | | | Merge pull request #6262 from nextcloud/navigation-entries-sortMorris Jobke2017-08-262-6/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix sorting of entries in Files sidebarJan-Christoph Borchardt2017-08-252-6/+6
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-266-4/+12
* | | | | | | Merge pull request #6260 from nextcloud/popover-border-radiusRoeland Jago Douma2017-08-251-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Add standard border-radius to datepickerJan-Christoph Borchardt2017-08-251-0/+2
| |/ / / / / /
* | | | | | | Merge pull request #6261 from nextcloud/fix-favorites-permanentRoeland Jago Douma2017-08-251-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix permanent display of favorite iconJan-Christoph Borchardt2017-08-251-0/+6
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-2560-108/+414
* | | | | | Merge pull request #6244 from nextcloud/redis_clusterMorris Jobke2017-08-251-1/+2
|\ \ \ \ \ \
| * | | | | | Use a new phpredisRoeland Jago Douma2017-08-241-1/+1
| * | | | | | Give redis a change to fireupRoeland Jago Douma2017-08-231-0/+1
* | | | | | | Merge pull request #6249 from nextcloud/ignore-vscodeRoeland Jago Douma2017-08-241-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Add Visual Studio Code to .gitignoreJakob Sack2017-08-241-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #6251 from nextcloud/get_right_translationRoeland Jago Douma2017-08-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Don't fetch the translation from core but from filesRoeland Jago Douma2017-08-241-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-247-28/+229
|\ \ \ \ \ \ \
| * | | | | | | Update autoloaderRoeland Jago Douma2017-08-102-0/+2
| * | | | | | | Bump versionRoeland Jago Douma2017-08-101-1/+1
| * | | | | | | add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-104-8/+122
| * | | | | | | extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-103-23/+108