summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-0110-8/+40
* Merge pull request #6296 from nextcloud/improve_2faRoeland Jago Douma2017-08-313-21/+266
|\
| * Improve 2FARoeland Jago Douma2017-08-293-21/+266
* | Merge pull request #6315 from nextcloud/metadata-for-all-emailsMorris Jobke2017-08-314-0/+38
|\ \
| * | Implement metadata for email templates of remaining emailsMorris Jobke2017-08-304-0/+38
* | | [tx-robot] updated from transifexNextcloud bot2017-08-3144-12/+174
|/ /
* | Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-nameMorris Jobke2017-08-302-10/+21
|\ \
| * | Add side effect noteMorris Jobke2017-08-301-0/+2
| * | Allow to sort groups by nameJoas Schilling2017-08-222-10/+19
* | | Merge pull request #6273 from nextcloud/move-multiple-filesRoeland Jago Douma2017-08-302-2/+40
|\ \ \
| * | | Move multiple filesThomas Citharel2017-08-272-2/+40
* | | | Merge pull request #5994 from nextcloud/drone_postgres_71Morris Jobke2017-08-301-0/+12
|\ \ \ \
| * | | | Add drone step for postgres with php 7.1Roeland Jago Douma2017-08-301-0/+12
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-30104-506/+596
* | | | Merge pull request #6303 from nextcloud/background-imageMorris Jobke2017-08-2910-12/+20035
|\ \ \ \
| * | | | Set primary action button color to same as theming colorJan-Christoph Borchardt2017-08-293-6/+5
| * | | | Update background image to the one used on the websiteJan-Christoph Borchardt2017-08-298-6/+20030
* | | | | Merge pull request #6301 from nextcloud/master-add-share-withMorris Jobke2017-08-292-0/+2
|\ \ \ \ \
| * | | | | Add shareWith to email template metadataMorris Jobke2017-08-292-0/+2
* | | | | | Merge pull request #6302 from nextcloud/comradekingu-patch-1Morris Jobke2017-08-291-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Spelling: Shortening and single please.Allan Nordhøy2017-08-291-2/+2
|/ / / / /
* | | | | Merge pull request #6293 from nextcloud/less-user-enumerationJoas Schilling2017-08-292-2/+2
|\ \ \ \ \
| * | | | | Return the user id in case of an errorJoas Schilling2017-08-292-2/+2
* | | | | | Merge pull request #4925 from nextcloud/error-stylingMorris Jobke2017-08-295-32/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Shorten text of untrusted domain errorJan-Christoph Borchardt2017-08-121-2/+2
| * | | | | fix design of the track traceMorris Jobke2017-08-121-1/+1
| * | | | | Improve design of various error messagesJan-Christoph Borchardt2017-08-125-31/+35
* | | | | | Merge pull request #6288 from nextcloud/master-6287Morris Jobke2017-08-292-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Allow the expiration date to be set to nullMorris Jobke2017-08-282-3/+3
* | | | | | Merge pull request #6283 from nextcloud/add-new-propfindBjörn Schießle2017-08-291-1/+7
|\ \ \ \ \ \
| * | | | | | add propfind to detect encryption statusBjoern Schiessle2017-08-281-1/+7
| |/ / / / /
* / / / / / [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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |