Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure help is always after users | Joas Schilling | 2017-03-26 | 1 | -1/+1 |
* | Fix order as @jancborchardt requested | Morris Jobke | 2017-03-26 | 1 | -2/+2 |
* | Fix the tests | Joas Schilling | 2017-03-26 | 1 | -1/+9 |
* | Don't use the dropdown for one item only | Joas Schilling | 2017-03-26 | 2 | -3/+13 |
* | Allow multiple navigation links from info.xml | Joas Schilling | 2017-03-26 | 4 | -91/+119 |
* | Allow apps to register a setting via info.xml | Joas Schilling | 2017-03-26 | 1 | -0/+2 |
* | Move app management to the settings menu | Joas Schilling | 2017-03-26 | 4 | -33/+9 |
* | Manage the right side menu via the navigation manager as well | Joas Schilling | 2017-03-26 | 5 | -110/+145 |
* | Register the app management in the normal way | Joas Schilling | 2017-03-26 | 4 | -43/+12 |
* | Merge pull request #4063 from nextcloud/bump_dompurify | Christoph Wurst | 2017-03-26 | 3 | -8/+7 |
|\ | |||||
| * | Update bundled core.js | Roeland Jago Douma | 2017-03-26 | 1 | -1/+1 |
| * | [js] Bump DOMPurify | Roeland Jago Douma | 2017-03-26 | 2 | -7/+6 |
* | | Merge pull request #3895 from nextcloud/create-notification-when-update-serve... | Roeland Jago Douma | 2017-03-26 | 5 | -52/+158 |
|\ \ | |/ |/| | |||||
| * | Fix unit test | Joas Schilling | 2017-03-26 | 1 | -1/+1 |
| * | Also remove failure notification if no update is available | Morris Jobke | 2017-03-26 | 1 | -2/+4 |
| * | Create a notification when the update server couldn't be reached for some days | Joas Schilling | 2017-03-26 | 5 | -51/+155 |
|/ | |||||
* | Merge pull request #4053 from nextcloud/bump-zxcvbn | Morris Jobke | 2017-03-26 | 2 | -8/+7 |
|\ | |||||
| * | [3rdparty] Bump zxcvbn | Roeland Jago Douma | 2017-03-25 | 2 | -8/+7 |
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-26 | 34 | -24/+76 |
|/ | |||||
* | Merge pull request #4049 from nextcloud/fix-installation-again | Roeland Jago Douma | 2017-03-25 | 2 | -29/+206 |
|\ | |||||
| * | Don't run JSCombiner when not installed | Lukas Reschke | 2017-03-25 | 2 | -29/+206 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-25 | 50 | -86/+494 |
* | Merge pull request #4037 from nextcloud/downstream-27421 | Morris Jobke | 2017-03-24 | 1 | -6/+7 |
|\ | |||||
| * | Use authType BASIC for Sabre client in integration tests | Vincent Petry | 2017-03-24 | 1 | -6/+7 |
* | | Merge pull request #4043 from nextcloud/merge-js-for-template-prepend | Morris Jobke | 2017-03-24 | 2 | -23/+21 |
|\ \ | |||||
| * | | Merge JS for template prepend | Lukas Reschke | 2017-03-24 | 2 | -23/+21 |
* | | | Merge pull request #4044 from nextcloud/merge-login-js | Morris Jobke | 2017-03-24 | 2 | -5/+6 |
|\ \ \ | |||||
| * | | | Merge login JS | Lukas Reschke | 2017-03-24 | 2 | -5/+6 |
|/ / / | |||||
* | | | Merge pull request #4041 from nextcloud/merge-systemtags-js | Lukas Reschke | 2017-03-24 | 3 | -9/+15 |
|\ \ \ | |||||
| * | | | Merge systemtags JS | Lukas Reschke | 2017-03-24 | 3 | -9/+15 |
| | |/ | |/| | |||||
* | | | Merge pull request #4040 from nextcloud/merge-js-for-versions | Lukas Reschke | 2017-03-24 | 2 | -4/+7 |
|\ \ \ | |||||
| * | | | Merge JS for files_versions | Lukas Reschke | 2017-03-24 | 2 | -4/+7 |
| |/ / | |||||
* | | | Merge pull request #4042 from nextcloud/merge-js-forsharing-code | Lukas Reschke | 2017-03-24 | 2 | -9/+13 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge sharing backend JS | Lukas Reschke | 2017-03-24 | 2 | -9/+13 |
| |/ | |||||
* | | Merge pull request #4038 from nextcloud/merge-js-for-fileview | Morris Jobke | 2017-03-24 | 2 | -30/+30 |
|\ \ | |||||
| * | | Merge file view JS files | Lukas Reschke | 2017-03-24 | 2 | -30/+30 |
| |/ | |||||
* | | Merge pull request #4039 from nextcloud/merge-js-for-comments | Morris Jobke | 2017-03-24 | 2 | -7/+10 |
|\ \ | |/ |/| | |||||
| * | Merge JS for comments | Lukas Reschke | 2017-03-24 | 2 | -7/+10 |
|/ | |||||
* | Merge pull request #3988 from nextcloud/jscombiner | Lukas Reschke | 2017-03-24 | 15 | -5/+727 |
|\ | |||||
| * | Update autoloader | Roeland Jago Douma | 2017-03-24 | 2 | -0/+4 |
| * | Tests | Roeland Jago Douma | 2017-03-24 | 5 | -0/+384 |
| * | Add return | Roeland Jago Douma | 2017-03-24 | 1 | -1/+1 |
| * | Add debug mode | Roeland Jago Douma | 2017-03-24 | 3 | -2/+41 |
| * | Add caching | Roeland Jago Douma | 2017-03-24 | 2 | -7/+44 |
| * | Combine additional files_sharing scripts | Roeland Jago Douma | 2017-03-24 | 2 | -3/+6 |
| * | [PoC] JS Combiner | Roeland Jago Douma | 2017-03-24 | 6 | -2/+257 |
* | | Merge pull request #4021 from nextcloud/update-dependencies | Morris Jobke | 2017-03-24 | 1 | -0/+0 |
|\ \ | |||||
| * | | Update dependencies | Morris Jobke | 2017-03-24 | 1 | -0/+0 |
* | | | Merge pull request #3825 from nextcloud/federation-fixes | Björn Schießle | 2017-03-24 | 6 | -65/+121 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix tests | Bjoern Schiessle | 2017-03-24 | 2 | -8/+28 |