Commit graph

566 commits

Author SHA1 Message Date
Ujjwal Agrawal
04d96856b3 fixed issue in logout 2018-05-02 19:44:20 +05:30
Ujjwal Agrawal
b33bf387c6 Shared prefernce isloggedin added and menu displayed accordingly 2018-05-01 16:19:43 +05:30
Ujjwal Agrawal
6e9331b892 Skip textview added and onclick implemented 2018-05-01 15:58:40 +05:30
Balakrishnan S
6d2c41b91e Help button (#1415)
* Help button added to tutorial

* debug typo removed

* Help changed to more info

* More option moved to bottom

* Alignment changes made
2018-04-30 14:31:27 +03:00
Vivek Maskara
b108dff460
Merge branch 'master' into featuredImages 2018-04-19 23:44:33 +05:30
misaochan
a095a4e25b Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release' 2018-04-06 00:15:40 +10:00
Josephine Lim
f4166899ca Fix issue with onRequestPermissionsResult not being called in Nearby map and list (#1424)
* Update changelog.md

* Versioning for v2.7.0

* Call fragment method, not activity's

* Initialize directUpload and controller in onCreate

* Add logs

* Change requestcodes in DirectUpload and NearbyMapFragment

* Chain to super in default case (where request codes don't match activity's)

* Controller must be initialized before directUpload

* Fix whitespace, add comments

* Alter request codes for Nearby List as well

* Make permission rationales more specific

* Add comments
2018-04-05 16:31:18 +03:00
Tanvi Dadu
6eebfbb4f6 Links added to TextView about_upload_to in aboutActivity (#1326)
*  Added the link in about_upload_to textfield

*  Merge conflicts resolved

*  Removed the extra textView
2018-04-02 22:42:06 +10:00
Ujjwal Agrawal
c6679edbda Improvements in Notification Activity (#1374)
* Improvements in Notification Activity

* Update NotificationActivity.java
2018-03-29 00:49:35 +05:30
Maanu449
1e80f68136 used CDATA 2018-03-27 18:10:39 +05:30
neslihanturan
1bede8f729
Merge pull request #1337 from diddypod/delete-request
Improve nominate for deletion feature
2018-03-26 23:30:42 +03:00
misaochan
93dccd4d25 Restore "Rate us" string 2018-03-26 20:36:36 +10:00
misaochan
e3bd13627b Fix translate message string 2018-03-26 20:36:12 +10:00
misaochan
68f2330301 Modified strings in About to look more streamlined 2018-03-26 20:34:06 +10:00
Suchit Kar
0857dc890d Merge branch 'master' of https://github.com/commons-app/apps-android-commons into delete-request 2018-03-26 12:47:02 +05:30
neslihanturan
e5c8591fa7 Solve conflicts 2018-03-25 20:24:46 +03:00
Vivek Maskara
463673f942
Merge branch 'master' into featuredImages 2018-03-24 12:46:38 +05:30
Vivek Maskara
6eaac1de40
Merge branch 'master' into notificationFixes 2018-03-24 12:44:09 +05:30
Suchit Kar
7f848eb432 Merge branch 'master' of https://github.com/commons-app/apps-android-commons into delete-request 2018-03-23 11:41:18 +05:30
neslihanturan
49f4b5bc7c Merge master to branch 2018-03-22 18:22:32 +03:00
neslihanturan
fccc7e66d4 Add network connectivity listener and inform user acordingly 2018-03-22 18:15:35 +03:00
neslihanturan
24641b5d6f
Merge pull request #1285 from tanvidadu/translate
Add translate link to tell users to localize the app
2018-03-22 10:08:53 +02:00
Vivek Maskara
50d9cff8c6
Merge branch 'master' into directNearbyUploadsNew 2018-03-21 17:54:03 +05:30
maskara
365bbc470d Fix crash due to read more text view 2018-03-21 12:33:40 +05:30
maskara
528faa1c52 Null fix for notifications 2018-03-21 10:40:46 +05:30
Suchit Kar
a449870d8b Change disabled appearance of Nominate for Deletion button 2018-03-20 19:46:24 +05:30
Suchit Kar
a39d398edd Make deletion-related views on MediaDetailFragment neater 2018-03-20 15:32:50 +05:30
Suchit Kar
e42c6feba4 Check status before nominating for deletion 2018-03-19 23:20:46 +05:30
Suchit Kar
9a27f9c332 Check status before nominating for deletion 2018-03-18 01:36:30 +05:30
Suchit Kar
c303525508 Merge branch 'master' of https://github.com/commons-app/apps-android-commons into delete-request 2018-03-17 19:36:12 +05:30
tanvidadu
2e064c370a Alert Dialoge Implemented 2018-03-17 09:53:17 +05:30
tanvidadu
a6a30e1e77 Fixed Merge conflict 2018-03-17 09:52:27 +05:30
tanvidadu
757a198c99 translate url added 2018-03-17 09:51:24 +05:30
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
Madhur Gupta
a984a302c0 Fix Underline Tag Bug in About Page 2018-03-13 22:34:39 +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
Josephine Lim
2516445d68
Merge pull request #1261 from knight-shade/Fixes-#1258
Fixes #1258
2018-03-12 16:59:45 +10:00
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
4861c4dfa3 Sets the proper width to Navigation drawer in portrait and landscape mode.
Fixes #1275
2018-03-11 10:52:09 +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
knightshade
0a45e0cc43 Fixed typo. 2018-03-07 00:07:21 +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
Shradheya Thakre
48de0e9ca4 fix-string-message 2018-03-04 13:12:23 +08:00
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
neslihanturan
0c131b46fe Move commons button to out of expanded FABs 2018-03-02 23:38:03 +05:30
neslihanturan
5c3c4499dc Add theme dependencies 2018-03-02 23:38:03 +05:30
neslihanturan
8e8472800b Remove show list FAB, since using multple fabs is not recommended. Use list button in menu instead 2018-03-02 23:36:22 +05:30