Commit graph

25384 commits

Author SHA1 Message Date
Ken Wakasa
d034fab2e6 am 27839735: am d8f59a22: am 94fa785f: am e8add6a7: am 025bccfe: am 4dc923a0: am 92222c0a: am 0fd373ee: am 863e281d: am db3591a8: am df354cb1: am 6c97d676: am 4c7474d5: am c5a29fa8: Revert "Fix exact match profanity"
* commit '27839735b10f7f79cc2d05565c024e71a48cbecb':
2013-10-10 00:30:39 -07:00
Tadashi G. Takaoka
6c3600e578 am 4a1b9af9: am e30f00fd: am 784ea595: am 80703bbd: am f1a2a974: am 1da1feda: am e5a34868: am b4c9cc63: am d6e17195: am 3fe6c4f4: am 3792fa4b: am 4e8fde00: am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
* commit '4a1b9af9b3f1974a05f41fe74c078a85db9943d3':
2013-10-10 00:30:35 -07:00
Tadashi G. Takaoka
ea9ed82b6f am c9a90a9f: am 2f767467: am f28d2fd7: am e497a1e3: am 268d298a: am 4bd7d179: am 4ffc9322: am 2097f0d4: am 4dd37bb7: am 4565c8b2: am db92fe62: am 3c93fdc8: am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit 'c9a90a9fd00c21f54ebb319035a3b49cc0fcab01':
2013-10-10 00:30:30 -07:00
Tadashi G. Takaoka
e040659e60 am 0e9627b7: am 18e39765: am a847241d: am edb14be9: am 72cdf3ea: am a390047b: am fef4c342: am 41466ebc: am aac0783f: am 13afe2ca: am 503ab45a: am 62dd1ee3: am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit '0e9627b7fa2241bc0bb6f51ebd5691dc3ab09d0d':
2013-10-10 00:30:25 -07:00
Baligh Uddin
88a5caf82c am 6dfdd900: am 5e5eb38c: am 59212e9b: am 3497dd42: am 9e98458a: am 158b3c2c: am 31b3a24f: (-s ours) am 6fa88d6e: (-s ours) am d1864bac: (-s ours) am deeaf9ae: (-s ours) am da33179c: (-s ours) am 0a0b9fe2: (-s ours) am 276ed0d6: (-s ours) am 9e0ffd35: (-s ours) am f9a
* commit '6dfdd90096a1a7d0ea58dc9ac24eac6ca48a7ff5':
2013-10-10 00:30:20 -07:00
Baligh Uddin
b06746aad4 am 04a96173: am 986ffb1e: am d8ab4a4f: am fbcaa181: am a0ba17eb: (-s ours) am d7903e25: (-s ours) am 0c64b713: (-s ours) am 6459733a: (-s ours) am 3d7c4cc1: (-s ours) am bdf7113c: (-s ours) am c7f37218: (-s ours) am bc6fd1a6: (-s ours) am 11d4d240: am 39b3bf8d: (-s ou
* commit '04a96173d61433873b32cc8bd6368f78ab2a694a':
2013-10-10 00:30:15 -07:00
Baligh Uddin
60fbf12cbd am f87c516c: am 4748dde7: am eb19da16: am abe3f2ff: (-s ours) am d72b5944: (-s ours) am 1110bd5d: (-s ours) am 5ee45793: (-s ours) am cf904030: (-s ours) am 5a8c2fac: (-s ours) am 62bf6fa5: (-s ours) am 0ffe46a1: (-s ours) am a8fb8b4b: (-s ours) am e351e10a: Merge "Im
* commit 'f87c516c935ad507d06243cc5605848d99890221':
2013-10-10 00:30:11 -07:00
Baligh Uddin
a8ebcab727 am 2a916374: am d0ff18ca: am d72a28a2: am a047d6c7: (-s ours) am e1fd5de3: (-s ours) am 4fe1f32a: (-s ours) am 95be27fd: (-s ours) am 70a09b36: (-s ours) am 5aab3bb3: (-s ours) am d72c805d: (-s ours) am a2942457: (-s ours) am 168d43d7: (-s ours) am dde8e9e3: (-s ours)
* commit '2a916374ede0bd9b6dae5f3427603c24c8882017':
2013-10-10 00:30:07 -07:00
Tadashi G. Takaoka
4c4ac488b3 am 3cf0f553: am af17808c: am f986d323: am 5d0647e3: am efd0cfb8: am 7e9672cf: am 25cbda13: am d19e8451: am 801a8876: am 59b93354: am 2a06798e: am 6600b06c: am cd196fd5: am 307f49b8: Mark some unit tests as @MediumTest
* commit '3cf0f5533d3654d5fd2e28a3c7d452f0867270a2':
2013-10-10 00:30:02 -07:00
Satoshi Kataoka
4134098cfe am 8b3f8a91: am 26997ed5: am 0f7b2041: am 25646cd3: am 290be747: (-s ours) am ee96815b: (-s ours) am c7f05e44: am acfbfcbe: (-s ours) am c6d49148: (-s ours) am 8fad5d83: (-s ours) am 6f9617ab: (-s ours) am 77c6d2bb: (-s ours) am 25a713d6: am 11b9f680: (-s ours) am e5d
* commit '8b3f8a913a137d12b956ad8bfc4d499af62ed599':
2013-10-10 00:29:58 -07:00
Jean Chalard
64db1c9ff5 am 7772f21c: am cf532af6: am 0d0489d1: am 12fead22: am 51ed7879: am 6b62c6e9: am 94018741: am b4d9d140: am 6bee71b3: am d0981b0f: am 771b60ba: am e229cd97: am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit '7772f21c58298c82e8d64b19c228ce58745c9ca9':
2013-10-10 00:29:54 -07:00
Ken Wakasa
2f66553720 am 230ae9e7: am 1b56e1a7: am 8052549e: am 36e5a5ce: am c31ce3a5: am 122e4514: am 18c95594: am 1fd7d6b9: am 5b04d8b5: am 43d34fb8: am af1196dd: am f415cc6b: am 56550ee5: am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit '230ae9e7d0bd52e0405b81889d2ef064bd10843c':
2013-10-10 00:29:50 -07:00
Satoshi Kataoka
533c90e613 am 1445ad55: am c1821fbc: am bdfafecb: am ef59fb91: am e5f448bb: am 7438e6bc: am ef95a3d0: am 17c8d766: am ee180b02: am f00f84a7: am 679bff89: am 8781e3b6: am 483fc6f1: am c43417fb: Fix build
* commit '1445ad5577bb91e7cbc09a857495b4185caed7a2':
2013-10-10 00:29:45 -07:00
Jean Chalard
6fd0925db8 am b9a729e6: am 5f0dbdc5: am b6f3e6ee: am e8707d37: am 556601dc: am 143e6f2d: am dd199e6b: am 6adf817f: am fb238e46: am 0c179788: am 1b62da75: am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
* commit 'b9a729e6a53adef96553a294c3f039d679d2f36f':
2013-10-10 00:29:40 -07:00
Baligh Uddin
5145996ace am e9730002: am f3aee4ad: am 42b9f1fc: am d990ab52: am aa13c1f0: am 909cbd1f: am e3923e65: am 28685e72: am 7ed4f366: am 6dcfbae4: am 4827a249: am c363302e: Merge commit \'3ac40c6a\' into jb-mr2-dev-plus-aosp
* commit 'e97300023379fce6271593743238e2f25d4a3699':
2013-10-10 00:29:36 -07:00
Tadashi G. Takaoka
7b447912c9 am b151752c: am 5e9ff77f: am 959fb50f: am fd46ed1d: am e11061e4: am 747372d5: am d89d9136: am ce5aedf7: am 18ece47e: am fe4cdd12: am 8923d767: am 1e08d3d2: am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
* commit 'b151752cbb903b80573bfbf0eafec87ceaf1af4a':
2013-10-10 00:29:32 -07:00
Satoshi Kataoka
8198e5ae98 am df0af5b4: am 792f1db8: am ca02610e: am b87f034d: am 5568ca2a: am c4c5d046: am 802d8334: am 50704547: am 4e90125e: am 07806b03: am 1749dba1: am d53fb22a: am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"
* commit 'df0af5b4a8bf92c7277de3f5ae8e8ca3c2b17cd5':
2013-10-10 00:29:27 -07:00
Tadashi G. Takaoka
b207d8ce7d am d87c74f2: am 547b15e0: am 3a0ba7ad: am d64d8afb: am 953a0bfd: am f2b2b69c: am cda685f6: am 7ffb4225: am 1b6271fc: am 95fed887: am 35952d7b: am 2f6851d9: am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
* commit 'd87c74f202eb4f84253465a2c262f14304f053ff':
2013-10-10 00:29:23 -07:00
Satoshi Kataoka
c8be93bd60 am fd549c7a: am 375ff4ab: am 68f8f838: am b75b70db: am 62833cdf: am 175c3083: am ee7c9e88: am 0788e947: am 6ffd1e66: am 143e628c: am 7f63d12e: am 6cf492e4: am 941b288c: am df2eae6e: Fix exact match profanity
* commit 'fd549c7ad1582bb6627f85f4eb01cd9bbf5dcf1b':
2013-10-10 00:29:19 -07:00
Tadashi G. Takaoka
33260e8ce6 am 43aae1dc: am 1da6063d: am b5fb9fa2: am f2ea52e2: am 546d1339: am b16017d5: am 8b2a17e9: am 54b1c86d: am 3688ddd2: am 7a0c82b2: am f6cd82d7: am 03fe0cf4: am 3b892164: am 7b2114a4: Display still image when device can\'t play welcome video
* commit '43aae1dc66a9cf15db2bd769e807bb5a1f40e63b':
2013-10-10 00:29:14 -07:00
Jean Chalard
8d824396c0 am 401b97d4: am 425b1efb: am d333c0c8: am d5dca48b: am 3f717593: am 56f10d19: am b04d0337: am aac20e4b: am 31ddb205: am bfdb0fb1: am 457b6ae8: am a10c80fe: am 4aa48aed: am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." int
* commit '401b97d4e15d47efd1c8c422fd3c52b2de087712':
2013-10-10 00:29:10 -07:00
Baligh Uddin
eb21a27b69 am 94fdce8f: am 82a6171a: am a4ab746d: am aa4f95a5: am 5c518d61: am c8e34872: (-s ours) am f0136e37: (-s ours) am 5b1fe393: (-s ours) am 5ca69fe4: (-s ours) am 5d9f4081: (-s ours) am 00078f79: (-s ours) am 50925559: (-s ours) am d2ea99b7: am c9f49b88: (-s ours) am b42
* commit '94fdce8fc530cb4b83d72606eddca2d42c6b0426':
2013-10-10 00:29:05 -07:00
Baligh Uddin
de2268170c am 8f53ee08: am e9d37514: am b2f119ad: am abf5ceac: (-s ours) am caaf5673: (-s ours) am bfb9af84: (-s ours) am bb0a3ccb: (-s ours) am d33c8baf: (-s ours) am 949b2a42: (-s ours) am 7bde4523: (-s ours) am 39afe052: (-s ours) am 6242fca8: (-s ours) am 8daffca0: (-s ours)
* commit '8f53ee0876c2032c91503f86dc81a2a4dfa97e61':
2013-10-10 00:29:01 -07:00
Ken Wakasa
d5c6fdb6c2 am 00bd9a95: am 43f36656: am eff6bc9b: am 17712198: am b6c34066: am 3acf77cc: am b084305f: am 0c4f934a: am bd326eda: am 8aed26b4: am 4c526225: am 45fe5c34: am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"
* commit '00bd9a95f8deb94c226934605965532f1e45a1fb':
2013-10-10 00:28:56 -07:00
Tadashi G. Takaoka
eaf0460260 am 98a18643: am 3d07e8ce: am 030cfe2b: am 67b3be7c: am d1b73078: am 89e30b73: am edf8a28f: am fb7a2163: am 16a3fb0e: am 53d9ed64: am cfb0c03c: am 24fc5ab6: am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
* commit '98a18643ce35e08681ae4308dbe24c9a205cee69':
2013-10-10 00:28:51 -07:00
Jean Chalard
e10fae55a7 am ae650f01: am e15400bb: am aed3c1b2: am fd948aa5: am 0872993f: am eca9d848: am cedc9003: am d3cbd2e4: am 15cb1a36: am 40736750: am 8e32cc2a: am 9db1f6d9: am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"
* commit 'ae650f01cc1e96d7f9278d34f7570516404ec46f':
2013-10-10 00:28:46 -07:00
Satoshi Kataoka
331aa46d74 am 702e6fe3: am 6f553c9f: am 103ab089: am e83a3414: am fe7bfd66: am 4bc7b25e: am e3ab2081: am b1f3e3ac: am 6a2f0d10: am 91a1b953: am dc7cff7c: am fa47814c: am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
* commit '702e6fe342feeb6cd92281aac43d719f469c2c17':
2013-10-10 00:28:41 -07:00
Jean Chalard
7cc20b1818 am 55181b2a: am d9df7df0: am cf41423b: am b68c30a0: am 7c6bfef1: am 75de987d: am 3461c14c: am 78c33f29: am 6ad83dbe: am c816430a: am 3b765c2b: am bc81ac83: am 69e1e45c: am 01170ffe: [PB13] Actually update the progress bar
* commit '55181b2af1cbd7bf6a0b6a256c1480f8468762dd':
2013-10-10 00:28:37 -07:00
Tadashi G. Takaoka
329b69253e am 4bd93ee7: am c0d8dfbc: am 7d421486: am cee6c924: am d7daab08: am e71f8e64: am 9118e605: am e6de3f89: am 0bb5b488: am f10231c4: am 0512fd40: am 58434ae6: am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml
* commit '4bd93ee7d2f99fec0ec30f1cc394140d88409769':
2013-10-10 00:28:33 -07:00
Jean Chalard
2b7f4231a2 am 0f9da22d: am 7f5d993e: am e6d4cd58: am eeab52c8: am 20b2c385: am 80fb373c: am 61fb3429: am 90d7024f: am 7ee8e171: am 868a805d: am f022a0d8: am 861d7cea: am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"
* commit '0f9da22d71b9a6b680927bd352bac33b7f0d973e':
2013-10-10 00:28:29 -07:00
Tom Ouyang
e59b356a8f am 890145a6: am 3fe05558: am 4aa11839: am f4d58139: am 015e87d5: am adfef864: am a7a60f57: am 3848bd3b: am 35f1a518: am ff141440: am 0806d8e5: am f96eb7db: am a0a2b4c2: am 8da0c932: Reduce MAX_NORM_DISTANCE_FOR_EDIT in typing model after recent logic improvements
* commit '890145a6ef7fa47b73b62d79b889f2dc387658cf':
2013-10-10 00:28:25 -07:00
Keisuke Kuroynagi
8455e03c1f am 4df7e651: am 3f42e6d5: am d8d71f9c: am ce914e0b: am 2f6d68bb: am 194a1885: am 318eddae: am fe0603de: am b7a6179e: am e74f3239: am 0da5b5c6: am 45115e6e: am 25a271bc: am 254949d8: Merge "Fix: Demote first char capitalized new words."
* commit '4df7e651e46c5a6f8b53645d57fcf104f482b8bb':
2013-10-10 00:28:20 -07:00
Jeff Sharkey
e52d6cd2ce am aae2b5f2: am dd51f32f: am 9a1f7814: am c62c4091: am 16d4da07: am 48ead228: am 9d32bef2: am 63588c2a: am c5f9c466: am ffc58aa6: am 976eaf61: am f892099b: am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
* commit 'aae2b5f2f9d9333aaad96c61688028ce2cb4c359':
2013-10-10 00:28:15 -07:00
Baligh Uddin
fd323244aa am 9b3fb925: am 27831517: am efb5596e: am 21b190b6: am 8ae9e0b5: am 7b08fb38: (-s ours) am 1356f4b0: (-s ours) am 4e5fd8b3: (-s ours) am cafc74b7: (-s ours) am 6d08423a: (-s ours) am 95a2ce5b: (-s ours) am 887d1af1: (-s ours) am 9a60460a: am ed9ef5a7: (-s ours) am af7
* commit '9b3fb92519a83e979ace8d0ecda77de4c9b3257d':
2013-10-10 00:28:10 -07:00
Baligh Uddin
3b7f77c102 am cdf22e56: am d743b2ed: am d4711eb4: am a71f07c2: am f2126f3b: am 0913eb42: (-s ours) am 07d6c66a: (-s ours) am 8ac001a8: (-s ours) am b9d3ac50: (-s ours) am 4947c0eb: (-s ours) am 4241b708: (-s ours) am 0adb4270: (-s ours) am edb3fd1f: (-s ours) am fc281601: (-s ou
* commit 'cdf22e56c38ea6909b7053a313cef88b3d5e0a78':
2013-10-10 00:28:06 -07:00
Baligh Uddin
6247e2782d am 8e2275b4: am 7ab1b424: am 4915aa8e: am 55a62d6a: am e05469e8: (-s ours) am 65cf781a: (-s ours) am b15b9040: (-s ours) am 56469b69: (-s ours) am 8c19bd5e: (-s ours) am a7eb7736: (-s ours) am 9c64df18: (-s ours) am 0b36a7ed: (-s ours) am da3c0cb9: am 2df8e103: (-s ou
* commit '8e2275b468761f1eb972468651c2053ec8f20eb3':
2013-10-10 00:28:01 -07:00
Baligh Uddin
7aa17e65c8 am 0b75b613: am cbec9823: am 2376b59f: am 1f746e46: am e2c3c7e9: (-s ours) am b4fee8a0: (-s ours) am e7832beb: (-s ours) am fc420bd7: (-s ours) am d6e3afd4: (-s ours) am f5883b20: (-s ours) am 958f2ff2: (-s ours) am b07118bc: (-s ours) am 2b1881c9: am f51b7dd9: (-s ou
* commit '0b75b6135c67ed0ce7fa67d2bfe4289d2d67d01e':
2013-10-10 00:27:57 -07:00
Baligh Uddin
97ec1be3f4 am f5aa618c: am 7541bb65: am 330226a0: am 8ababc37: (-s ours) am 49f87858: (-s ours) am 7bb7089e: (-s ours) am cbe7d92f: (-s ours) am 069424b4: (-s ours) am 5c914cf1: (-s ours) am d0bfe932: (-s ours) am 253da948: (-s ours) am aa237b5d: (-s ours) am 6b89261d: (-s ours)
* commit 'f5aa618c546e2c1820485a310a18e7a8e10a5b83':
2013-10-10 00:27:53 -07:00
Tom Ouyang
3c8f440a4d am 9f6ff4ac: am 4aefdb7c: am f747b71a: am d8e1ce2a: am 4da06634: am c315c345: am 3a291fda: am f834d9f4: am 7ac7f657: am 76672ca5: am c53a1fbe: am 3195604a: am 7cc319f5: am 9559dd2e: Improve bigram frequency lookup
* commit '9f6ff4ac75217ead094310778ef04f66dce17e38':
2013-10-10 00:27:45 -07:00
Ken Wakasa
2ae8d688a2 am 893a6db4: am c995ab93: am 4da20cbe: am 178b5a53: am 982ed8ed: am 9afac2a0: am 2ed7e5c4: am e2063059: am 4a4481a4: am 50e0015b: am da5c76aa: am 17a7b697: am 18d12fc9: am d69ad651: Merge "A small follow-up to I8d03bae3264974eff7b790e27c073b0a8758d17a"
* commit '893a6db49f08b6bf39fd2e2f88ac297f225f0c05':
2013-10-10 00:27:41 -07:00
Jean Chalard
307cef6832 am 914043c0: am 68584962: am 9ffbe60a: am 27dac5a3: am 6dc6bb30: am e45a683e: am 355d4e28: am e201ab3b: am bf7eb289: am 5ff8ea36: am 6a5e7501: am 4779ea60: am 88f3e4ef: am fc26033c: [PB11] Add a skeleton class for a self-updating progress bar
* commit '914043c0a14a64f8b2cd6ef5a9d5ea5e0e06f8f8':
2013-10-10 00:27:35 -07:00
Jean Chalard
51dc35d649 am 25ad86da: am 752be426: am eeec8f68: am 1b1ec0ac: am 6562b7b9: am 3c5c1fa3: am 8fbfb6aa: am 0db3cf3e: am a4a4d286: am a0ced321: am 6ddcd4a9: am e4864276: am eb34f710: am ab0c66b9: [PB10] Add a progress bar to display file download progress
* commit '25ad86daa8d0345fb82656f71387c7cac08eb6f6':
2013-10-10 00:27:30 -07:00
Jean Chalard
19becfcad6 am ba7588f0: am c4d7c312: am 81ed49fc: am 8b64c799: am 14017c5b: am a21621ed: am ad98308b: am 11fe4638: am 4d77ddc5: am d833bc00: am 6caab13e: am 33ccdd1c: am b312f4a8: am ae577ac1: Merge "Update dictionaries"
* commit 'ba7588f0a9b4940389479959713168048ac4fcec':
2013-10-10 00:27:26 -07:00
Ken Wakasa
26abdc3357 am 69e170d1: am ed7de41d: am c3c3eb2e: am 73fbd5ad: am 33beb302: am d69a86ba: am d76d12f5: am e628689d: am e1e7112f: am 6bd41e04: am 9f8ad191: am 8bc5a7ba: am 33f71458: am abd1ad86: Merge "Just cosmetic cleanups"
* commit '69e170d1092d430407182470bc9d1253183de4bd':
2013-10-10 00:27:22 -07:00
Jean Chalard
081f0c7443 am 897dd72f: am 77cb4796: am c19ce2c0: am cd248f4f: am 9c4f8728: am 0309b954: am 919f4325: am e5ebd26f: am 86262aaa: am d229a9cc: am ab417a50: am 605e28c1: am 4e61cf71: am 739406bf: Merge "[PB9] Make buttons that animate-out unclickable"
* commit '897dd72fa370981464b00d567dcc30d0962fe173':
2013-10-10 00:27:18 -07:00
Tadashi G. Takaoka
48130e1cb0 am 336dc08a: am 5aeb8708: am bc0cfbc7: am fca9e021: am dbbf95e0: am ef61eafa: am 124ef519: am c9ca27fe: am d6253e3b: am 786f9102: am 26d68e1e: am 95abe990: am faa0c350: am be06bce1: Merge "Get rid of janky black box before the movie starts"
* commit '336dc08a99ce2712b4fcd3fce0c746dc4554c3c0':
2013-10-10 00:27:13 -07:00
Tadashi G. Takaoka
01ea3e58dc am 6eff5484: am 461579db: am 1621a737: am f5f25302: am ef518224: am 4d08bf87: am bf65dc06: am 6c85f268: am 2d5ad7be: am 0ea8ae58: am fe54663a: am 39831964: am bb8f6fc4: am d4777552: Merge "Fix graying animation of alt-code keys when space/enter is typed"
* commit '6eff5484e510f2ad6eea6ed41aa72d5e4c10bdfb':
2013-10-10 00:27:09 -07:00
Jean Chalard
365c28c3e2 am 884c5b31: am 02018449: am 14a7aea7: am 955c6fbf: am 6d195377: am 0e106309: am fb35ed33: am 5eb84600: am f942544b: am a3c7a7cd: am e0412c70: am e7c5c8f6: am 55d80e4f: am e8ed5d88: Delete obsolete dictionaries
* commit '884c5b318155c31cc8cebb2c8ccb5420e5642b06':
2013-10-10 00:27:05 -07:00
Jean Chalard
27a09560a0 am 8b59db19: am 750d6919: am 99451984: am ff579f18: am f84f4755: am 18844fcf: am 05547ac0: am a4f4b660: am db16a616: am 202677b7: am 5267bbc5: am 926abffa: am 42abed7f: am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words"
* commit '8b59db19c1050aaf9c1264657b0183cd3b8e9dd7':
2013-10-10 00:27:00 -07:00
Jean Chalard
94c090df84 am 1a2bc5cf: am e9311567: am ca94c143: am ed2bdbe7: am a91f7c64: am 8da8a884: am 1f95ce93: am ffee718e: am 46704d26: am c5015deb: am 1101227f: am 3160671b: am 330072b0: am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."
* commit '1a2bc5cfa5d539f1cd1820ee0b60484bef955811':
2013-10-10 00:26:54 -07:00