mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-04 00:33:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
3792 commits 78 branches 116 tags 495 MiB
Commit graph

3792 commits

This branch
This branch
All branches
Author SHA1 Message Date
Josephine Lim
ca46d4f516 Merge pull request #820 from mebr1416/master 
Fix for issue #701
 2017-07-30 19:17:18 +10:00
Josephine Lim
4e1d239822 Merge branch 'master' into master 2017-07-30 18:20:42 +10:00
Josephine Lim
2e4a15ffbc Merge pull request #822 from amire80/preference_tracking_summary 
Remove the preference_tracking and preference_tracking_summary messages
 2017-07-30 17:08:25 +10:00
Amire80
437ebe3813 Remove the preference_tracking and preference_tracking_summary messages 
These strings don't seem to be used anywhere.
 2017-07-29 17:30:12 +03:00
Mikel
946f4f2ac2 Fix implementation of getUploadCount() and its test 2017-07-28 16:22:16 +01:00
mebr1416
c69a1b397c - Fixed conflicts 2017-07-28 17:30:38 +03:00
Mikel
d1e53db73a Rename misnamed variable 2017-07-28 15:23:07 +01:00
mebr1416
a27ad4a8e8 - Information by upload fields 
- Fixed conflicts
 2017-07-28 17:04:50 +03: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
8970b3d0d6 Merge pull request #3 from commons-app/master 
Update to latest upstream master
 2017-07-28 14:41:16 +01:00
Mikel
a07a25e75a Add test for new Http query 2017-07-28 14:39:13 +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
da57ffeb2e Merge pull request #821 from misaochan/master 
Versioning and changelog for v2.5.0
 2017-07-28 22:03:55 +10:00
misaochan
ac5b876b1a Versioning 2017-07-28 21:45:09 +10:00
Josephine Lim
69cca7eb31 Update changelog.md 2017-07-28 21:44:22 +10:00
misaochan
9d124aeadb Merge remote-tracking branch 'refs/remotes/commons-app/master' 2017-07-28 21:15:26 +10:00
Josephine Lim
6f19446011 Add akaita and janpio to CREDITS.md 2017-07-28 20:30:14 +10:00
Josephine Lim
71a7742a83 Merge pull request #817 from akaita/overriden_annotations 
Add missing annotations
 2017-07-28 19:54:46 +10:00
Josephine Lim
7e81a74ef2 Merge pull request #816 from akaita/remove_dead_translations 
Remove dead translations
 2017-07-28 19:53:39 +10:00
mebr1416
05bdfb588e Information by upload fields 2017-07-28 12:19:37 +03:00
translatewiki.net
99d74bc3fd Localisation updates from https://translatewiki.net. 2017-07-27 10:08:13 +02: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
Neslihan
1c3332f6b5 Change url to a new page 2017-07-26 20:29:57 +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
5e0e34cf10 Add one more line break 2017-07-26 18:24:09 +03:00
Neslihan
bfc74a610b Minor fixes 2017-07-26 18:20:57 +03:00
Mikel
006d8d1926 Remove dead translations 2017-07-26 16:07:47 +01:00
Mikel
9658f18fea Merge pull request #2 from commons-app/master 
Update to latest upstream master
 2017-07-26 15:58:30 +01:00
Neslihan
d72b239e20 Fix codacy 2017-07-26 14:57:51 +03:00
Neslihan
fc8a3c1c9e Ups, fix the link:) 2017-07-26 14:56:10 +03:00
Neslihan
07102c04e9 Add developer plans to nav drawer 2017-07-26 14:29:56 +03:00
Neslihan
1c9989d658 Update strings 2017-07-26 14:13:25 +03:00
Neslihan
452dcaec72 Display pop up once, on 4th app start 2017-07-26 14:06:49 +03:00
Yusuke Matsubara
0f696ca755 Merge pull request #806 from psh/categorization-recycler-view 
Swapped the ListView for a RecyclerView on CategorizationFragment
 2017-07-26 19:14:11 +09: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
Josephine Lim
d9caee8fdb Merge pull request #807 from psh/java-8-retrolambda 
Java 8 & Retrolambda
 2017-07-25 23:13:23 +10:00
Josephine Lim
35d4a71673 Merge pull request #805 from mebr1416/master 
Issue 721
 2017-07-25 16:53:24 +10:00
Paul Hawke
e1432a0a14 Merge branch 'master' into categorization-recycler-view 2017-07-24 15:07:08 -05:00
mebr1416
244af93f19 "Copyrighted material" 2017-07-24 10:26:48 +03:00
Josephine Lim
a2e667d1c9 Merge pull request #803 from whym/travis 
Remove lint results from Travis reports
 2017-07-24 17:06:56 +10:00
translatewiki.net
815465bbd3 Localisation updates from https://translatewiki.net. 2017-07-24 06:40:38 +02:00
Paul Hawke
4979873f76 Merge remote-tracking branch 'upstream/master' into java-8-retrolambda 2017-07-23 16:55:26 -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