mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
1475 commits 78 branches 116 tags 495 MiB
Commit graph

1475 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
misaochan
a5f7826b6e Whitespace 2016-10-20 16:16:49 +13:00
AtaZh
d90c26b9f2 Update strings.xml 
If you can also tell me that these changes will soon appear in the app itself, I'll be happy :)
 2016-10-19 17:40:56 +03:00
misaochan
9519210ec3 Add SO url in comment 2016-10-13 13:58:34 +13:00
misaochan
dd058f51c6 Comments 2016-10-13 13:52:33 +13:00
misaochan
95ccf0f5e2 Add try-catch framework for getting results from asynctask 2016-10-13 13:52:00 +13:00
misaochan
bda5ddddd4 Define items 2016-10-13 13:48:13 +13:00
misaochan
973914617f Remove comment 2016-10-13 13:46:54 +13:00
misaochan
1a833a5412 Override constructor to add title 2016-10-13 13:46:27 +13:00
misaochan
fcd7c2a0a8 Add TAG and searchcatlimits 2016-10-12 01:14:08 +13:00
misaochan
0239bcc092 Remove comments 2016-10-11 01:20:09 +13:00
misaochan
01bd8845c2 Split title category code into class that extends AsyncTask 2016-10-11 01:08:26 +13:00
misaochan
5a155f1de4 Merge remote-tracking branch 'refs/remotes/origin/master' into suggest-cats-from-title 2016-10-09 17:59:45 +13:00
Josephine Lim
df03d1e379 Merge pull request #297 from misaochan/master 
Versioning for release
 2016-10-09 17:46:00 +13:00
Josephine Lim
5096053799 Update changelog.md 2016-10-09 17:42:50 +13:00
misaochan
8e8e01e2b7 Versioning 2016-10-09 17:41:14 +13:00
misaochan
7ad2fc3b45 Merge remote-tracking branch 'refs/remotes/commons-app/master' into suggest-cats-from-title 2016-10-09 15:53:19 +13:00
Josephine Lim
6b75bd19f7 Merge pull request #296 from misaochan/fix-gpsextractor-2 
Fix GPS categories not displaying due to no args constructor error
 2016-10-09 14:58:50 +13:00
misaochan
14f2cb11aa Change log tags 2 2016-10-08 20:34:47 +13:00
misaochan
76c4b0ab32 Change log tags 2016-10-08 20:33:55 +13:00