810 commits

Author	SHA1	Message	Date
Mikel	5cb1f7281b	Fix wrong condition	2017-08-18 20:06:18 +01:00
Mikel	591b10f4c9	Add error message to exception	2017-08-18 20:04:59 +01:00
Mikel	f2e8891db9	Simplify AddAccount task	2017-08-18 17:35:24 +01:00
Mikel	6b80bec3c9	Simplify GetAuthCookie task	2017-08-18 17:34:55 +01:00
Josephine Lim	5796d14e9e	Merge pull request #839 from YDrall/backstack_issue ... remove signup activity from activity's backstack.	2017-08-14 01:28:54 +10:00
ydrall	68462eac2b	make SignupActivity to terminate on task completion	2017-08-11 15:02:15 +05:30
neslihanturan	0005b82421	Revert "Adding username to Drawer"	2017-08-10 13:56:51 +03:00
neslihanturan	401de30630	Merge pull request #834 from akaita/667_fix_categories ... 667 fix categories	2017-08-09 11:31:23 +03:00
neslihanturan	9ea805f9f5	Merge pull request #826 from Nethermane/master ... Adding username to Drawer	2017-08-09 10:43:45 +03:00
Bruce Nishimura	1622f67a4b	Made layout actually look good. Hopefully fixed codeacities complaints.	2017-08-08 18:58:45 -04:00
neslihanturan	e3455b630e	Merge pull request #796 from akaita/media_detail_enhance ... Enhance behaviour of Media detail enhance	2017-08-08 15:29:33 +03:00
Mikel	bef42de613	Remove unused imports	2017-08-08 13:08:56 +01:00
Mikel	304e998a0b	Line break to add readability	2017-08-07 20:53:00 +01:00
Mikel	7754c7c7c4	Fix vectors for drawableStart in API 17	2017-08-07 20:44:35 +01:00
Mikel	3793516d57	Fix empty-filter search. Fix repeated suggestions issue. Show "no results found" when appropriate	2017-08-07 16:37:12 +01:00
Yusuke Matsubara	2777bacd27	Merge pull request #828 from jorgecasariego/master ... Enable Stetho just on debug mode #813	2017-08-07 22:31:36 +09: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	8ca35c7653	Merge pull request #833 from mebr1416/master ... Day mode by default #825	2017-08-05 12:55:01 +03:00
mebr1416	0c303298b2	Resolve for "Day mode by default #825"	2017-08-04 18:40:22 +03: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	04ff70fa5b	Codacy :)	2017-08-02 22:06:37 +01:00
Mikel	1618640046	Make Codacy happy	2017-08-02 22:02:36 +01:00
Mikel	d314964018	Merge from master and add icons to clickable fields	2017-08-02 21:57:13 +01:00
Bruce Nishimura	06efa26f5e	Readding log that I accidently deleted	2017-08-02 00:44:27 -04:00
Bruce Nishimura	a014900e37	Removed username from preferences, now uses current account. ... Improved text positioning/styling slightly.	2017-08-02 00:38:34 -04:00
Mikel	584a030def	Hack to avoid usage of exhausted thread pool	2017-08-02 02:09:57 +01:00
Jorge Casariego	b76fb516b6	Enable Stetho just on debug mode #813	2017-08-01 15:02:51 -04:00
Bruce Nishimura	2764bc4dd8	Using general preferences instead, splitting long lines.	2017-07-31 20:47:55 -04:00
Bruce Nishimura	fba9bf0327	Clean up extra imports	2017-07-31 17:12:25 -04:00
Bruce Nishimura	d3ce751f59	Added username to picture of the day icon.	2017-07-31 17:08:47 -04: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