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

216 Коммитов

Автор SHA1 Сообщение Дата
Brian Mwadime 3b544242bd fixes #146, returns icons in content. 2016-07-12 09:08:33 +03:00
Brian Mwadime 6327917995 Merge pull request #145 from secretrobotron/cleanup1 
Mergin in assorted cleanup.
 2016-07-12 07:55:49 +03:00
secretrobotron 28cb896759 More content fixes. 
1. Shrunk trackingdata2.png (a lot).
2. Fixed bad img tag that was causing crash in tracking_data
 2016-07-11 22:00:35 +03:00
secretrobotron 5328cd9e36 fixed more of bootstrap_data to revert back to changes made yesterday 2016-07-11 21:51:24 +03:00
secretrobotron 0a0408242a removed second icon quiz reference 2016-07-11 21:50:54 +03:00
secretrobotron 89f92de8a5 Continued reverting Mobile Data Usage. 
Fixed gifs and removed unneeded file.
 2016-07-11 21:40:03 +03:00
secretrobotron 14d6a4556d Reverting Mobile Data Usage 
Taking Mobile Data Usage back to e52c45549e where it was fixed...
 2016-07-11 21:38:09 +03:00
secretrobotron d6e633da00 Fixed Connect to Wi-Fi last few steps. 
1. Removed step 8 from Connect to Wi-Fi.
2. Added a transparent-border bmo to step 7.
3. Fixed a couple errors in bootstrap_json.

Fixes #92.
 2016-07-11 21:14:21 +03:00
secretrobotron f19e29fe44 Fixed playstore1.png 
Added transparent border to accommodate match_parent in layout.
 2016-07-11 21:12:55 +03:00
secretrobotron 321e87ff5f Tutorial Slide Button Fixes 
Added redundant logic to onclick listeners for buttons so they always (re)enable properly at ends of tutorials.
 2016-07-11 20:37:58 +03:00
secretrobotron 9bc71ad8d9 Some cleanup 
1. Reduced dimensions of playstore1.png (again).
2. Fixed broken playstore5.gif.
3. Added a test emoji :happy: to bootstrap_data.json.
4. Fixed up some hashmap entries in EmojiUtils and added some redundancy.
 2016-07-11 20:19:09 +03:00
Brian Mwadime 268ad74169 Merge pull request #142 from iHub/bugfixes 
Merges content fixes.
 2016-07-11 18:58:42 +03:00
Brian Mwadime 3ce984e97f Adds gmail icon. resolves #91 2016-07-11 18:56:45 +03:00
Brian Mwadime 33a9717f93 resolves #82 2016-07-11 18:31:37 +03:00
Brian Mwadime bf7770a1af Merge pull request #141 from iHub/bugfixes 
Merging content fixes from @secretrobotron
 2016-07-11 17:33:37 +03:00
Brian Mwadime b8a82bf02b Fixes content references #73. @secretrobotron moved your changes here due to the merge conflict. 2016-07-11 17:26:13 +03:00
Brian Mwadime 5190e66ff4 Updates referenes #122 2016-07-11 16:45:13 +03:00
Brian Mwadime f1015ee3ab Merge pull request #140 from iHub/bugfixes 
Merging FUNMODE toggle
 2016-07-11 13:23:45 +03:00
Brian Mwadime 56d3e3ece8 Added toggle on dashboard to enable/disable FUNMODE. references #89 2016-07-11 13:19:23 +03:00
Brian Mwadime 03a672475a Removing unused files. 2016-07-11 12:59:32 +03:00
Brian Mwadime b6f059490b Merge pull request #139 from iHub/bugfixes 
Merging FUNMODE functionality.
 2016-07-11 12:55:49 +03:00
Brian Mwadime ac03aee5b0 FUNMODE fully working. resolves #89 2016-07-11 12:53:12 +03:00
Brian Mwadime 045b522aca Merge pull request #138 from iHub/bugfixes 
Merging bugfixes
 2016-07-11 09:34:59 +03:00
Brian Mwadime 127b21956b Resolves #122 2016-07-11 09:33:07 +03:00
Brian Mwadime b523f9d4b5 Setup for emojis 2016-07-11 09:19:48 +03:00
Brian Mwadime 168f6c0d50 revert andridmanifest edit 2016-07-11 09:19:48 +03:00
Brian Mwadime 18ff48b287 Merge pull request #128 from secretrobotron/quiz-updates 
Icon Quiz Updates
 2016-07-11 09:10:08 +03:00
secretrobotron 31d3795f99 Fixes #123 
1. Added gifs for quiz results.
2. Added GifImageView to activity_result to draw a random gif.
3. Added logic to ResultActivity to pick a random gif.
 2016-07-11 08:40:41 +03:00
secretrobotron 5f7dd213bc Icon Quiz Updates 
1. Fixed style of icon screen leading to quiz.
2. Placed icon topic at top of dashboard.
3. Changed colour of icon topic.
4. Added icons.
5. Added lots of quiz questions.
6. Made quiz items much more random.
 2016-07-11 08:40:33 +03:00
Brian Mwadime 9aaed31d92 Merge pull request #129 from secretrobotron/t97 
Fixes #97
 2016-07-11 08:04:44 +03:00
Brian Mwadime e60658e667 Merge pull request #133 from secretrobotron/t130 
Content (copy and image) edits
 2016-07-11 08:04:09 +03:00
Brian Mwadime b6d24c1e86 Merge pull request #134 from secretrobotron/t127 
Added playstore content
 2016-07-11 08:03:53 +03:00
Brian Mwadime 126cc14ae7 Merge pull request #135 from secretrobotron/t109 
improved trackingdata1.gif
 2016-07-11 08:03:44 +03:00
Brian Mwadime 922b52e19e Merge pull request #136 from secretrobotron/t102 
shrunk data2.png
 2016-07-11 08:03:35 +03:00
secretrobotron d475c62be4 shrunk data2.png 2016-07-10 22:24:04 +03:00
secretrobotron e52c45549e added whatsapp settings gif and fixed spelling 2016-07-10 22:16:17 +03:00
secretrobotron 173f826073 improved trackingdata1.gif 2016-07-10 22:03:59 +03:00
secretrobotron 5aa495c358 reduced size of playstore5.gif 2016-07-10 21:48:39 +03:00
secretrobotron 09acb0582c replaced playstore5.png with playstore5.gif 2016-07-10 21:44:44 +03:00
secretrobotron 11e740d9cb added playstore4.gif 2016-07-10 21:34:23 +03:00
secretrobotron ae6b3b18a3 added playstore6.png 2016-07-10 21:26:13 +03:00
secretrobotron 3a6316e34b added playstore7.png 2016-07-10 21:23:36 +03:00
secretrobotron cdda9ae296 fixed topic titles 2016-07-10 21:17:41 +03:00
secretrobotron 0cd9798ac4 fixed up Airplane Mode 2016-07-10 21:13:30 +03:00
secretrobotron 9d915ffd48 fixed up Freeing up Memory 2016-07-10 21:08:33 +03:00
secretrobotron 5305a289c1 fixed up Mobile Data Consumption 2016-07-10 20:49:16 +03:00
secretrobotron dd96940bc1 fixed up connecting to wifi tutorial 2016-07-10 20:43:00 +03:00
secretrobotron 79ba9d73fa Copy edits from Laura 2016-07-10 20:29:07 +03:00
secretrobotron c6c3ed09b6 Fixes #97 
Switched link in last step of play store tutorial to data/6.
 2016-07-10 10:21:05 +03:00
Brian Mwadime 77384a6dc4 Merge pull request #121 from secretrobotron/icon-quiz-feedback-fixes 
Edits to Icon screen based on participant feedback
 2016-07-09 16:58:41 +03:00