Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu | Lukas Reschke | 2017-05-02 | 2 | -0/+28 |
|\ | |||||
| * | Do not show an email action for contacts with emtpy email addresses | Christoph Wurst | 2017-05-02 | 2 | -0/+28 |
* | | Merge pull request #4636 from nextcloud/jquery-migrate-browser | Lukas Reschke | 2017-05-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | Remove dependency on jquery-migrate.js for browser detection | Morris Jobke | 2017-05-01 | 1 | -1/+1 |
* | | | Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codes | Lukas Reschke | 2017-05-02 | 3 | -8/+111 |
|\ \ \ | |||||
| * | | | Hide 2FA backup codes if no other 2FA providers are enabled | Christoph Wurst | 2017-05-02 | 3 | -8/+111 |
| | |/ | |/| | |||||
* | | | Merge pull request #4657 from nextcloud/add_caching_imageexport | Roeland Jago Douma | 2017-05-02 | 2 | -1/+20 |
|\ \ \ | |||||
| * | | | Fix tests | Roeland Jago Douma | 2017-05-02 | 1 | -1/+15 |
| * | | | Add caching to the imageexport plugin | Roeland Jago Douma | 2017-05-02 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge pull request #4651 from nextcloud/fix_appfetcher_update | Morris Jobke | 2017-05-02 | 6 | -36/+61 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bump version | Roeland Jago Douma | 2017-05-02 | 1 | -1/+1 |
| * | | Fix test | Roeland Jago Douma | 2017-05-02 | 1 | -20/+10 |
| * | | Make sure the AppFetcher fetches the new applist from the appstore | Roeland Jago Douma | 2017-05-02 | 4 | -15/+50 |
* | | | Merge pull request #4638 from nextcloud/fix-copy-tooltip | Lukas Reschke | 2017-05-02 | 1 | -3/+0 |
|\ \ \ | |||||
| * | | | Fix "Copied" message for public links | Morris Jobke | 2017-05-01 | 1 | -3/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #4649 from nextcloud/update-links-to-12 | Lukas Reschke | 2017-05-02 | 2 | -4/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Update documentation go.php URL to 12 | Lukas Reschke | 2017-05-02 | 2 | -4/+4 |
* | | | Merge pull request #4650 from nextcloud/appcache_on_updatev12.0.0beta1 | Lukas Reschke | 2017-05-02 | 3 | -78/+129 |
|\ \ \ | |/ / |/| | | |||||
| * | | Bump version | Roeland Jago Douma | 2017-05-02 | 1 | -1/+1 |
| * | | Fix and update tests | Roeland Jago Douma | 2017-05-02 | 1 | -65/+116 |
| * | | Do not do ETag caching when the version is updated | Roeland Jago Douma | 2017-05-02 | 1 | -12/+12 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-05-02 | 112 | -922/+2648 |
* | | Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-... | Morris Jobke | 2017-05-01 | 2 | -7/+54 |
|\ \ | |||||
| * | | Add missing space | Lukas Reschke | 2017-05-01 | 1 | -1/+1 |
| * | | Mark IP as whitelisted if brute force protection is disabled | Lukas Reschke | 2017-05-01 | 2 | -8/+55 |
* | | | Merge pull request #4626 from nextcloud/adjust-shipped-json | Lukas Reschke | 2017-05-01 | 1 | -4/+0 |
|\ \ \ | |||||
| * | | | Remove apps delivered from the appstore | Lukas Reschke | 2017-05-01 | 1 | -4/+0 |
* | | | | Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity | Lukas Reschke | 2017-05-01 | 1 | -87/+0 |
|\ \ \ \ | |||||
| * | | | | Remove unused methods from OC.Share | Morris Jobke | 2017-05-01 | 1 | -87/+0 |
| |/ / / | |||||
* | | | | Merge pull request #4612 from nextcloud/js-fix-long-lines | Roeland Jago Douma | 2017-05-01 | 2 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | Fix some long lines in JS - JSLinut recommendation | Morris Jobke | 2017-05-01 | 2 | -2/+8 |
* | | | | | Merge pull request #4613 from nextcloud/remove-unused | Roeland Jago Douma | 2017-05-01 | 1 | -371/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unused JS file | Morris Jobke | 2017-05-01 | 1 | -371/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #4599 from nextcloud/contactsmenu-mobile | Lukas Reschke | 2017-05-01 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Define max-width for Contacts menu for mobile | Jan-Christoph Borchardt | 2017-04-29 | 1 | -0/+1 |
* | | | | | | Merge pull request #4598 from nextcloud/menu-flashing | Lukas Reschke | 2017-05-01 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Prevent flashing of apps and user menu | Jan-Christoph Borchardt | 2017-04-29 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #4594 from nextcloud/theming-image-default | Morris Jobke | 2017-05-01 | 2 | -0/+69 |
|\ \ \ \ \ | |||||
| * | | | | | Delete theming images when logo/background is reset to default | Julius Härtl | 2017-04-30 | 2 | -0/+69 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #4527 from nextcloud/downstream-27504 | Morris Jobke | 2017-05-01 | 2 | -24/+65 |
|\ \ \ \ \ | |||||
| * | | | | | remove duplicate method | Robin Appelman | 2017-04-26 | 1 | -26/+8 |
| * | | | | | remove excessive logging | Robin Appelman | 2017-04-26 | 1 | -25/+8 |
| * | | | | | Add new specific tests for SMB | Juan Pablo Villafáñez | 2017-04-26 | 1 | -0/+19 |
| * | | | | | Adjust SMB permissions on the root | Juan Pablo Villafáñez | 2017-04-26 | 1 | -3/+60 |
* | | | | | | Merge pull request #4624 from nextcloud/email-settings-html | Lukas Reschke | 2017-05-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | fix email settings | Robin Appelman | 2017-05-01 | 1 | -1/+1 |
* | | | | | | Merge pull request #4610 from nextcloud/js-semicolons | Lukas Reschke | 2017-05-01 | 8 | -16/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix semicolon at end of JS lines | Morris Jobke | 2017-05-01 | 8 | -16/+16 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate | Lukas Reschke | 2017-05-01 | 3 | -4/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix variable definitions in oc dialogs | Morris Jobke | 2017-05-01 | 3 | -4/+6 |
| |/ / / / / |