| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge vendor js | Roeland Jago Douma | 2017-03-23 | 4 | -13/+42658 |
| * | Merge pull request #3995 from nextcloud/files_scan_appdata | Lukas Reschke | 2017-03-23 | 2 | -1/+286 |
| |\ | |||||
| | * | Use proper name and code style | Morris Jobke | 2017-03-22 | 1 | -2/+2 |
| | * | Add files:scanAppData command | Roeland Jago Douma | 2017-03-22 | 2 | -1/+286 |
| * | | Merge pull request #3948 from nextcloud/downstream-27271 | Lukas Reschke | 2017-03-23 | 1 | -3/+8 |
| |\ \ | |||||
| | * | | fix path for files from root folder | Morris Jobke | 2017-03-22 | 1 | -1/+5 |
| | * | | In the real world id is an initial filename | Victor Dubiniuk | 2017-03-20 | 1 | -3/+4 |
| * | | | Merge pull request #3978 from nextcloud/scss_deps_memcache | Lukas Reschke | 2017-03-23 | 3 | -41/+116 |
| |\ \ \ | |||||
| | * | | | Fix tests | Roeland Jago Douma | 2017-03-22 | 1 | -31/+89 |
| | * | | | Cache SCSS dependency file in memcache | Roeland Jago Douma | 2017-03-22 | 3 | -11/+28 |
| * | | | | Merge pull request #3989 from nextcloud/files-external-save-button | Lukas Reschke | 2017-03-23 | 3 | -18/+17 |
| |\ \ \ \ | |||||
| | * | | | | replace autosave with a save button for external storage configuration | Robin Appelman | 2017-03-22 | 3 | -18/+17 |
| * | | | | | Merge pull request #3994 from nextcloud/only_init_backbone_once | Lukas Reschke | 2017-03-23 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | Only initialize backbone once | Roeland Jago Douma | 2017-03-22 | 1 | -1/+0 |
| * | | | | | | Merge pull request #3997 from nextcloud/backport-27353 | Roeland Jago Douma | 2017-03-23 | 3 | -26/+84 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Update davclient.js to 0.1.1 | Vincent Petry | 2017-03-22 | 3 | -26/+84 |
| * | | | | | | | Merge pull request #3999 from nextcloud/backport-27262 | Morris Jobke | 2017-03-23 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Updated UI messages relating to the encryption functionality | Matthew Setter | 2017-03-22 | 3 | -3/+3 |
| | |/ / / / / / | |||||
| * / / / / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-23 | 10 | -2/+52 |
| |/ / / / / / | |||||
| * | | | | / | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-22 | 62 | -20/+348 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | Merge pull request #3497 from nextcloud/mount-shared-last | Morris Jobke | 2017-03-22 | 4 | -4/+52 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| | * | | | | add integration test to ensure that shares dont overwrite external storages | Robin Appelman | 2017-03-22 | 2 | -2/+18 |
| | * | | | | mount shared mounts last | Robin Appelman | 2017-03-22 | 2 | -2/+34 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todo | Roeland Jago Douma | 2017-03-22 | 1 | -66/+0 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | Remove the cert as well | Joas Schilling | 2017-03-22 | 1 | -66/+0 |
| * | | | | Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js | Morris Jobke | 2017-03-22 | 7 | -42634/+16 |
| |\ \ \ \ | |||||
| | * | | | | Revert "Bundle vendor js" | Roeland Jago Douma | 2017-03-22 | 7 | -42634/+16 |
| |/ / / / | |||||
| * | | | | Merge pull request #3977 from nextcloud/di_ng2 | blizzz | 2017-03-22 | 7 | -19/+65 |
| |\ \ \ \ | |||||
| | * | | | | Register the namespace with the autoloading to allow reverse recovery | Joas Schilling | 2017-03-22 | 2 | -7/+26 |
| | * | | | | Also cache the namespace from appinfo | Joas Schilling | 2017-03-22 | 1 | -3/+4 |
| | * | | | | Add the AppContainer | Roeland Jago Douma | 2017-03-22 | 1 | -0/+8 |
| | * | | | | Don't do a recursive search | Joas Schilling | 2017-03-22 | 4 | -3/+24 |
| | * | | | | buildAppNamespace already has the fallback | Joas Schilling | 2017-03-22 | 1 | -11/+1 |
| | * | | | | Make DI work for all apps | Roeland Jago Douma | 2017-03-21 | 1 | -6/+13 |
| * | | | | | Merge pull request #3795 from nextcloud/bundle_vendor_js | Roeland Jago Douma | 2017-03-22 | 7 | -16/+42634 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| | * | | | | Handlebars is already loaded by core.js | Roeland Jago Douma | 2017-03-22 | 1 | -2/+0 |
| | * | | | | When debug don't load the bundled file | Roeland Jago Douma | 2017-03-22 | 1 | -2/+19 |
| | * | | | | No need to exit | Roeland Jago Douma | 2017-03-22 | 1 | -1/+0 |
| | * | | | | Bump core.js | Roeland Jago Douma | 2017-03-22 | 1 | -1/+2 |
| | * | | | | Add CI step to verify merged vendor js | Roeland Jago Douma | 2017-03-22 | 2 | -0/+34 |
| | * | | | | Bundle more default vendor js | Roeland Jago Douma | 2017-03-22 | 3 | -5/+4236 |
| | * | | | | Merge vendor js | Roeland Jago Douma | 2017-03-22 | 3 | -14/+38352 |
| | |/ / / | |||||
| * | | | | Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todo | Roeland Jago Douma | 2017-03-22 | 1 | -8/+1 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Remove ownCloud Root Authority as per todo | Joas Schilling | 2017-03-22 | 1 | -8/+1 |
| * | | | | Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip | Roeland Jago Douma | 2017-03-22 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Remove tooltip of delete button for systemtags | Morris Jobke | 2017-03-21 | 1 | -0/+1 |
| * | | | | Merge pull request #3972 from nextcloud/merge-some-more-css | Roeland Jago Douma | 2017-03-22 | 15 | -13/+13 |
| |\ \ \ \ | |||||
| | * | | | | fix path | Morris Jobke | 2017-03-21 | 2 | -1/+1 |
| | * | | | | Merge some CSS files using our SCSS compiler | Lukas Reschke | 2017-03-21 | 15 | -13/+13 |
| * | | | | | Merge pull request #3980 from nextcloud/fix-app-menu-triangle | Christoph Wurst | 2017-03-22 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |