Commit graph

1630 commits

Author SHA1 Message Date
Vivek Maskara
ff54d03aeb
Merge branch 'master' into Fixes-#1198 2018-03-16 18:40:41 +05:30
neslihanturan
e412c9a0aa
Merge pull request #1299 from knight-shade/Fixes-#1294
Fixes #1294 Orientation change cancels the ongoing login process.
2018-03-16 13:46:48 +02:00
neslihanturan
ce8c807348
Merge pull request #1279 from knight-shade/Fixes-#1275
Fixes #1275 Set proper with of Navigation drawer in both orientations.
2018-03-16 13:04:11 +02:00
neslihanturan
7d238ec8e3
Merge pull request #1277 from maskaravivek/privacyPolicy
Fixes privacy policy link in Login page
2018-03-16 12:59:10 +02:00
neslihanturan
bad68d9499
Merge pull request #1265 from knight-shade/Fixes-#1262
Fixes #1262 Show correct image upload count in beta build variants.
2018-03-16 12:55:27 +02:00
misaochan
efdfa38725 Add FIXME for injector() 2018-03-16 20:48:30 +10:00
neslihanturan
872b258720
Merge pull request #1307 from ujjwalagrawal17/toast
Fixes #1301 Changes toasts to snacks
2018-03-16 12:38:41 +02:00
misaochan
2099a99e4f Add Dagger injector to render() 2018-03-16 20:36:57 +10:00
misaochan
c1f451258c Add FIXME to PlaceRenderer 2018-03-16 20:25:22 +10:00
neslihanturan
c869581c2a
Merge pull request #1209 from hismaeel/1130(j)
issue #1130 -(j). bad Token Exception from showDialog() in ExistingFi…
2018-03-16 12:16:07 +02:00
Ujjwal Agrawal
9a85fb51f7 Removed unnecessary functions 2018-03-16 15:35:58 +05:30
misaochan
5e828d4541 Save categories in PlaceRenderer and SingleUploadFragment 2018-03-16 20:01:52 +10:00
misaochan
8133ba1d23 Strip string for categories and add them to a Place 2018-03-16 20:00:23 +10:00
misaochan
2c6b6f9bea Add TODO for category suggestions 2018-03-16 19:49:48 +10:00
neslihanturan
07133e02e3
Merge pull request #1194 from harisankerPradeep/Bug#1004
Fixes Bug#1004 : Black background on details and categories screen
2018-03-16 11:44:45 +02:00
neslihanturan
eaba96b509
Merge pull request #1176 from hismaeel/1119
Fixed Hard Coded Column issue. #1119
2018-03-16 11:09:47 +02:00
neslihanturan
d15e1d90e0
Merge pull request #1315 from gupta-meghna64/logClientFix
Removes unsupported clients while sharing log
2018-03-16 10:15:09 +02:00
Meghna Gupta
71535c312e Removes unsupported clients while sharing log 2018-03-16 00:31:46 +05:30
neslihanturan
0d40ebc4eb Fix improper zooming level on bottom sheet is expanded 2018-03-15 21:40:12 +03:00
neslihanturan
4a3c33ed58
Merge pull request #1281 from tanvidadu/Nodescription
Removed No description label
2018-03-15 19:41:22 +02:00
neslihanturan
aeaafa465f Fix conflicts 2018-03-15 00:14:24 +03:00
Ujjwal Agrawal
9f621539c7 Added showSnackbar in ViewUtil and shown in NearbyActivity 2018-03-14 14:47:00 +05:30
neslihanturan
75f27a332f Fix zooming issue 2018-03-14 00:59:08 +03:00
neslihanturan
3288fb05a4 Revert "Re-use current zoom level on camera updates"
This reverts commit 34579ca125.
2018-03-13 23:58:57 +03:00
neslihanturan
34579ca125 Re-use current zoom level on camera updates 2018-03-13 21:46:09 +03:00
knightshade
57a2ce20cd Fixes orientation change canceling the ongoing login process.
Fixes #1294
2018-03-13 16:11:28 +05:30
Suchit Kar
6ddd981406 Remove unused field and methods 2018-03-13 02:39:02 +05:30
Suchit Kar
e14cca2fec Merge branch 'master' of https://github.com/commons-app/apps-android-commons into delete-request 2018-03-13 02:11:41 +05:30
Suchit Kar
369570537e Add delete task 2018-03-13 02:02:39 +05:30
yashshah7197
87b794ce1f feat: Add checks for title and description in intent extras.
In case other apps want to send a title and description along with the
image, we check if those have been passed as intent extras and set the
EditText values accordingly.

Fixes: #1273
See also: #892
2018-03-12 18:06:04 +05:30
Vivek Maskara
4219023740
Merge branch 'master' into privacyPolicy 2018-03-12 00:18:04 +05:30
tanvidadu
21e54ef3d2 Removed No description label 2018-03-11 14:09:50 +05:30
tanvidadu
c00f755492 Removed No description label 2018-03-11 13:30:02 +05:30
Ujjwal Agrawal
ede8c76d45 Faqs added in About Activity (#1256)
* Faqs added in About Activity

* Added CDATA in strings

* removed cdata, added SpannableString
2018-03-11 13:28:26 +05:30
knightshade
cc02da8582 Removed debug logs used in development. 2018-03-11 11:03:14 +05:30
knightshade
4861c4dfa3 Sets the proper width to Navigation drawer in portrait and landscape mode.
Fixes #1275
2018-03-11 10:52:09 +05:30
maskara
4ac8f88ec2 Fixes privacy policy link in Login page 2018-03-11 01:36:19 +05:30
Madhur Gupta
bdd7a86cd5 Revamp the Settings page (#1259)
* Revamp the Settings page

* Update License Test
2018-03-11 00:56:05 +05:30
Madhur Gupta
de673eb4ca Add Forgot Password Option in LoginActivity (#1242)
* Add Forgot Password Option in LoginActivity

* Add Forgot Password Option in LoginActivity

* Add Forgot Password Option in LoginActivity

* Update URL for the "beta" flavor

* Update forgotPassword function
2018-03-10 23:00:05 +05:30
Tanvi Dadu
57bfb7b328 Skip option in Welcome Screen (#1251)
*  Skip option in Welcome Screen

*  Tutorial screen Revamped

* fixed the prodDebug visibility
2018-03-10 22:47:21 +05:30
neslihanturan
a617b09af8 Remove refresh button and its actions 2018-03-07 23:08:18 +03:00
neslihanturan
c140d3c34a Remove swipe to refresh 2018-03-07 22:57:41 +03:00
neslihanturan
bc87ad5d51
Merge pull request #1237 from knight-shade/Fixes-#1225
Fixes #1225 bug causing multidex
2018-03-07 20:32:07 +02:00
knightshade
2ae46a4c33 Modified the code to only function in beta build variant. 2018-03-07 16:06:36 +05:30
Ayushi Negi
cfc1449615 Launch Rate Us Feature from AboutActivity (#1264)
* Launch Rate Us Feature from AboutActivity

Rate us feature is added in Utils, But it is never used/launched.

* Add LaunchRatings Method in AboutActivity

* Fix Package Name to enable rate us feature

The rate us feature was not working for the debug build type since getPackageName() was returning the fr.free.nrw.commons.debug. Use of this package name was leading to an error on google play.

* Replace getPackageName() with BuildConfig.class.getPackage().getName() in rateApp method of Utils.java
2018-03-07 06:44:51 +05:30
knightshade
7c32f57c31 Fixed upload count to show correct number of pictures upload by user in beta version of app.
Fixes #1262
2018-03-06 23:05:01 +05:30
neslihanturan
41494bea5b Fix conflicts 2018-03-06 20:32:28 +03:00
neslihanturan
5b88111289 Fix conflicts 2018-03-06 19:47:18 +03:00
Vivek Maskara
51221f69c2
Merge pull request #1248 from Jatin0312/master
Fix for issue #1224 showing complete notification on click
2018-03-06 02:46:20 +05:30
Jatin Rao
ff11c9d1f0 Added a white space between text and show less 2018-03-04 22:19:40 +05:30