From 6329a88d0b93a30412efdb1f5aa33ba06514d148 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sat, 25 Feb 2017 20:19:44 +0100 Subject: [PATCH 1/6] Update README.md --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 56f0149..e7e660a 100644 --- a/README.md +++ b/README.md @@ -1 +1,11 @@ -This repository maintains the source for the IntelliQ.me [Android app](https://github.com/IntelliQ/Android/tree/master/IntelliQ/mobile/src/main/java/com/steppschuh/intelliq), as well the [backend](https://github.com/IntelliQ/Android/tree/master/IntelliQ/backend/src/main/java/com/intelliq/appengine). +# Android App +The [mobile](https://github.com/IntelliQ/Android/tree/master/IntelliQ/mobile/src/main/java/com/steppschuh/intelliq) module contains the sources of the app for Android phones & tablets. The [wear](https://github.com/IntelliQ/Android/tree/master/IntelliQ/wear/src/main/java/com/steppschuh/intelliq) module contains the sources of the app for Android wear devices (not available yet). + +# Backend +The [backend](https://github.com/IntelliQ/Android/tree/master/IntelliQ/backend/src/main/java/com/intelliq/appengine) module contains the sources for the Google App Engine Java project, available through the GCP at [intelliq-me.appspot.com](https://intelliq-me.appspot.com/). + +## API +The sources for the API endpoints which the Android, iOS and Web apps use can be found [here](https://github.com/IntelliQ/Android/tree/master/IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint). The documentation for these endpoints is still work in progress. + +## Websites +The sources for all the websites that the backend serves can be found [here](https://github.com/IntelliQ/Android/tree/master/IntelliQ/backend/src/main/webapp). This includes the [landing page](https://intelliq.me/), the [web app](https://intelliq.me/apps/web/) and the [management console](https://intelliq.me/manage/). From 4df69dde4f6647e8c73f999bef80ea6ac3ca84c5 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sat, 25 Feb 2017 21:40:46 +0100 Subject: [PATCH 2/6] Updated gradle version --- IntelliQ/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntelliQ/build.gradle b/IntelliQ/build.gradle index 53f4fad..74b2ab0 100755 --- a/IntelliQ/build.gradle +++ b/IntelliQ/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' + classpath 'com.android.tools.build:gradle:2.2.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From dd0515931cf6c13962aec967f58116a1cf7e7965 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sat, 25 Feb 2017 21:42:00 +0100 Subject: [PATCH 3/6] Fixed check for invalid queueItemKeyIds, fixes #19 --- IntelliQ/backend/src/main/webapp/static/js/webapp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntelliQ/backend/src/main/webapp/static/js/webapp.js b/IntelliQ/backend/src/main/webapp/static/js/webapp.js index e1d0248..fc9ac5e 100644 --- a/IntelliQ/backend/src/main/webapp/static/js/webapp.js +++ b/IntelliQ/backend/src/main/webapp/static/js/webapp.js @@ -185,7 +185,7 @@ function requestRecentQueueItemKeyIds() { var queueItemKeyIds = []; var addQueueItemKeyId = function(queueItemKeyId) { - if (queueItemKeyId == null && queueItemKeyId < 0) { + if (queueItemKeyId == null || queueItemKeyId < 0) { return; } if (queueItemKeyIds.indexOf(queueItemKeyId) > -1) { From b1d6e93edc515f4f3657aac1f12b4bb7294b3f76 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sat, 25 Feb 2017 21:53:51 +0100 Subject: [PATCH 4/6] Renamed tracking script, fixes #20 --- .../src/main/webapp/static/js/{tracking.js => analyze.js} | 0 .../src/main/webapp/website/includes/en/common_footer.jsp | 2 +- .../src/main/webapp/website/includes/en/webapp_footer.jsp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename IntelliQ/backend/src/main/webapp/static/js/{tracking.js => analyze.js} (100%) diff --git a/IntelliQ/backend/src/main/webapp/static/js/tracking.js b/IntelliQ/backend/src/main/webapp/static/js/analyze.js similarity index 100% rename from IntelliQ/backend/src/main/webapp/static/js/tracking.js rename to IntelliQ/backend/src/main/webapp/static/js/analyze.js diff --git a/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp b/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp index ba5f29c..1789545 100644 --- a/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp +++ b/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp @@ -80,7 +80,7 @@ - + diff --git a/IntelliQ/backend/src/main/webapp/website/includes/en/webapp_footer.jsp b/IntelliQ/backend/src/main/webapp/website/includes/en/webapp_footer.jsp index 79079a5..f5a92a1 100644 --- a/IntelliQ/backend/src/main/webapp/website/includes/en/webapp_footer.jsp +++ b/IntelliQ/backend/src/main/webapp/website/includes/en/webapp_footer.jsp @@ -44,7 +44,7 @@ - + From 9954b9840473646f4bb61ecd1a2c262cdc999bfc Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sat, 25 Feb 2017 22:16:49 +0100 Subject: [PATCH 5/6] Added GitHub url to footer --- .../src/main/webapp/website/includes/en/common_footer.jsp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp b/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp index 1789545..96bb990 100644 --- a/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp +++ b/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp @@ -63,15 +63,14 @@
- Developed with love by - Steppschuh + Developed with love by Steppschuh, open source on GitHub
From 606c13e2684e656e73b065212f299432a48307e3 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sat, 25 Feb 2017 22:26:55 +0100 Subject: [PATCH 6/6] Adjusted footer content based on screen size --- .../src/main/webapp/website/includes/en/common_footer.jsp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp b/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp index 96bb990..d81a32b 100644 --- a/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp +++ b/IntelliQ/backend/src/main/webapp/website/includes/en/common_footer.jsp @@ -69,8 +69,11 @@
-
- Developed with love by Steppschuh, open source on GitHub +
+ Developed with love by Steppschuh - open sourced on GitHub +
+
+ Developed by Steppschuh - source on GitHub