Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest master #6

Merged
merged 173 commits into from
Apr 20, 2020
Merged

Merge latest master #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
f51957f
Versioning
misaochan Dec 1, 2019
a7402f2
Update changelog.md
misaochan Dec 1, 2019
bf4b731
Merge branch 'master' into 2.12-release
misaochan Dec 3, 2019
f7cca31
Optimize imports (#3272)
alcarazzam Dec 6, 2019
d0f9739
Merge branch '2.12-release'
misaochan Dec 6, 2019
b0be497
Convert few model classes to kotlin (#3270)
maskaravivek Dec 6, 2019
3d923af
Localisation updates from https://translatewiki.net.
translatewiki Dec 9, 2019
959b3af
Fixes #3231 "Nearby" always first puts me in Punta Arenas (#3271)
neslihanturan Dec 10, 2019
e23b80d
Merge branch '2.12-release'
misaochan Dec 10, 2019
b4c4691
Update strings.xml (#3285)
kizule Dec 10, 2019
28e96eb
Localisation updates from https://translatewiki.net.
translatewiki Dec 12, 2019
ecf6bd9
color accent changed tto blue in dark theme (#3234)
ankit1414 Dec 16, 2019
458b497
Localisation updates from https://translatewiki.net.
translatewiki Dec 16, 2019
a8ee5bd
Fix UI tests (#3297)
maskaravivek Dec 17, 2019
8fc8113
Localisation updates from https://translatewiki.net.
translatewiki Dec 19, 2019
846e04f
Localisation updates from https://translatewiki.net.
translatewiki Dec 23, 2019
824d6ac
Bugfix/null revision in review (#3309)
ashishkumar468 Dec 24, 2019
349e51f
Fixes #3307 (#3308)
ashishkumar468 Dec 24, 2019
b591fdd
Localisation updates from https://translatewiki.net.
translatewiki Dec 26, 2019
e56adc6
Localisation updates from https://translatewiki.net.
translatewiki Dec 31, 2019
85366aa
Localisation updates from https://translatewiki.net.
translatewiki Jan 2, 2020
173dcd2
Localisation updates from https://translatewiki.net.
translatewiki Jan 6, 2020
56c4018
Localisation updates from https://translatewiki.net.
translatewiki Jan 9, 2020
b55e683
More natural language instead of a slash (#3318)
amire80 Jan 10, 2020
d26b436
Remove unnecessary space before colon (#3317)
amire80 Jan 10, 2020
8824076
Localisation updates from https://translatewiki.net.
translatewiki Jan 13, 2020
59cb157
Localisation updates from https://translatewiki.net.
translatewiki Jan 16, 2020
9c6e339
Versioning for v2.12.1
misaochan Jan 19, 2020
53d3c37
Update changelog.md
misaochan Jan 19, 2020
ef9e298
Versioning and changelog for v2.12.1
misaochan Jan 19, 2020
c682ba8
Localisation updates from https://translatewiki.net.
translatewiki Jan 20, 2020
cd4fc2c
CategoryItem: add javadocs to the file (#3332)
kbhardwaj123 Jan 20, 2020
14ea6c0
Change tempalte character case from EXIF to Exif (#3330)
mds08011 Jan 20, 2020
bae3fa8
Fixes #3335 (#3337)
ashishkumar468 Jan 21, 2020
f9eb320
Issue 3236: Change nearby search text to white (#3331)
albendz Jan 22, 2020
ba8efb5
Versioning for v2.12.2
misaochan Jan 22, 2020
f7adbf7
Update changelog.md
misaochan Jan 22, 2020
095d047
Merge branch '2.12-release'
misaochan Jan 22, 2020
0fb8f97
Merge branch 'master' of https://github.com/commons-app/apps-android-…
misaochan Jan 22, 2020
fe56cef
Localisation updates from https://translatewiki.net.
translatewiki Jan 23, 2020
df426f7
Fixes #3320 (#3349)
ashishkumar468 Jan 26, 2020
fa87eb5
Fixes #3345 (#3350)
ashishkumar468 Jan 27, 2020
721d2fe
Fixes #3336 Hotfix: Coordinates of picture are not uploaded (#3339)
ashishkumar468 Jan 27, 2020
d86fe5d
Localisation updates from https://translatewiki.net.
translatewiki Jan 27, 2020
d235e5a
Fixes #3327: Trim whitespaces from title on upload (#3348)
GearGit Jan 28, 2020
803bed4
Fixes: #3343 TextUtils.isEmpty creates problems when unit testing wit…
kbhardwaj123 Jan 28, 2020
0affe71
Fixes: #3278: Add java docs to methods which have it missing (#3351)
kbhardwaj123 Jan 28, 2020
afdeaae
Fixes: #3179 Make category search non case-sensitive (#3326)
kbhardwaj123 Jan 29, 2020
2290545
Suggest and auto fill title and description based on image location (…
maskaravivek Jan 29, 2020
dc08a5e
Versioning for v2.12.3
misaochan Jan 29, 2020
5e3760a
Update changelog.md
misaochan Jan 29, 2020
0068820
Merge branch '2.12-release'
misaochan Jan 29, 2020
61bfe84
Localisation updates from https://translatewiki.net.
translatewiki Jan 30, 2020
bfb6dfd
Fix: Issue #3367 Bug: SoftKeyboard showing even after switching from …
animeshk08 Feb 2, 2020
8e88b2d
Localisation updates from https://translatewiki.net.
translatewiki Feb 3, 2020
a6d2523
Adds a Test for Method A categories search (#3366)
kbhardwaj123 Feb 3, 2020
05e9830
Fixes #3303 (#3322)
ashishkumar468 Feb 4, 2020
fdbe53d
Fixes #3371 (#3372)
ashishkumar468 Feb 4, 2020
b13d888
Localisation updates from https://translatewiki.net.
translatewiki Feb 6, 2020
3c93d80
Fixes #3382 Fixed Notification Message Icon Background (#3383)
madhurgupta10 Feb 7, 2020
81bb46f
changing background color of conditions in nearby as uniform (accordi…
ciphereck Feb 7, 2020
0049c8b
Fixes #3392 Fixed Nearby List Item Icon's Background (#3393)
madhurgupta10 Feb 8, 2020
e387e9a
Hide Review for logged out users (#3390)
Feb 9, 2020
eb40051
Localisation updates from https://translatewiki.net.
translatewiki Feb 10, 2020
b65e4a1
Fix #3191 Make the username along with the rewards icon clickable in …
yashk2000 Feb 11, 2020
6683ea4
Don't show the quiz pop-up twice (#3398)
Feb 11, 2020
9b3f3e9
Fixed minor Login Bug (#3373)
animeshk08 Feb 11, 2020
69e7161
Fixes #3197 Replace hardcoded dimensions with dimen resource values (…
yashk2000 Feb 12, 2020
bc60237
Localisation updates from https://translatewiki.net.
translatewiki Feb 13, 2020
75d4891
Fixes #3403 Add padding between privacy policy button and bottom of t…
yashk2000 Feb 14, 2020
4038519
code-quality: remove CDATA and <u> tags from string.xml (#3310)
bistaastha Feb 17, 2020
fd706cf
fix typo #3417 (#3418)
gouri-panda Feb 17, 2020
af97e40
Localisation updates from https://translatewiki.net.
translatewiki Feb 17, 2020
96f4a5c
Fixes #3355 : Do not display pins at all when "Needs Photo" is select…
kbhardwaj123 Feb 19, 2020
d423dbb
Localisation updates from https://translatewiki.net.
translatewiki Feb 20, 2020
39cb190
Fix #3416 Add snackbar on clicking add/remove from bookmarks (#3419)
yashk2000 Feb 21, 2020
3d0048a
Added progress dialog for setting wallpaper (#3427)
madhurgupta10 Feb 23, 2020
47155d1
Localisation updates from https://translatewiki.net.
translatewiki Feb 24, 2020
fffff62
Fixed a type in NearbyParentFragment.java where significantly was wri…
Feb 25, 2020
584fa2c
Fixes #814 Added App Shortcuts (#3381)
madhurgupta10 Feb 25, 2020
e303491
Localisation updates from https://translatewiki.net.
translatewiki Feb 27, 2020
7da5d13
Replace functions in FileUtilsTest with ones from kotlin-stdlib (#2943)
veyndan Mar 1, 2020
78057b6
Fix #3091: Remove odd code in CategoryImagesListFragment (#3133)
rtsketo Mar 1, 2020
e68751f
Moved some Java files to kotlin (#3439)
madhurgupta10 Mar 1, 2020
48b6745
Open external links in same activity (#3395)
Mar 2, 2020
6a5afef
Update mapbox, gradle and android plugin versions (#3443)
domdomegg Mar 2, 2020
36cafd7
Localisation updates from https://translatewiki.net.
translatewiki Mar 2, 2020
65ec071
Fix existing Espresso tests (#3450)
maskaravivek Mar 2, 2020
1584ffe
Added Support for System Wide Dark Theme (#3460)
macgills Mar 5, 2020
fa1d8bc
Localisation updates from https://translatewiki.net.
translatewiki Mar 5, 2020
49ef561
#3469 Update Gradle Play Publisher to resolve issues with travis buil…
macgills Mar 6, 2020
11e878e
Comment out application id from default config
maskaravivek Mar 7, 2020
16f1ba8
About page: Update logos (#3472)
gupta-anmol Mar 8, 2020
7450b44
Fixes #3295: Ultimate achievement: Too many contributions (#3378)
kbhardwaj123 Mar 8, 2020
64179d0
#3476 Use individual test commands on CI instead of check (#3477)
macgills Mar 9, 2020
5fd88ef
Localisation updates from https://translatewiki.net.
translatewiki Mar 9, 2020
642ed51
Fixes #3414: For v2.13, Handle zoom in media details view (#3422)
kbhardwaj123 Mar 9, 2020
99c6f5f
Shift contributions to use Room DB (#3324)
ashishkumar468 Mar 9, 2020
bd66818
[WIP] Implemented Espresso tests for upload with multilingual descrip…
maskaravivek Mar 10, 2020
61a3f45
openStreetMap attribution enabled (#3485)
aakankshaa23 Mar 11, 2020
80ea11f
#3445 Add codestyle to git - import google java code style, use pred…
macgills Mar 11, 2020
57ddc6a
#3488 Delete app/prod folder - deleted (#3489)
macgills Mar 11, 2020
d925e32
Added AboutActivityTest (#3475)
madhurgupta10 Mar 11, 2020
ed5f8ef
Localisation updates from https://translatewiki.net.
translatewiki Mar 12, 2020
4bd7a5b
#3493 App freezes for 15 seconds when you press Next in UploadMediaDe…
macgills Mar 13, 2020
a78e167
Revert stopgaps related to beta server cert issue (#3396)
sivaraam Mar 13, 2020
668b589
Chek if getContext() is instanceOf CategoryImagesCallback and only th…
kbhardwaj123 Mar 14, 2020
81c7281
#3471 Remove android.enableUnitTestBinaryResources - remove line (#3478)
macgills Mar 16, 2020
34a016d
Change item background according to the theme (#3480)
gupta-anmol Mar 16, 2020
1fd748f
solved crashing problem in nomination button (#3522)
gouri-panda Mar 16, 2020
9cb81fc
author not shown bug (#3525)
aakankshaa23 Mar 16, 2020
af131a9
Localisation updates from https://translatewiki.net.
translatewiki Mar 16, 2020
bdb61df
Fixes #2238 scalebar added in map (#3511)
318anushka Mar 17, 2020
e5d5a7a
Fix p18 issue For an item with P18 item, do not add another one (#3527)
neslihanturan Mar 17, 2020
cd2d530
#3524 Convert SpinnerLanguagesAdapter to kotlin - converted to kotlin…
macgills Mar 17, 2020
e55b549
Fixes #3464, App posts deletion request notifications ({{subst:idw}})…
VitalyVPinchuk Mar 17, 2020
15bccdf
Fixes #3465 Use AndroidX Pref (#3521)
madhurgupta10 Mar 17, 2020
021105a
Add a dialog to prompt user if location is off in Nearby when L… (#3438)
Mar 18, 2020
efdb00b
Fixes #3359 Duplicate Photos in Contributions Page (#3515)
ashishkumar468 Mar 18, 2020
0ad269d
Fixes 3536 (#3537)
madhurgupta10 Mar 19, 2020
4e51492
Removed the focus change listener of the username edittext (#3538)
Mar 19, 2020
a0309d9
Modify PR template (#3548)
gupta-anmol Mar 19, 2020
d028cf1
Localisation updates from https://translatewiki.net.
translatewiki Mar 19, 2020
d3bc072
Issue #3428: Swapped text in dialog buttons (#3496)
FawziyahAlebiosu Mar 20, 2020
c972f74
#3532 Issue with gitignore - synchronise section with default plugin …
macgills Mar 20, 2020
efc6fa6
Fixes #3473 Changed Names and Order or Theme Options (#3556)
madhurgupta10 Mar 20, 2020
fb51fc6
#3408 Refactoring the FileProcessor and GPSExtractor classes (#3543)
macgills Mar 20, 2020
a63a358
Change "Archived" notifications to "Read" notifications (#3554)
gupta-anmol Mar 20, 2020
630f0a1
Fix hardcoded string in similar image dialog (#3563)
sivaraam Mar 22, 2020
839a61b
Change BiMap to HashMap (#3572)
gupta-anmol Mar 23, 2020
a31499b
Localisation updates from https://translatewiki.net.
translatewiki Mar 23, 2020
1899d92
PULL_REQUEST_TEMPLATE: request only issue number (#3545)
sivaraam Mar 23, 2020
f7efa0e
Fix title/desc not getting filled for nearby picture (#3577)
maskaravivek Mar 24, 2020
8cb4e28
Wiki itemname displaying in toast (#3569)
318anushka Mar 24, 2020
7ed9118
#3579 p18Value causes NPE in WikidataEditService createClaimWithLoggi…
macgills Mar 24, 2020
350e95b
Fixes #3494 (#3519)
hudlerr Mar 25, 2020
e7efd7e
Fix auto zoom issue #3391 Zoom level gets reset at every second. (#3564)
neslihanturan Mar 26, 2020
b085091
Localisation updates from https://translatewiki.net.
translatewiki Mar 26, 2020
38635d0
PULL_REQUEST_TEMPLATE: clarify that issue number needs to be replaced…
sivaraam Mar 29, 2020
5c4eea3
swipe away failed notification (#3598)
318anushka Mar 29, 2020
8a5944d
issue-#3567: logos in about activity visible (#3592)
isnirp Mar 29, 2020
3d1ffbb
Fixes #3479: Implement Progress Bar for Zoom Activity (#3481)
kbhardwaj123 Mar 29, 2020
6416314
Fixes #3575 (#3602)
ashishkumar468 Mar 30, 2020
4f5f0da
Fixes #3611 (#3613)
ashishkumar468 Mar 31, 2020
f0a37d3
issue-#3606: cancel in translate goes back to about screen (#3610)
isnirp Mar 31, 2020
eb88e58
Localisation updates from https://translatewiki.net.
translatewiki Mar 31, 2020
8053066
Fixed issue #3195 ordering contribution list (#3589)
isnirp Apr 6, 2020
577fb02
exit app on back pressed in tutorial (#3597)
318anushka Apr 6, 2020
b6df5f2
Fixes #3466 No crash information in crash email (Gmail) (#3605)
neslihanturan Apr 6, 2020
bc8ce94
Fixed issue #3195 ordering contribution list (#3589)
isnirp Apr 6, 2020
93d6c52
Update wiki page links (#3608)
sivaraam Apr 6, 2020
b028d14
Merge branch '2.13-release'
misaochan Apr 6, 2020
c53fcb5
Merge branch '2.13-release'
misaochan Apr 6, 2020
c82283a
Fixes #3506: Image height remains zero for some time on bad network (…
kbhardwaj123 Apr 7, 2020
df16f98
#3492 Add inspections to git - add inspection profile (#3631)
macgills Apr 8, 2020
6b075d9
#3628 Update Gradle Plugin - bump version (#3629)
macgills Apr 8, 2020
d7a42b2
#3624 DateTimeFormat wrong - match pattern returned from servers (#3625)
macgills Apr 8, 2020
241b54d
Localisation updates from https://translatewiki.net.
translatewiki Apr 9, 2020
e859c71
Localisation updates from https://translatewiki.net.
translatewiki Apr 14, 2020
a0f8790
Copy place name on long click (#3609)
gupta-anmol Apr 14, 2020
5308c29
Fixed logout problem #3547 (#3649)
gouri-panda Apr 14, 2020
75fe4ae
Fast scroll issue fixed (#3593)
318anushka Apr 14, 2020
e341e77
Converted DialogUtil to Kotlin (#3621)
madhurgupta10 Apr 15, 2020
9ee04f3
ReviewController: remove call to review category notif builder while …
kbhardwaj123 Apr 15, 2020
32ee0b4
With data-client added as library module (#3656)
maskaravivek Apr 15, 2020
743e24c
Fixed username visible after logout bug (#3648)
madhurgupta10 Apr 15, 2020
773412f
Localisation updates from https://translatewiki.net.
translatewiki Apr 16, 2020
0d6a79e
#3630 [Library Discussion] Core-ktx (#3660)
macgills Apr 16, 2020
55c5b1a
Convert download code to kotlin (#3665)
maskaravivek Apr 16, 2020
07f19c4
Remove unused constructor (#3668)
maskaravivek Apr 17, 2020
ff310e4
#3658 Throw exception instead of allowing nullable network models onE…
macgills Apr 17, 2020
fcd2867
Address code review comments (#3669)
maskaravivek Apr 17, 2020
81e12a9
Fixes #3436 and #2881: Media Detail design Overhaul (#3505)
kbhardwaj123 Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# IDEA files
*.iml
*.iws
*.ipr
.idea
*.iws
/.idea/*
app/src/main/gen/*

# IDEA/Android Studio Ignore exceptions
!/.idea/codeStyles/
!/.idea/inspectionProfiles/

# Gradle
.gradle
local.properties
Expand Down Expand Up @@ -38,3 +42,4 @@ app/src/main/jniLibs
#Below removes all the HTML files related to OpenCV documentation. The documentation can be otherwise found at:
#https://docs.opencv.org/3.3.0/
/libraries/opencv/javadoc/
captures/*
Loading