Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IntelliQ/backend/src/main/webapp/static/js/webapp.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,17 @@
<ul>
<li><a class="white-text" href="${rootUrl}/apps/">Apps</a></li>
<li><a class="white-text" href="${rootUrl}/manage/">Manage</a></li>
<li><a class="white-text" href="${rootUrl}/press/">Press</a></li>
<li><a class="white-text" href="${rootUrl}/imprint/">Imprint</a></li>
</ul>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
Developed with love by
<a class="accent-color-text text-lighten-3" href="http://steppschuh.net/">Steppschuh</a>
<div class="container hide-on-small-only">
Developed with love by <a class="accent-color-text text-lighten-3" href="http://steppschuh.net/">Steppschuh</a> - open sourced on <a class="accent-color-text text-lighten-3" href="https://github.com/IntelliQ">GitHub</a>
</div>
<div class="container hide-on-small-and-up">
Developed by <a class="accent-color-text text-lighten-3" href="http://steppschuh.net/">Steppschuh</a> - source on <a class="accent-color-text text-lighten-3" href="https://github.com/IntelliQ">GitHub</a>
</div>
</div>
</footer>
Expand All @@ -80,7 +82,7 @@
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="${staticUrl}js/materialize.js"></script>
<script src="${staticUrl}js/init.js"></script>
<script src="${staticUrl}js/tracking.js"></script>
<script src="${staticUrl}js/analyze.js"></script>
<script src="${staticUrl}js/general.js"></script>
<script src="${staticUrl}js/authenticator.js" defer></script>
<script src="${staticUrl}js/api.js" defer></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="${staticUrl}js/materialize.js"></script>
<script src="${staticUrl}js/init.js"></script>
<script src="${staticUrl}js/tracking.js"></script>
<script src="${staticUrl}js/analyze.js"></script>
<script src="${staticUrl}js/general.js"></script>
<script src="${staticUrl}js/authenticator.js" defer></script>
<script src="${staticUrl}js/api.js" defer></script>
Expand Down
2 changes: 1 addition & 1 deletion IntelliQ/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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/).