Commit graph

928 commits

Author SHA1 Message Date
Jorge Casariego
b76fb516b6 Enable Stetho just on debug mode #813 2017-08-01 15:02:51 -04:00
Bruce Nishimura
2764bc4dd8 Using general preferences instead, splitting long lines. 2017-07-31 20:47:55 -04:00
Bruce Nishimura
fba9bf0327 Clean up extra imports 2017-07-31 17:12:25 -04:00
Bruce Nishimura
d3ce751f59 Added username to picture of the day icon. 2017-07-31 17:08:47 -04:00
Michiyo Wellington-Oguri
c02408c2a5 don't start new activity if already in that activity 2017-07-30 17:15:41 -07:00
Josephine Lim
4e1d239822 Merge branch 'master' into master 2017-07-30 18:20:42 +10:00
Mikel
946f4f2ac2 Fix implementation of getUploadCount() and its test 2017-07-28 16:22:16 +01:00
Mikel
d1e53db73a Rename misnamed variable 2017-07-28 15:23:07 +01:00
Mikel
2b30924242 Merge branch 'master' into rx_upload_count
# Conflicts:
#	app/src/main/java/fr/free/nrw/commons/concurrency/ThreadPoolExecutorService.java
#	app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
2017-07-28 14:47:37 +01:00
Mikel
6412e15f20 Move new Http query together with other ApacheHttpRequests 2017-07-28 14:38:54 +01:00
mebr1416
b32320b344 - Information by upload fields
- Fixed conflicts
2017-07-28 16:26:56 +03:00
Josephine Lim
71a7742a83 Merge pull request #817 from akaita/overriden_annotations
Add missing annotations
2017-07-28 19:54:46 +10:00
mebr1416
05bdfb588e Information by upload fields 2017-07-28 12:19:37 +03:00
Josephine Lim
a5a624f939 Merge pull request #808 from neslihanturan/oneTimePopUp
One time pop up
2017-07-27 16:49:22 +10:00
Neslihan
8b460b6f3a Fix ugly codes 2017-07-26 22:20:46 +03:00
Mikel
3b17d96bae Fix indentation 2017-07-26 17:36:05 +01:00
Mikel
09d94f3e06 Replace Guava-implemented getUploadCount with RxJava2 version 2017-07-26 16:56:44 +01:00
Mikel
79a22c1aca Add missing annotations 2017-07-26 16:24:24 +01:00
Neslihan
d72b239e20 Fix codacy 2017-07-26 14:57:51 +03:00
Neslihan
07102c04e9 Add developer plans to nav drawer 2017-07-26 14:29:56 +03:00
Neslihan
452dcaec72 Display pop up once, on 4th app start 2017-07-26 14:06:49 +03:00
Paul Hawke
3b797751a3 Cleanup - got rid of unused imports 2017-07-25 21:19:56 -05:00
Paul Hawke
bf59afcc3b Merge branch 'master' into categorization-recycler-view 2017-07-25 21:19:21 -05:00
Neslihan
4571482695 Fix codacy issues 2017-07-23 18:44:38 +03:00
Neslihan
19784f0e82 Add shared preferences 2017-07-23 18:10:42 +03:00
Neslihan
d88fb3b0de Prepare alert window and strings 2017-07-23 15:39:08 +03:00
Paul Hawke
02315c2ae7 Propagated the @NonNull annotation for place click listener and removed a test that made no sense. 2017-07-22 18:08:56 -05:00
Paul Hawke
4796557fb7 Made a pass through the code to introduce lambdas / method references in the places the Android Studio suggested. 2017-07-22 18:04:40 -05:00
Paul Hawke
eaffed2471 Changes suggested by Codacy 2017-07-22 14:12:35 -05:00
Paul Hawke
9c987efbd2 Swapped the ListView for a RecyclerView, made the fragment cleaner and fixed a whole bunch of code inspection issues. 2017-07-22 13:57:46 -05:00
Mikel
e9d77a0716 Use vector icons for nearby-map markers (#786) 2017-07-22 10:01:08 +09:00
Josephine Lim
19a3fa3adc Merge pull request #777 from akaita/media_detail
Fix issues in Media Detail screen
2017-07-20 01:20:10 +10:00
Mikel
2ce7a464ca Remove Clickable behaviour of License and Coordinates 2017-07-18 20:20:44 +01:00
Josephine Lim
3db421ad8c Merge pull request #789 from achalshant/fix_for_issue#750
Fix for issue#750
2017-07-18 17:20:24 +10:00
Achal Shantharam
e46588e336 Adding whitespaces 2017-07-17 17:03:18 +05:30
Achal Shantharam
3681176f54 Fix for issue #750 irrelevant categories 2017-07-17 12:03:13 +05:30
Achal Shantharam
e405b67bfb Fix for issue #750 irrelevant categories 2017-07-17 12:00:20 +05:30
mwoguri
8f0cd852a5 Update HtmlTextView.java
Added whitespace
2017-07-16 19:14:47 -07:00
Michiyo Wellington-Oguri
10637f4bf2 Use string substitution to avoid translating trademarked text 2017-07-16 14:28:23 -07:00
Yusuke Matsubara
3b728ca568 Coding style fixes 2017-07-16 15:13:40 +09:00
Mikel
7edfe34a3e Merge branch 'master' into media_detail 2017-07-15 18:59:36 +02:00
Mikel
65ddc1a4bb Add Nullable annotations to reduce risk of NPE 2017-07-15 18:41:10 +02:00
Josephine Lim
ee409a9e8f Merge pull request #769 from tised/#748_issue
fix for #748
2017-07-16 02:32:26 +10:00
Mikel
9d23907728 Fix Issue with repeating categories in MediaDetail 2017-07-15 18:16:45 +02:00
Mikel
7667180bc5 Make uploaded image's coordinates clickable 2017-07-15 17:53:37 +02:00
Paul Hawke
8e47f82de6 Merge remote-tracking branch 'upstream/master' 2017-07-15 06:16:31 -05:00
Mikel
1044fe13ae Make license in MediaDetail clickable 2017-07-15 09:21:35 +02:00
Josephine Lim
0da51457d0 Merge pull request #771 from tised/#739_issue
fix for #739
2017-07-14 02:17:48 +10:00
Josephine Lim
2e388c0d5e Merge pull request #772 from tised/#708_issue
fix for #708
2017-07-14 01:12:52 +10:00
Josephine Lim
350f9bb697 Merge pull request #773 from tised/#657_issue
improvements for #657 issue
2017-07-14 01:10:34 +10:00