summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menuLukas Reschke2017-05-022-0/+28
|\
| * Do not show an email action for contacts with emtpy email addressesChristoph Wurst2017-05-022-0/+28
* | Merge pull request #4636 from nextcloud/jquery-migrate-browserLukas Reschke2017-05-021-1/+1
|\ \
| * | Remove dependency on jquery-migrate.js for browser detectionMorris Jobke2017-05-011-1/+1
* | | Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codesLukas Reschke2017-05-023-8/+111
|\ \ \
| * | | Hide 2FA backup codes if no other 2FA providers are enabledChristoph Wurst2017-05-023-8/+111
| | |/ | |/|
* | | Merge pull request #4657 from nextcloud/add_caching_imageexportRoeland Jago Douma2017-05-022-1/+20
|\ \ \
| * | | Fix testsRoeland Jago Douma2017-05-021-1/+15
| * | | Add caching to the imageexport pluginRoeland Jago Douma2017-05-021-0/+5
| |/ /
* | | Merge pull request #4651 from nextcloud/fix_appfetcher_updateMorris Jobke2017-05-026-36/+61
|\ \ \ | |/ / |/| |
| * | Bump versionRoeland Jago Douma2017-05-021-1/+1
| * | Fix testRoeland Jago Douma2017-05-021-20/+10
| * | Make sure the AppFetcher fetches the new applist from the appstoreRoeland Jago Douma2017-05-024-15/+50
* | | Merge pull request #4638 from nextcloud/fix-copy-tooltipLukas Reschke2017-05-021-3/+0
|\ \ \
| * | | Fix "Copied" message for public linksMorris Jobke2017-05-011-3/+0
| | |/ | |/|
* | | Merge pull request #4649 from nextcloud/update-links-to-12Lukas Reschke2017-05-022-4/+4
|\ \ \ | |_|/ |/| |
| * | Update documentation go.php URL to 12Lukas Reschke2017-05-022-4/+4
* | | Merge pull request #4650 from nextcloud/appcache_on_updatev12.0.0beta1Lukas Reschke2017-05-023-78/+129
|\ \ \ | |/ / |/| |
| * | Bump versionRoeland Jago Douma2017-05-021-1/+1
| * | Fix and update testsRoeland Jago Douma2017-05-021-65/+116
| * | Do not do ETag caching when the version is updatedRoeland Jago Douma2017-05-021-12/+12
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-05-02112-922/+2648
* | Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-...Morris Jobke2017-05-012-7/+54
|\ \
| * | Add missing spaceLukas Reschke2017-05-011-1/+1
| * | Mark IP as whitelisted if brute force protection is disabledLukas Reschke2017-05-012-8/+55
* | | Merge pull request #4626 from nextcloud/adjust-shipped-jsonLukas Reschke2017-05-011-4/+0
|\ \ \
| * | | Remove apps delivered from the appstoreLukas Reschke2017-05-011-4/+0
* | | | Merge pull request #4615 from nextcloud/js-reduce-share.js-complexityLukas Reschke2017-05-011-87/+0
|\ \ \ \
| * | | | Remove unused methods from OC.ShareMorris Jobke2017-05-011-87/+0
| |/ / /
* | | | Merge pull request #4612 from nextcloud/js-fix-long-linesRoeland Jago Douma2017-05-012-2/+8
|\ \ \ \
| * | | | Fix some long lines in JS - JSLinut recommendationMorris Jobke2017-05-012-2/+8
* | | | | Merge pull request #4613 from nextcloud/remove-unusedRoeland Jago Douma2017-05-011-371/+0
|\ \ \ \ \
| * | | | | Remove unused JS fileMorris Jobke2017-05-011-371/+0
| |/ / / /
* | | | | Merge pull request #4599 from nextcloud/contactsmenu-mobileLukas Reschke2017-05-011-0/+1
|\ \ \ \ \
| * | | | | Define max-width for Contacts menu for mobileJan-Christoph Borchardt2017-04-291-0/+1
* | | | | | Merge pull request #4598 from nextcloud/menu-flashingLukas Reschke2017-05-011-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Prevent flashing of apps and user menuJan-Christoph Borchardt2017-04-291-2/+2
| |/ / / /
* | | | | Merge pull request #4594 from nextcloud/theming-image-defaultMorris Jobke2017-05-012-0/+69
|\ \ \ \ \
| * | | | | Delete theming images when logo/background is reset to defaultJulius Härtl2017-04-302-0/+69
| | |/ / / | |/| | |
* | | | | Merge pull request #4527 from nextcloud/downstream-27504Morris Jobke2017-05-012-24/+65
|\ \ \ \ \
| * | | | | remove duplicate methodRobin Appelman2017-04-261-26/+8
| * | | | | remove excessive loggingRobin Appelman2017-04-261-25/+8
| * | | | | Add new specific tests for SMBJuan Pablo Villafáñez2017-04-261-0/+19
| * | | | | Adjust SMB permissions on the rootJuan Pablo Villafáñez2017-04-261-3/+60
* | | | | | Merge pull request #4624 from nextcloud/email-settings-htmlLukas Reschke2017-05-011-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | fix email settingsRobin Appelman2017-05-011-1/+1
* | | | | | Merge pull request #4610 from nextcloud/js-semicolonsLukas Reschke2017-05-018-16/+16
|\ \ \ \ \ \
| * | | | | | Fix semicolon at end of JS linesMorris Jobke2017-05-018-16/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplateLukas Reschke2017-05-013-4/+6
|\ \ \ \ \ \
| * | | | | | Fix variable definitions in oc dialogsMorris Jobke2017-05-013-4/+6
| |/ / / / /