Skip to content

Sync master with release #3922

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

Merged
merged 25 commits into from
Sep 14, 2020
Merged

Sync master with release #3922

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cf73e28
#3624 DateTimeFormat wrong - match pattern returned from servers (#3625)
macgills Apr 8, 2020
c961099
Revert "Fixes: #3179 Make category search non case-sensitive (#3326)"…
sivaraam Apr 10, 2020
05a9aa8
Bugfix/security exception (#3627)
ashishkumar468 Apr 17, 2020
d7c2480
Fixes #3436 and #2881: Media Detail design Overhaul (#3505)
kbhardwaj123 Apr 19, 2020
461249f
Fixes #3639 (Fix Save State implementation of CheckBoxTriState ) (#3686)
ashishkumar468 Apr 26, 2020
63018fc
Add #3723 and #3721 to 2.13 release, fix conflicts
VitalyVPinchuk May 4, 2020
bff9231
Fix NullPointer when clicking on image in MediaDetailFragment (#3730)…
ashishkumar468 May 12, 2020
7417468
Update changelog.md
misaochan May 19, 2020
d97d40f
Versioning for v2.13
misaochan May 19, 2020
d950f72
Merge branch '2.13-release-2' of https://github.com/misaochan/apps-an…
misaochan May 19, 2020
ac3e515
Fixes #3705 (Crash when viewing pic I just uploaded) (#3782)
ashishkumar468 Jun 2, 2020
d02b959
Fixed BookmarkLocationsDao DB migration (#3793)
ashishkumar468 Jun 3, 2020
3e389be
Fixes #3725 (#3795)
ashishkumar468 Jun 4, 2020
78d519f
Handled null CompoundDrawable[2] in etTitle-> UploadMediaDetailsFragm…
ashishkumar468 Jun 23, 2020
e471226
DownSample Upload image to be shown in UploadMediaDetailFragment to h…
ashishkumar468 Jun 24, 2020
e7d9315
Bugfix/p18 uploads (#3869)
ashishkumar468 Jul 14, 2020
aa1d6fe
Fixes #3882 (#3883)
ashishkumar468 Jul 28, 2020
fcc3053
Fixes #3766, Added OPENSTREET attribution (#3889)
ashishkumar468 Aug 11, 2020
87f4796
Versioning and changelog for v2.13.1 (#3908)
misaochan Aug 25, 2020
624d351
Fixes #3914 (#3915)
ashishkumar468 Sep 1, 2020
1ec84d3
resolved merge-conflicts
ashishkumar468 Sep 10, 2020
a277ce1
fixed compile-time error
ashishkumar468 Sep 10, 2020
b0eb11c
fix erros
ashishkumar468 Sep 11, 2020
755179f
delete emptied files
ashishkumar468 Sep 13, 2020
5099411
remove empty file CategoriesModel.java
ashishkumar468 Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
delete emptied files
  • Loading branch information
@ashishkumar468
ashishkumar468 committed Sep 13, 2020
commit 755179ff6714fd98c89004e5137d1a49e241dd81
Empty file removed app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
View file
Open in desktop
Empty file.
Empty file removed app/src/main/java/fr/free/nrw/commons/nearby/NearbyAdapterFactory.java
View file
Open in desktop
Empty file.