summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #6342 from nextcloud/rich-link-previewRoeland Jago Douma2017-09-041-8/+22
|\ \
| * | Add rich link preview to the login pageJulius Härtl2017-09-021-8/+22
* | | 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-046-7/+25
|\ \ \ \
| * | | | Add mimetype support for .URL (Windows) and .webloc (macOS) files. Update pla...Thomas Ebert2017-08-316-7/+25
| | |_|/ | |/| |
* | | | Merge pull request #6334 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-041-4/+4
|\ \ \ \
| * | | | Fix naming of user id in email meta dataJoas Schilling2017-09-011-4/+4
| | |/ / | |/| |
* | | | Merge pull request #6221 from nextcloud/fav_share_api_fixMorris Jobke2017-09-043-19/+50
|\ \ \ \
| * | | | Correctly format OCS response with favoritesRoeland Jago Douma2017-08-293-19/+50
* | | | | Merge pull request #6352 from nextcloud/scss-rebuild-frontend-controllerMorris Jobke2017-09-031-1/+2
|\ \ \ \ \
| * | | | | Rebuild SCSS files if frontend controller value changesJulius Härtl2017-09-031-1/+2
* | | | | | Merge pull request #6341 from nextcloud/jquery-ui-scssMorris Jobke2017-09-037-61/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix font colorMorris Jobke2017-09-031-7/+6
| * | | | | Remove unnecessary files for jquery-ui-fixesJulius Härtl2017-09-037-9/+2
| * | | | | Use SCSS for jquery-ui-fixesJulius Härtl2017-09-023-55/+87
| | |_|_|/ | |/| | |
* | | | | Merge pull request #6344 from nextcloud/theming-invert-thresholdMorris Jobke2017-09-032-2/+2
|\ \ \ \ \
| * | | | | Change invertion threshold to 55%Julius Härtl2017-09-022-2/+2
| |/ / / /
* / / / / [tx-robot] updated from transifexNextcloud bot2017-09-034-2/+38
|/ / / /
* | / / [tx-robot] updated from transifexNextcloud bot2017-09-0218-4/+106
| |/ / |/| |
* | | [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