mozilla
/
Jisort
зеркало из https://github.com/mozilla/Jisort.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
216 коммитов 16 Ветки 3 Теги 27 MiB
Граф коммитов

216 Коммитов

Автор SHA1 Сообщение Дата
Brian Mwadime 55ebef1b27 * Adds Icon quiz to database. 
* Adds Quiz data format.
 2016-07-03 20:37:38 +03:00
Brian Mwadime e50875ed8a Merge pull request #56 from icarius06/master 
Create activity_icon_quiz.xml
 2016-07-02 17:43:54 +03:00
Michael e101b93f89 Create activity_icon_quiz.xml 2016-07-02 17:39:32 +03:00
Brian Mwadime e2b754befc Merge pull request #54 from icarius06/master 
Icon Quiz Setup
 2016-07-02 16:42:38 +03:00
Michael 42932b3ca8 Update IconsFragment.java 2016-07-02 16:41:35 +03:00
Brian Mwadime 09adb8d863 Merge pull request #53 from iHub/deeplinking 
Updates
 2016-07-02 16:40:47 +03:00
Brian Mwadime 80b7a82d5b Updates 2016-07-02 16:36:52 +03:00
Brian Mwadime c1bfa690b1 Battery receiver bug fix 2016-07-02 16:36:12 +03:00
Michael 376b0eddd4 Update IconsFragment.java 2016-07-02 16:35:25 +03:00
Brian Mwadime 2508bfaee3 Adds Quiz selected icon. 2016-07-02 16:34:31 +03:00
Michael b55b80f3ff Create IconQuizActivity.java 2016-07-02 16:29:13 +03:00
Michael e225341442 Update AndroidManifest.xml 
Added the icon quiz activity to the manifest
 2016-07-02 16:27:55 +03:00
alex wafula 6c90079577 replaced black icons with white ones 2016-07-02 14:42:05 +03:00
Brian Mwadime 84e38df32b Fixes crashing on Bluetooth service due to to missing receiver definition in manifest file. 2016-07-02 13:17:48 +03:00
Brian Mwadime be9b5d81a4 Merge pull request #52 from iHub/deeplinking 
Merge conflict
 2016-07-02 13:03:31 +03:00
Brian Mwadime eaf527d6d4 Merge branch 'deeplinking' of github.com:iHub/Mozilla-DSO-Quiz-Application into deeplinking 2016-07-02 13:00:56 +03:00
Brian Mwadime 4537fb9281 Merge cnflict fix 2016-07-02 12:59:49 +03:00
Brian Mwadime 0597e00ad8 merge fixes 2016-07-02 12:58:04 +03:00
Brian Mwadime ddbae28c34 Updates for activity inheritance, file size reduction. 2016-07-02 12:52:33 +03:00
Brian Mwadime 6fe07e2b57 Merge conflict fix on DSOActivity.java 2016-07-02 12:51:38 +03:00
Brian Mwadime 4c561ce38c updates 2016-07-02 12:49:49 +03:00
Brian Mwadime 34cf005593 Merge cnflict fix 2016-07-02 12:36:39 +03:00
Brian Mwadime 56ff763427 Merge pull request #51 from secretrobotron/analytics 
Simple Analytics
 2016-07-02 12:29:42 +03:00
secretrobotron fbb7e53a86 replaced useless local variable 2016-07-02 12:18:38 +03:00
secretrobotron 240a738d52 Simple Analytics 
1. Created Analytics class.
2. Added Analytics tracking to various places.
 2016-07-02 12:15:45 +03:00
Brian Mwadime 462128596a Fixing merge conflict 2016-07-02 12:13:01 +03:00
Brian Mwadime 0bdb751fb4 Updates for activity inheritance, file size reduction. 2016-07-02 12:07:49 +03:00
Brian Mwadime 3f7ade0a28 * Resolving merge conflict on bootstrap_data.json file. 2016-07-02 12:06:24 +03:00
Brian Mwadime 52b808ac93 updates 2016-07-02 11:58:31 +03:00
Brian Mwadime 7466aa42fd Updates for activity inheritance, file size reduction. 2016-07-02 11:40:22 +03:00
Brian Mwadime 5d4a0177ce * Fixes issue with suggested topics cards and pubSub. 
* Remove a xxxhdpi resources. (highly unlikely participants will have devices with that resolution.)
* Removed unused classes.
 2016-07-02 11:20:20 +03:00
Brian Mwadime 98e373b8b1 Merge pull request #49 from iHub/contentFixes 
Removing links and dropping issue #47 for now
 2016-07-02 10:34:47 +03:00
alex wafula ada62b0695 Removing links and dropping issue #47 for now 2016-07-02 10:02:20 +03:00
Brian Mwadime ecceebd127 Merge pull request #48 from iHub/contentFixes 
Tagged content that needs to be linked, made a few revisions on conte…
 2016-07-02 09:25:38 +03:00
alex wafula 47ff65e516 Tagged content that needs to be linked, made a few revisions on content with the software group 2016-07-02 06:29:07 +03:00
Brian Mwadime 4359278c21 updates 2016-07-01 23:56:16 +03:00
Brian Mwadime b0d69e139d Merge pull request #45 from iHub/deeplinking 
Updates to events and FAB movement.
 2016-07-01 23:46:06 +03:00
Brian Mwadime b48d0e7400 Added low storage event. 2016-07-01 23:43:32 +03:00
Brian Mwadime 7ca820ffee * Fixes database table creation. 
* Fixes FAB going ofsscreen when dragged too far.
 2016-07-01 23:43:32 +03:00
Brian Mwadime b247823366 Merge pull request #44 from secretrobotron/fab-switching 
FAB becomes [in]visible depending on app state
 2016-07-01 23:41:37 +03:00
secretrobotron a4c0768ef1 FAB becomes [in]visible depending on app state 
1. Extended all appropriate activities from new DSOActivity.
2. DSOActivity watches for resume/pause and fires ApplicationStateChanged activity on bus.
3. Added DSOActivity.
4. Added ApplicationStateChanged.
 2016-07-01 23:12:53 +03:00
Brian Mwadime 8131f204ec Merge pull request #43 from secretrobotron/fab-improvements 
FAB icon switches when suggestions occur
 2016-07-01 22:41:46 +03:00
secretrobotron f97307b8e2 FAB icon switches when suggestions occur 
1. Implemented MainThreadBus in place of Bus to let messages pass between app threads.
2. Added new icons.
3. Added event capturing to ChatHeadService.
 2016-07-01 22:16:30 +03:00
Brian Mwadime 74aa1cbd51 Merge pull request #41 from secretrobotron/credits 
Added credits file with various credits
 2016-07-01 21:39:52 +03:00
Brian Mwadime ac341032d2 Merge pull request #40 from iHub/deeplinking 
Deeplinking
 2016-07-01 16:31:46 +03:00
secretrobotron c4b2676847 Added credits file with various credits 2016-07-01 16:30:59 +03:00
Brian Mwadime bede9438b1 Bump version 2016-07-01 16:20:56 +03:00
Brian Mwadime 049b839b22 Fixes crashing on bootstraping data. 2016-07-01 16:20:25 +03:00
Brian Mwadime 6e80970448 Merge pull request #38 from iHub/deeplinking 
Bug fixes
 2016-07-01 08:01:09 +03:00
Brian Mwadime bc5a5f21a5 Fixing icon colors in tutorial text and lineheight. 2016-07-01 08:00:08 +03:00