784 commits

Author	SHA1	Message	Date
Mikel	3793516d57	Fix empty-filter search. Fix repeated suggestions issue. Show "no results found" when appropriate	2017-08-07 16:37:12 +01:00
Mikel	ef1fc0c9d9	Improve code readability	2017-08-06 20:33:29 +01:00
Mikel	0443f65c4a	Reorder to clarify	2017-08-06 20:11:27 +01:00
Mikel	22cd1ac72a	Fix import	2017-08-06 20:09:45 +01:00
Mikel	b7215c580f	Migrate network tasks to RxJava	2017-08-06 19:58:58 +01:00
Mikel	84a5f0a221	Move DB tasks to model/dao object	2017-08-06 19:27:47 +01:00
Mikel	0c0c814604	Refactor CategorizationFragment to use RxJava2	2017-08-06 17:58:31 +01:00
Mikel	494739da5e	Implement equals and hashCode for CategoryItem	2017-08-06 17:57:29 +01:00
neslihanturan	28a0a15616	Merge pull request #818 from akaita/rx_upload_count ... Use RxJava2 for getting upload count	2017-08-03 17:10:41 +03:00
Mikel	584a030def	Hack to avoid usage of exhausted thread pool	2017-08-02 02:09:57 +01:00
Michiyo Wellington-Oguri	c02408c2a5	don't start new activity if already in that activity	2017-07-30 17:15:41 -07:00
Josephine Lim	4e1d239822	Merge branch 'master' into master	2017-07-30 18:20:42 +10:00
Mikel	946f4f2ac2	Fix implementation of getUploadCount() and its test	2017-07-28 16:22:16 +01:00
Mikel	d1e53db73a	Rename misnamed variable	2017-07-28 15:23:07 +01:00
Mikel	2b30924242	Merge branch 'master' into rx_upload_count ... # Conflicts: # app/src/main/java/fr/free/nrw/commons/concurrency/ThreadPoolExecutorService.java # app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java	2017-07-28 14:47:37 +01:00
Mikel	6412e15f20	Move new Http query together with other ApacheHttpRequests	2017-07-28 14:38:54 +01:00
mebr1416	b32320b344	- Information by upload fields ... - Fixed conflicts	2017-07-28 16:26:56 +03:00
Josephine Lim	71a7742a83	Merge pull request #817 from akaita/overriden_annotations ... Add missing annotations	2017-07-28 19:54:46 +10:00
mebr1416	05bdfb588e	Information by upload fields	2017-07-28 12:19:37 +03:00
Josephine Lim	a5a624f939	Merge pull request #808 from neslihanturan/oneTimePopUp ... One time pop up	2017-07-27 16:49:22 +10:00
Neslihan	8b460b6f3a	Fix ugly codes	2017-07-26 22:20:46 +03:00
Mikel	3b17d96bae	Fix indentation	2017-07-26 17:36:05 +01:00
Mikel	09d94f3e06	Replace Guava-implemented getUploadCount with RxJava2 version	2017-07-26 16:56:44 +01:00
Mikel	79a22c1aca	Add missing annotations	2017-07-26 16:24:24 +01:00
Neslihan	d72b239e20	Fix codacy	2017-07-26 14:57:51 +03:00
Neslihan	07102c04e9	Add developer plans to nav drawer	2017-07-26 14:29:56 +03:00
Neslihan	452dcaec72	Display pop up once, on 4th app start	2017-07-26 14:06:49 +03:00
Paul Hawke	3b797751a3	Cleanup - got rid of unused imports	2017-07-25 21:19:56 -05:00
Paul Hawke	bf59afcc3b	Merge branch 'master' into categorization-recycler-view	2017-07-25 21:19:21 -05:00
Neslihan	4571482695	Fix codacy issues	2017-07-23 18:44:38 +03:00
Neslihan	19784f0e82	Add shared preferences	2017-07-23 18:10:42 +03:00
Neslihan	d88fb3b0de	Prepare alert window and strings	2017-07-23 15:39:08 +03:00
Paul Hawke	02315c2ae7	Propagated the @NonNull annotation for place click listener and removed a test that made no sense.	2017-07-22 18:08:56 -05:00
Paul Hawke	4796557fb7	Made a pass through the code to introduce lambdas / method references in the places the Android Studio suggested.	2017-07-22 18:04:40 -05:00
Paul Hawke	eaffed2471	Changes suggested by Codacy	2017-07-22 14:12:35 -05:00
Paul Hawke	9c987efbd2	Swapped the ListView for a RecyclerView, made the fragment cleaner and fixed a whole bunch of code inspection issues.	2017-07-22 13:57:46 -05:00
Mikel	e9d77a0716	Use vector icons for nearby-map markers (#786)	2017-07-22 10:01:08 +09:00
Josephine Lim	19a3fa3adc	Merge pull request #777 from akaita/media_detail ... Fix issues in Media Detail screen	2017-07-20 01:20:10 +10:00
Mikel	2ce7a464ca	Remove Clickable behaviour of License and Coordinates	2017-07-18 20:20:44 +01:00
Josephine Lim	3db421ad8c	Merge pull request #789 from achalshant/fix_for_issue#750 ... Fix for issue#750	2017-07-18 17:20:24 +10:00
Achal Shantharam	e46588e336	Adding whitespaces	2017-07-17 17:03:18 +05:30
Achal Shantharam	3681176f54	Fix for issue #750 irrelevant categories	2017-07-17 12:03:13 +05:30
Achal Shantharam	e405b67bfb	Fix for issue #750 irrelevant categories	2017-07-17 12:00:20 +05:30
mwoguri	8f0cd852a5	Update HtmlTextView.java ... Added whitespace	2017-07-16 19:14:47 -07:00
Michiyo Wellington-Oguri	10637f4bf2	Use string substitution to avoid translating trademarked text	2017-07-16 14:28:23 -07:00
Yusuke Matsubara	3b728ca568	Coding style fixes	2017-07-16 15:13:40 +09:00
Mikel	7edfe34a3e	Merge branch 'master' into media_detail	2017-07-15 18:59:36 +02:00
Mikel	65ddc1a4bb	Add Nullable annotations to reduce risk of NPE	2017-07-15 18:41:10 +02:00
Josephine Lim	ee409a9e8f	Merge pull request #769 from tised/#748_issue ... fix for #748	2017-07-16 02:32:26 +10:00
Mikel	9d23907728	Fix Issue with repeating categories in MediaDetail	2017-07-15 18:16:45 +02:00