328 commits

Author	SHA1	Message	Date
maskara	3adb5d83ae	Update Gradle plugin to 3.0	2017-11-02 22:53:27 +05:30
Paul Hawke	f134d23ecb	Merge branch 'master' into dependency-injection	2017-10-21 17:20:56 -05:00
Paul Hawke	bcf6511d13	Merge branch 'master' into login-screen-improvement	2017-10-09 21:40:30 -05:00
Nicolas Raoul	9b8d8e9b7c	Merge pull request #867 from pszklarska/fix_844 ... Fixing #844 - If a category has exact name entered, show it first	2017-10-02 16:32:46 +09:00
Paul Hawke	529f5415c3	Improved the layout of the login screen.	2017-09-30 14:39:26 -05:00
Paul Hawke	e33febf506	Merge branch 'master' into dependency-injection	2017-09-23 14:24:34 -05:00
Vishan Seru	3b5811921c	Moved sign up process redirection urls to build.gradle as buildConfig fields specific to beta and prod flavors and added necessary usages to SignupActivity	2017-09-16 20:12:57 +05:30
Paul Hawke	2d91e81121	Merge branch 'master' into dependency-injection	2017-09-13 20:29:50 -05:00
pszklarska	228a497125	Code cleanup in build.gradle	2017-09-05 18:03:59 +02:00
pszklarska	5094cbc58a	Implementing String similarity algorithm for searching category functionality	2017-09-05 18:02:44 +02:00
Paul Hawke	ca4b99a1cc	Product flavors to allow switching between the production and the beta-cluster Wikimedia servers.	2017-08-26 15:42:44 -05:00
Paul Hawke	8fe2816ca9	First baby steps into the world of dependency injection using Dagger.	2017-08-26 08:56:14 -05:00
Paul Hawke	04f676c320	Added dagger2 to the build	2017-08-26 08:54:00 -05:00
Mikel	4c0ea95670	Add dependencies for RxBindings	2017-08-06 17:56:51 +01:00
Mikel	7b879e459c	Update RvAdapter dependency	2017-08-06 17:56:33 +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
misaochan	ac5b876b1a	Versioning	2017-07-28 21:45:09 +10:00
Mikel	09d94f3e06	Replace Guava-implemented getUploadCount with RxJava2 version	2017-07-26 16:56:44 +01:00
Paul Hawke	3824f31ef9	Added Retrolambda and set the language level to JavaVersion.VERSION_1_8	2017-07-22 17:46:53 -05:00
Paul Hawke	c3649d3efd	Merge remote-tracking branch 'upstream/master'	2017-07-11 08:06:55 -05:00
Paul Hawke	6ccc608a1e	Converted nearby list to recycler view and fixed a few issues pointed out by static code analysis.	2017-07-09 17:33:24 -05:00
Paul Hawke	883419844d	Merge branch 'master' into master	2017-07-06 12:55:14 -05:00
Paul Hawke	ddce34bc90	Shifted the ApacheHttpClientMediaWikiApiTest to run using Robolectric (as a unit test) rather than on-device.	2017-07-05 20:23:37 -05:00
Paul Hawke	c035b368c4	Added smoke test - run through a few api calls - to verify that the parameters are all correctly encoded and sent, and responses are parsed.	2017-07-05 19:29:48 -05:00
Paul Hawke	d53858f7d2	Gentle version bump and added the dexcount gradle plugin	2017-07-04 14:14:17 -05:00
Tobias Schönberg	501962d3c5	Update mapbox to 5.1	2017-07-03 22:38:00 +02:00
misaochan	d5c4e59db5	Versioning	2017-06-05 17:02:12 +10:00
misaochan	8dc923f204	Add FIXME comment to temporary fix	2017-06-02 22:41:29 +10:00
misaochan	6bdd4e64c0	Remove automatic Gradle changes from previous commit ... Not sure wtf happened...	2017-06-02 18:32:13 +10:00
misaochan	8626bc259f	Gradle modifications to fix build error	2017-06-02 17:50:43 +10:00
misaochan	18bb59403b	Add NoPermissionsFragment	2017-06-02 01:30:13 +10:00
Josephine Lim	4b400cd8aa	Merge pull request #685 from whym/codecov ... Add Codecov settings	2017-05-28 22:13:30 +10:00
Yusuke Matsubara	3b1a902636	Add Codecov settings	2017-05-27 23:19:49 +09:00
misaochan	9557ed6099	Versioning for release 2.4.1	2017-05-27 17:34:19 +10:00
maskara	43d841bdf3	Adding support for Guava library	2017-05-21 12:25:28 +02:00
Josephine Lim	b3215b1e78	Merge pull request #645 from maskaravivek/overlayMenu ... Add popup menu in nearby info dialog	2017-05-20 15:23:35 +02:00
maskara	4823486139	Add popup menu in nearby info dialog	2017-05-20 13:09:16 +02:00
Josephine Lim	bc09ee4bba	Versioning for v2.4	2017-05-20 12:32:27 +02:00
Dmitry Brant	7a4062a377	Merge remote-tracking branch 'upstream/master'	2017-05-19 16:27:08 +02:00
Dmitry Brant	9469bf29e4	Remove dependency on old image-loading library, and remote a lot of code.	2017-05-19 16:24:04 +02:00
Josephine Lim	6232e35816	Merge pull request #627 from dbrant/master ... Clean up image loading code, and switch to using Fresco.	2017-05-19 15:20:33 +02:00
Dmitry Brant	bb49fb9801	Clean up image loading code, and switch to using Fresco.	2017-05-19 15:08:29 +02:00
Dinu Kumarasiri	7d6c836e31	Leak Canary Integration	2017-05-19 15:06:15 +02:00
Josephine Lim	37c3004b57	Merge pull request #594 from maskaravivek/stetho ... Making debugging easier with stetho	2017-05-15 17:04:39 +02:00
maskara	c49720c777	Making debugging easier with stetho	2017-05-15 16:51:44 +02:00
Josephine Lim	391a3d38b8	Versioning	2017-05-15 12:28:05 +02:00
maskara	6118b57295	Added support for MapView in Nearby	2017-05-12 13:50:25 +02:00
Yusuke Matsubara	46b54e7312	Remove redundant Espresso/Travis settings	2017-04-20 21:34:04 +09:00
Josephine Lim	ba113ffc4a	Merge pull request #525 from whym/espresso ... Test license selection in Settings	2017-04-20 15:36:30 +10:00
Yusuke Matsubara	7a7e1e7fbb	Test license selection in Settings and run emulator on Travis	2017-04-19 20:33:59 +09:00