Commit graph

1105 commits

Author SHA1 Message Date
Vishan Seru
f284a00de2 Made changes to ensure that when attempting to upload multiple images, the GPS data is extracted and attached correctly. 2018-02-21 14:10:40 +05:30
Hassan
6ab4520927
Merge branch 'master' into master 2018-02-20 21:43:14 -06:00
Hassan
03015691c4
Merge branch 'master' into 1130(b) 2018-02-20 20:53:13 -06:00
hismaeel
c7ed3b4b5b Merge remote-tracking branch 'origin/master' into 1156Fix 2018-02-20 21:38:55 -05:00
hismaeel
f9b99f9280 issue #1156 fix 2018-02-20 21:38:22 -05:00
Hassan
33f6c50530
Reverting 1130
Still finding way around VCS :-)) Will make separate PR for 1130 (b)
2018-02-20 18:58:22 -05:00
hismaeel
979e407656 issue #1130 (b) 2018-02-20 18:14:00 -05:00
hismaeel
52a1ed459f issue #1130 (b) 2018-02-20 17:42:25 -05:00
Suchit Kar
88f0e65bcc Fix crash while setting Title and Description in RTL languages 2018-02-20 18:35:45 +05:30
Vishan Seru
054fa93460 Detecting pictures that are too dark (#926)
* Made the following changes:
->Added OpenCV library to the project
->Added functionality to detect if an image being uploaded is too dark
->Added functionality to detect if an image being uploaded is blurred

* Made corrections and changes based on gradle checkstyle requirements

* Updated gitignore to remove binary files related to OpenCV from project

* Image blurriness detection was undone. Images are checked only for being too dark now

* Removed OpenCV documentation folder containing a lot of html files

* Removed unnecessary buildScript usage in build.gradle file for opencv library and also added abi splits

* Removed OpenCV library usages and references from project

* Removed OpenCV library folder from project
2018-02-18 15:01:42 +05:30
Vishan Seru
4fc3040d52 Synced branch with master 2018-02-18 00:32:25 +05:30
hismaeel
6b63fad407 issue 1130 (b) 2018-02-17 12:42:57 -05:00
Hassan
b03e67dcd6
Merge branch 'master' into master 2018-02-17 12:07:58 -06:00
hismaeel
5860825a09 Issue #1156 2018-02-17 11:02:35 -05:00
neslihanturan
8dfe9d6bff
Merge pull request #1122 from noloman/bugfix/171
Fixing some lint issues for #171
2018-02-17 14:25:35 +03:00
neslihanturan
38c3eacad4
Merge pull request #1150 from harisankerPradeep/Bug#954
Bug#954 Take latitude/longitude from picture taken seconds after
2018-02-17 00:41:03 +03:00
harisankerPradeep
1e0c210c30 Fixes multiple dialog boxes 2018-02-17 02:33:54 +05:30
Jón Freysteinn Jónsson
34c112fb30
Merge branch 'master' into 171-fixing-lint-jfj 2018-02-16 15:55:18 +00:00
neslihanturan
c6885ec143
Merge pull request #1148 from tshradheya/bug-1130
1130-g  solved
2018-02-15 18:28:51 +03:00
harisankerPradeep
3a7b8880c7 attempt to fix travis CI build fail 2018-02-15 20:41:14 +05:30
neslihanturan
8a26a09b69
Merge pull request #1134 from junkiattan/1029-filtering
Filter out irrelevant categories (to filter out before 2000s when year is in format XXXX) #1029
2018-02-15 17:05:43 +03:00
harisankerPradeep
2eab64eb7a
Merge branch 'master' into Bug#954 2018-02-15 19:25:02 +05:30
Shradheya Thakre
c8e3b52b10 Fixed error 2018-02-15 21:15:59 +08:00
Jón Freysteinn Jónsson
fc7bdc62fb Fix some javadoc issues 2018-02-15 13:20:56 +01:00
neslihanturan
afe964d359
Merge pull request #1149 from tshradheya/codestyle-fixes
Improve code quality
2018-02-15 14:56:36 +03:00
harisankerPradeep
824501f6ce After implementing UI also 2018-02-14 15:59:34 +05:30
Shradheya Thakre
9dd01b9170 Improve code quality 2018-02-14 14:16:41 +08:00
Shradheya Thakre
5133dbaed0 1130-g solved 2018-02-14 13:56:23 +08:00
junkiattan
3be0c8c22f Solved merge conflicts in string xml files when pulling from upstream 2018-02-13 00:03:35 +08:00
junkiattan
68fb5ee1ac added relevant filtering to containsYear method of CategorizationFragment.java 2018-02-12 17:40:18 +08:00
harisankerPradeep
8f0584534d After completing findOtherImage() 2018-02-10 13:39:46 +05:30
Manuel Lorenzo
304bf51f5f Fixing some lint issues for #171 2018-02-07 11:32:24 +01:00
maskara
2efba06e35 Fix loader in 2FA screen 2018-02-06 02:01:06 +05:30
maskara
9c23a8c34b Make login work across sessions 2018-02-06 01:52:53 +05:30
maskara
1ea0a1ebeb Make 2FA login work with commons 2018-02-06 01:52:53 +05:30
misaochan
6dee869027 Merge remote-tracking branch 'refs/remotes/origin/2.6.7-release' 2018-02-01 01:48:57 +10:00
misaochan
87fc6903b8 Added error logging 2018-01-31 23:25:06 +10:00
misaochan
b42340b03a Return early if contributionsClient == null 2018-01-31 23:18:28 +10:00
Josephine Lim
3697eb5b2d
Merge pull request #1089 from maskaravivek/notifications
Integrated Notifications API
2018-01-26 00:28:25 +10:00
Josephine Lim
54d761fc62
Merge pull request #1083 from maskaravivek/mapbox
Remove attribution for mapbox
2018-01-26 00:27:02 +10:00
tanvidadu
dd2c5dbcb8 Hide Keypad on clicking outside the EditText 2018-01-24 22:21:37 +05:30
neslihanturan
a6caa64e17
Merge pull request #1080 from tshradheya/fb-about-button
Revamped About Page #1005
2018-01-24 18:08:31 +03:00
misaochan
c80d106636 Add TODO for sole remaining flagged NPE 2018-01-22 16:55:32 +10:00
misaochan
00eb55692e Make error logs more polite 2018-01-22 16:54:22 +10:00
misaochan
417013dcd8 Prevent NPE from string literal comparison 2018-01-22 16:51:02 +10:00
misaochan
895d64dce9 Prevent NPE from string literal comparison 2018-01-22 16:50:47 +10:00
misaochan
2d677d9dad Add null check to line that causes crash 2018-01-22 16:48:33 +10:00
misaochan
6ea7367bf3 Add check for moveToFirst() 2018-01-22 16:47:42 +10:00
maskara
41d6abdf40 Remove unused code 2018-01-22 04:09:43 +05:30
maskara
28a6a3b71d Integrate notifications API 2018-01-22 03:46:54 +05:30