Commit graph

1644 commits

Author SHA1 Message Date
Josephine Lim
95517e4acc Merge pull request #304 from whym/buildtools25
Upgrade build tools (25) and gradle plugin (2.2.2)
2016-10-26 16:25:12 +13:00
Yusuke Matsubara
b005274497 Upgrade build tools (25) and gradle plugin (2.2.2)
Also, Java SDK 8 is now required by dependency.
2016-10-25 19:41:12 +09:00
misaochan
242f2ca12d DEBUG MODE OFF 2016-10-25 17:47:04 +13:00
misaochan
6eb58497a3 Whitespace 2016-10-25 17:46:49 +13:00
misaochan
0234b09f17 Add comment 2016-10-25 17:45:16 +13:00
misaochan
e2c8f30a95 Add comments 2016-10-25 17:43:34 +13:00
misaochan
b15faa9a35 Fix regular expression 2016-10-25 17:42:05 +13:00
misaochan
91adefb733 Try simpler regexp 2016-10-25 17:31:11 +13:00
misaochan
3e74809d43 Add FIXME for failed regexp 2016-10-25 17:28:51 +13:00
misaochan
ab4669b99d Use matches instead of contains 2016-10-25 17:28:06 +13:00
misaochan
f14c7eb7ba Remove wrong parantheses 2016-10-25 17:24:09 +13:00
misaochan
87ceeb81a0 Try only double escaping \\d 2016-10-25 17:22:54 +13:00
misaochan
2b4960afb8 Change literal 2016 to regexp 2016-10-25 17:20:18 +13:00
misaochan
bc02ac5c40 Remove old for block 2016-10-25 17:19:35 +13:00
misaochan
c118d31a6f Add Iterator to fix ConcurrentModificationException 2016-10-25 17:17:38 +13:00
misaochan
3894d5f7b4 Add log 2016-10-25 16:47:25 +13:00
misaochan
87b3bff405 DEBUG MODE ON 2016-10-25 16:46:46 +13:00
misaochan
87f4509db4 Switch to contains() instead of matches() 2016-10-25 16:44:34 +13:00
misaochan
1c3fd70cb3 Add regular expression and remove those items 2016-10-25 16:43:29 +13:00
misaochan
59455697de Added maximum timeout to await() 2016-10-25 16:29:12 +13:00
misaochan
4331b87554 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2016-10-25 16:26:56 +13:00
Josephine Lim
e4492595ce Merge pull request #305 from misaochan/master
Versioning for release 1.37
2016-10-25 16:17:37 +13:00
Josephine Lim
96a479b8ed Update changelog.md 2016-10-25 16:16:17 +13:00
misaochan
49e8afe020 Versioning 2016-10-25 16:13:51 +13:00
misaochan
a83099f0c7 Merge remote-tracking branch 'refs/remotes/commons-app/master' 2016-10-22 16:59:23 +13:00
Josephine Lim
9d1ed8b807 Merge pull request #303 from misaochan/suggest-cats-from-title
Suggest categories from entered filename
2016-10-21 19:38:14 +13:00
misaochan
2496e376ec DEBUG MODE OFF 2016-10-21 18:19:04 +13:00
misaochan
879b7d3263 Switch back to Utils.executeAsyncTask 2016-10-21 18:11:35 +13:00
misaochan
519afe3f47 Add comments 2016-10-21 18:09:45 +13:00
misaochan
9ea223e32f Move mergeLatch.await() to a more sensible location 2016-10-21 18:04:10 +13:00
misaochan
b9f6bd55ca Added mergeLatch.await() before titleCatItems are returned 2016-10-21 17:57:36 +13:00
misaochan
a04312919e Add logs 2016-10-21 17:50:26 +13:00
misaochan
32246eebd5 Add logs 2016-10-21 17:43:40 +13:00
misaochan
0fcdf4e5f9 Move latch to recentCatQuery 2016-10-21 17:40:37 +13:00
misaochan
fa680f0369 Moved addAll lines to after latch.await() 2016-10-21 17:29:03 +13:00
misaochan
82b5904a68 Changed latch to only wait for titleCats 2016-10-21 17:22:28 +13:00
misaochan
2ea7e6e5fe Add logging 2016-10-21 17:21:14 +13:00
misaochan
fc20178904 Add latch to wait for title results 2016-10-21 17:18:57 +13:00
misaochan
5254f7a808 Remove double declaration, indent lines 2016-10-21 17:06:01 +13:00
misaochan
a0042c7233 Remove unnecessary try catch block 2016-10-21 17:05:11 +13:00
misaochan
5ba1d97704 Add final var titleCatItems to allow inner class access 2016-10-21 17:04:36 +13:00
misaochan
287fd98abb Add subclass for titleCategories 2016-10-21 17:01:46 +13:00
misaochan
e17c17d0f7 Merge remote-tracking branch 'refs/remotes/commons-app/master' into suggest-cats-from-title 2016-10-21 16:56:04 +13:00
misaochan
6586dac1f9 Merge remote-tracking branch 'refs/remotes/origin/master' into suggest-cats-from-title 2016-10-21 16:28:57 +13:00
Josephine Lim
7f56a7ac36 Merge pull request #302 from misaochan/master
Versioning for release
2016-10-21 14:41:59 +13:00
Josephine Lim
cb5793fc19 Update changelog.md 2016-10-21 14:35:26 +13:00
misaochan
7bcb27c246 Versioning 2016-10-21 14:34:13 +13:00
misaochan
3bac447c20 Merge remote-tracking branch 'refs/remotes/commons-app/master' into suggest-cats-from-title 2016-10-21 14:31:37 +13:00
Nicolas Raoul
149865912f Merge pull request #301 from AtaZh/patch-1
Update strings.xml
2016-10-20 17:29:53 +09:00
AtaZh
6a3ee8d48a Update strings.xml
escaped apostrophes
2016-10-20 11:14:27 +03:00