Commit graph

3344 commits

Author SHA1 Message Date
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
bc87ad5d51
Merge pull request #1237 from knight-shade/Fixes-#1225
Fixes #1225 bug causing multidex
2018-03-07 20:32:07 +02:00
knightshade
0acc42dd52 Fixes failing of tests after addition of multidex. 2018-03-07 23:09:39 +05:30
neslihanturan
f45f60627d
Merge pull request #1269 from commons-app/update-pr-template
Update PULL_REQUEST_TEMPLATE.md
2018-03-07 13:39:25 +02:00
Josephine Lim
2ad985cd73
Update PULL_REQUEST_TEMPLATE.md 2018-03-07 20:50:53 +10:00
knightshade
2ae46a4c33 Modified the code to only function in beta build variant. 2018-03-07 16:06:36 +05:30
Abhishek Poonia
3bd02704b5
Merge pull request #2 from commons-app/master
Second pull to base
2018-03-07 10:04:09 +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
0a45e0cc43 Fixed typo. 2018-03-07 00:07:21 +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
knightshade
7009537e8e Wraps string stored in strings.xml with CDATA to prevent PHP's SimpleXML return null when string contains other tags.
Fixes #1258
2018-03-06 08:43:30 +05:30
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
Vivek Maskara
b9458bc0b6
Merge pull request #1257 from Jatin0312/patchNotif
Fixes #1250 Removed creation of multiple instances of Notification Activity
2018-03-06 02:42:44 +05:30
Jatin Rao
ff11c9d1f0 Added a white space between text and show less 2018-03-04 22:19:40 +05:30
Jatin Rao
8500abba97 Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-03-04 22:15:13 +05:30
Jatin Rao
4ecf03d4d3 Merge branch 'master' of https://github.com/commons-app/apps-android-commons into patchNotif 2018-03-04 14:20:32 +05:30
Jatin Rao
a446b5b662 Fixes #1250 Removed creation of multiple instances of Notification activity 2018-03-04 14:20:20 +05:30
Vivek Maskara
d04f9fbe02
Merge pull request #1254 from tshradheya/1253-fix-toast-message
Fix Toast Message for add_title_toast #1253
2018-03-04 12:05:29 +05:30
Shradheya Thakre
48de0e9ca4 fix-string-message 2018-03-04 13:12:23 +08:00
Jatin Rao
6e9ea26023 Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-03-03 19:55:23 +05:30
Jatin Rao
81147aada1 Fixes issue 1224 2018-03-03 19:55:09 +05:30
Vivek Maskara
4c3513b442
Merge pull request #1211 from tshradheya/1195-give-toast-message
Give toast when trying to upload image without giving a Title #1195
2018-03-03 19:23:10 +05:30
knightshade
d7e0c81969 Add multidex library and extend CommonsApplication from MultiDexApplication.
Fixes #1225
2018-03-02 10:28:28 +05:30
Josephine Lim
ef5fafad8b
Merge pull request #1166 from hismaeel/master
Issue #1156
2018-03-02 03:10:48 +10:00
Suchit Kar
4b0f1f6a09 Injected API, Session Manager 2018-03-01 20:14:02 +05:30
Suchit Kar
6c38b58a29 Add deletion button 2018-03-01 20:13:57 +05:30
Jatin Rao
0a861317f4 Removed unsused variable from method getTrimmedText 2018-03-01 17:14:55 +05:30
Jatin Rao
534215fdbc Fix for issue #1224 showing complete notification on click 2018-03-01 15:57:13 +05:30
Vivek Maskara
89245a6d5b
Merge pull request #1227 from gupta-meghna64/master
Replacement of tutorial icon in navigation drawer
2018-03-01 03:18:11 +05:30
Hassan
8addd10ef8
update PR quality 2018-02-28 13:07:50 -05:00
Josephine Lim
cc80b42cde
Merge pull request #1214 from Steinsplitter/patch-1
fixing upload summary
2018-03-01 03:57:56 +10:00
Hassan
e49f13ff74
Merge branch 'master' into master 2018-02-28 08:44:03 -06:00
Meghna Gupta
2b96b03ce7 Replacement of tutorial icon in navigation drawer 2018-02-28 17:02:05 +05:30
neslihanturan
59a6ea56c7
Merge pull request #1162 from diddypod/category-alignment
Fix issue #1030: Spinning wheel overlaps on text input, when using Hebrew locale
2018-02-28 13:00:48 +02:00
neslihanturan
b1a4f7f990
Merge pull request #1172 from diddypod/rtl-upload
Fix issue #1163: Crash on upload picture with right to left languages
2018-02-28 12:43:40 +02:00
neslihanturan
e207edc0e5
Merge pull request #1188 from ujjwalagrawal17/feat5
Rate Us feature added
2018-02-28 11:26:54 +02:00
Abhishek Poonia
30f04d0565
Merge pull request #1 from commons-app/master
Update local fork
2018-02-28 08:19:23 +05:30
Vivek Maskara
132ec8adaa
Merge pull request #1223 from gupta-meghna64/master
Removes extra padding in media categories
2018-02-28 02:03:20 +05:30
Suchit Kar
67d1df27fb Extract alert dialog creation to a function 2018-02-28 01:57:53 +05:30
Ujjwal Agrawal
6277272206 Fix merge conflicts 2018-02-28 00:47:10 +05:30
Meghna Gupta
294832c383 Removes extra padding in media categories 2018-02-28 00:27:37 +05:30
Vivek Maskara
d201d122e5
Merge pull request #1219 from knight-shade/Fixes-#1218
Fixes #1218
2018-02-27 23:57:02 +05:30
knightshade
e0e6991a46 Add password visibitly toggle to login screen.
Fixes #1218
2018-02-27 20:05:44 +05:30
Suchit Kar
ad9740154f Merge branch 'master' of https://github.com/commons-app/apps-android-commons into category-alignment 2018-02-27 19:58:33 +05:30
neslihanturan
5c51e2e00c
Merge pull request #1174 from hismaeel/1130(b)
issue #1130 (b)
2018-02-27 16:09:08 +02:00
Suchit Kar
de9bb89ff2 Merge branch 'master' of https://github.com/commons-app/apps-android-commons into rtl-upload 2018-02-27 19:08:30 +05:30
Vivek Maskara
f8695209e5
Merge pull request #1217 from tshradheya/1215-add-space-in-between
Add missing space between Licence and Coordinates in MediaDetailFragment #1215
2018-02-27 13:46:12 +05:30