diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-09-28 17:34:09 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-09-28 17:34:09 +0200 |
| commit | 7fea47b63e233daa98416807c44935a2847a59b8 (patch) | |
| tree | 89e07afaf1f3c46dd223585213f1972ffc77bf8c | |
| parent | 9f49853d5fefaf26597c8da992b47bb801b2f066 (diff) | |
| parent | 754ea8e03f70999a08d9ea172b423aeeb6dcc413 (diff) | |
Merge branch 'master' of https://github.com/nextcloud/contacts into vue
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | js/contacts-inject-14.js | 1 | ||||
| -rw-r--r-- | templates/main.php | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -61,6 +61,12 @@ make build-js # build for production with minification make build-js-production ``` +## Running tests +You can use the provided Makefile to run all tests by using: + +``` +make test +``` ## :v: Code of conduct diff --git a/js/contacts-inject-14.js b/js/contacts-inject-14.js new file mode 100644 index 00000000..7d0e6951 --- /dev/null +++ b/js/contacts-inject-14.js @@ -0,0 +1 @@ +$('#content.app-contacts').attr('ng-app', 'contactsApp');
\ No newline at end of file diff --git a/templates/main.php b/templates/main.php index 8fb38f52..e53cedb0 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,4 +1,4 @@ <?php script('contacts', 'contacts'); style('contacts', 'contacts'); -?>
\ No newline at end of file +?> |