Commit graph

3344 commits

Author SHA1 Message Date
Sean Mac Gillicuddy
d8f9809584 #3661 No Depictions Selected Dialog has reversed buttons - fix button order 2020-04-16 10:15:28 +01:00
Vivek Maskara
dee9638858 Fix build 2020-04-14 19:57:57 -07:00
Vivek Maskara
752d634114
Merge branch 'master' into structured-data 2020-04-14 10:52:12 -07:00
318anushka
75fe4ae5c1
Fast scroll issue fixed (#3593)
* fast scroll fixed in explore activity

* fast scroll fixed in explore activity

* fast scroll issue in explore

* fastscroll removed from explore
2020-04-14 11:34:35 +01:00
gouri-panda
5308c29240
Fixed logout problem #3547 (#3649)
* fixed logout problem

fixed logout problem

fixed logout problem

fixed logout problem

fixed logout problem

* added error handling on logout
2020-04-14 11:34:07 +01:00
Anmol Gupta
a0f8790d8f
Copy place name on long click (#3609)
* Copy place name on long click

* Remove hard coded string
2020-04-14 10:54:49 +01:00
translatewiki.net
e859c71905 Localisation updates from https://translatewiki.net. 2020-04-14 05:21:28 +02:00
Sean Mac Gillicuddy
94da061836 #3222 Merge master into Structured Data branch, fix conflicts - revert logging 2020-04-10 12:32:25 +01:00
vvijayalakshmi21
46847f0d77
Fix issue 3137 (#3637)
* Fix issue 3137

* Remove import Timber

* Remove unnecessary space
2020-04-10 11:40:36 +01:00
vvijayalakshmi21
62f176443b
Fix issue 3526 Unlike "Items" tab, "child classes" tab does not display description nor image thumbnail (#3619)
* fix thumbnail issue 3526

* Fix Description issue 3526

* revert changes on this file, not finished with it yet

* Fix Description for Child and Parent classes - issue 3526

* Remove conflict text in file

* Remove retrofit.HEAD import

* Incorporated review comments
2020-04-10 10:56:14 +01:00
Seán Mac Gillicuddy
628a6056e0
#3529 Captions/depictions are not saved to Commons (#3588)
* #3529 Captions/depictions are not saved to Commons - update flow to update appropriate data

* #3529 Captions/depictions are not saved to Commons - fix invoking of setlabel

* #3529 Captions/depictions are not saved to Commons - fix unit tests

* #3529 Captions/depictions are not saved to Commons - use constant for @Named

* #3529 Captions/depictions are not saved to Commons - remove captions interface

* #3529 Captions/depictions are not saved to Commons - delete unused Contribution fields - enforce Single Responsibility by using PageContentsCreator

* #3529 Captions/depictions are not saved to Commons - prefix id with M - remove language from url and only add from Field

* #3529 Captions/depictions are not saved to Commons - make edits of depictions and captions sequential

* #3529 Captions/depictions are not saved to Commons - remove unused model fields

* #3529 Captions/depictions are not saved to Commons - weaken type of categories - copy list on Contribution creation

* #3529 Captions/depictions are not saved to Commons - mark Media fields private - weaken types - remove partly implemented fields

* #3529 Captions/depictions are not saved to Commons - add semi colon

* #3529 Captions/depictions are not saved to Commons - fix test
2020-04-10 01:38:40 +10:00
translatewiki.net
241b54d008 Localisation updates from https://translatewiki.net. 2020-04-09 15:59:25 +02:00
Sean Mac Gillicuddy
3f6d26c296 Merge branch 'master' into structured-data
# Conflicts:
#	build.gradle
2020-04-09 11:01:12 +01:00
Seán Mac Gillicuddy
d7a42b2f89
#3624 DateTimeFormat wrong - match pattern returned from servers (#3625) 2020-04-09 02:39:41 +10:00
Kshitij Bhardwaj
c82283a014
Fixes #3506: Image height remains zero for some time on bad network (#3513)
* optimise width loading

* amending as per the reviews

* aspect ratio updates after layout completion

* MediaDetailFragment: update aspect ratio using onGlobalLayoutListener

* remove unnecessary imports
2020-04-08 00:30:24 +10:00
Sean Mac Gillicuddy
a9797a706a #3222 Merge master into Structured Data branch, fix conflicts - fix bad merge 2020-04-07 13:40:16 +01:00
Sean Mac Gillicuddy
5d2c786392 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/Media.java
#	app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
2020-04-07 11:35:01 +01:00
Josephine Lim
c53fcb53cb Merge branch '2.13-release' 2020-04-07 04:59:41 +10:00
Josephine Lim
b028d1489b Merge branch '2.13-release' 2020-04-07 04:58:41 +10:00
Kaartic Sivaraam
93d6c52eb0
Update wiki page links (#3608)
We've moved the documentation to a separate repo.

So, change the old links to point to the corresponding
places in the documentation repo.
2020-04-07 04:57:31 +10:00
Prince Amankwah
bc8ce94d76 Fixed issue #3195 ordering contribution list (#3589)
* issue-#3195: order contribution list refactored

* issue-#3195: ordered contribution list
2020-04-07 03:46:35 +10:00
neslihanturan
b6df5f2a66
Fixes #3466 No crash information in crash email (Gmail) (#3605)
* Send ACRA logs as file instead

* no need to set it true, default is true
2020-04-07 03:17:26 +10:00
318anushka
577fb02c78
exit app on back pressed in tutorial (#3597)
* exit app on back pressed in tutorial

* exit app from ongoing tutorial

* exit app on back press in tutorial
2020-04-06 15:15:51 +01:00
Prince Amankwah
80530663a1
Fixed issue #3195 ordering contribution list (#3589)
* issue-#3195: order contribution list refactored

* issue-#3195: ordered contribution list
2020-04-06 14:54:51 +03:00
vvijayalakshmi21
00e9357115
fix thumbnail issue 3526 (#3617) 2020-04-02 14:48:57 +09:00
translatewiki.net
eb88e58ec0 Localisation updates from https://translatewiki.net. 2020-03-31 15:50:35 +02:00
Prince Amankwah
f0a37d3369
issue-#3606: cancel in translate goes back to about screen (#3610) 2020-03-31 01:56:59 -07:00
Ashish Kumar
4f5f0da4c6
Fixes #3611 (#3613)
* Properly generate Parcealables for Media & Contribution
2020-03-31 01:47:26 -07:00
Ashish Kumar
6416314dda
Fixes #3575 (#3602)
* Donot show random colors as placeholders for contributions items
* Theme contributionsItem background as mainBackground from attributes
2020-03-30 12:42:47 +03:00
Kshitij Bhardwaj
3d1ffbb4bc
Fixes #3479: Implement Progress Bar for Zoom Activity (#3481)
* ZoomableActivity: add hierarchy to view for displaying progress bar

* CircularProgressBar: circular progress bar for ZoomableDraweeView

* ZoomableActivity: add indeterministic loading spinner

* activity_zoomable: add inderterministic Progressbar

* remove circular progressbar and make changes to controller listener
2020-03-29 22:55:47 +03:00
Prince Amankwah
8a5944dd87
issue-#3567: logos in about activity visible (#3592) 2020-03-29 22:29:51 +03:00
318anushka
5c4eea3cc1
swipe away failed notification (#3598) 2020-03-29 22:17:30 +03:00
translatewiki.net
b085091c2b Localisation updates from https://translatewiki.net. 2020-03-26 16:03:48 +01:00
neslihanturan
e7efd7e162
Fix auto zoom issue #3391 Zoom level gets reset at every second. (#3564)
* Add method to check if curr location marker is vsible or not

* Recenter map if users see their current location marker

* Add new methods to Contract
2020-03-27 00:53:11 +10:00
Seán Mac Gillicuddy
dec68ed922
#3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs (#3578)
* #3529 Captions/depictions are not saved to Commons - make copy of list of depictionEntityIds - uncomment editBaseDepictsProperty - refactor upload related classes

* #3529 Captions/depictions are not saved to Commons - fix wrong ArrayList usage

* #3529 Captions/depictions are not saved to Commons - fix test

* #3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs - replace title with the first MediaDetail

* #3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs - restore button disabling

* #3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs - fix nearby place
2020-03-26 20:17:05 +10:00
hudlerr
350e95b56a
Fixes #3494 (#3519)
* better names for the upload warning dialog buttons #3494

* Dialog button pt2

* dialog buttons pt3

* round 4..

Co-authored-by: Hdot <a.hudaa@hotmail.com>
2020-03-25 13:38:12 +00:00
Seán Mac Gillicuddy
23b8c2e659
#3529 Captions/depictions are not saved to Commons (#3574)
* #3529 Captions/depictions are not saved to Commons - make copy of list of depictionEntityIds - uncomment editBaseDepictsProperty - refactor upload related classes

* #3529 Captions/depictions are not saved to Commons - fix wrong ArrayList usage

* #3529 Captions/depictions are not saved to Commons - fix test
2020-03-25 20:42:29 +10:00
Sean Mac Gillicuddy
587d97716a Merge branch 'master' into structured-data 2020-03-25 10:13:06 +00:00
Seán Mac Gillicuddy
7ed911808d
#3579 p18Value causes NPE in WikidataEditService createClaimWithLogging - add null check (#3580) 2020-03-25 00:59:44 +10:00
Sean Mac Gillicuddy
2854f6af02 Fix method invocations 2020-03-24 13:48:15 +00:00
Sean Mac Gillicuddy
d5b62befc9 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/UploadService.java
#	app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java
2020-03-24 13:35:49 +00:00
318anushka
8cb4e28a97
Wiki itemname displaying in toast (#3569)
* Wiki itemname displaying in toast

* Wikidata label displaying in toast

* Wikidata label displaying in toast

* wikiItemName added to parcelable methods

* Wikidata label displayed in toast

* Wikidata label displayed in toast
2020-03-24 12:54:37 +00:00
Sean Mac Gillicuddy
2e43995276 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
2020-03-24 08:21:02 +00:00
Vivek Maskara
f7efa0e20a
Fix title/desc not getting filled for nearby picture (#3577) 2020-03-24 07:56:44 +00:00
translatewiki.net
a31499b11f Localisation updates from https://translatewiki.net. 2020-03-23 14:57:26 +01:00
Anmol Gupta
839a61bba4
Change BiMap to HashMap (#3572)
* Change BiMap to HashMap

* Change containsKey to containsValue and delete BiMap.java
2020-03-23 13:21:28 +00:00
Sean Mac Gillicuddy
895b343f81 #3222 Merge master into Structured Data branch, fix conflicts - review fixes 2020-03-23 11:30:02 +00:00
Kaartic Sivaraam
630f0a1dff
Fix hardcoded string in similar image dialog (#3563)
Fixes #3557
2020-03-22 11:23:00 -07:00
Sean Mac Gillicuddy
1404bb0da6 Merge remote-tracking branch 'origin/master' into structured-data
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
#	app/src/main/java/fr/free/nrw/commons/repository/UploadRemoteDataSource.java
#	app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.java
#	app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
#	app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java
#	app/src/test/kotlin/fr/free/nrw/commons/upload/FileProcessorTest.kt
#	app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt
2020-03-20 14:40:13 +00:00
Anmol Gupta
a63a3580de
Change "Archived" notifications to "Read" notifications (#3554)
* Change archived to read

* Change string names
2020-03-20 14:20:20 +00:00