Commit graph

2617 commits

Author SHA1 Message Date
neslihanturan
e3455b630e Merge pull request #796 from akaita/media_detail_enhance
Enhance behaviour of Media detail enhance
2017-08-08 15:29:33 +03:00
Mikel
bef42de613 Remove unused imports 2017-08-08 13:08:56 +01:00
Nicolas Raoul
1cccdf4552 Merge pull request #837 from janpio/patch-2
remove documentation from README
2017-08-08 20:01:29 +09:00
Jan Piotrowski
1e1ff4931b remove documentation from README
and move it to added to the wiki:

https://github.com/commons-app/apps-android-commons/wiki/Develop-with-Android-Studio-or-IntelliJ
https://github.com/commons-app/apps-android-commons/wiki/Build-Manually
https://github.com/commons-app/apps-android-commons/wiki/Code-Structure
https://github.com/commons-app/apps-android-commons/wiki/On-Device-Storage
https://github.com/commons-app/apps-android-commons/wiki/Volunteers-welcome%21
https://github.com/commons-app/apps-android-commons/wiki/Translating-the-App

closes #811
2017-08-08 12:36:58 +02:00
Mikel
304e998a0b Line break to add readability 2017-08-07 20:53:00 +01:00
Mikel
7754c7c7c4 Fix vectors for drawableStart in API 17 2017-08-07 20:44:35 +01:00
Yusuke Matsubara
2777bacd27 Merge pull request #828 from jorgecasariego/master
Enable Stetho just on debug mode #813
2017-08-07 22:31:36 +09:00
Nicolas Raoul
342ba00e9f Merge pull request #835 from whym/twn
Rename values-skr-arab to values-skr
2017-08-07 22:04:32 +09:00
Yusuke Matsubara
260fa26bdd Rename values-skr-arab to values-skr 2017-08-07 20:29:45 +09:00
translatewiki.net
64c3d402ca Localisation updates from https://translatewiki.net. 2017-08-07 07:19:49 +02:00
neslihanturan
8ca35c7653 Merge pull request #833 from mebr1416/master
Day mode by default #825
2017-08-05 12:55:01 +03:00
mebr1416
0c303298b2 Resolve for "Day mode by default #825" 2017-08-04 18:40:22 +03:00
neslihanturan
28a0a15616 Merge pull request #818 from akaita/rx_upload_count
Use RxJava2 for getting upload count
2017-08-03 17:10:41 +03:00
mebr1416
ece14bd86a Merge remote-tracking branch 'origin/master' 2017-08-03 15:01:37 +03:00
mebr1416
1c63681e64 Resolve for "Day mode by default #825" 2017-08-03 15:01:22 +03:00
translatewiki.net
7303114198 Localisation updates from https://translatewiki.net. 2017-08-03 10:38:04 +02:00
Mikel
04ff70fa5b Codacy :) 2017-08-02 22:06:37 +01:00
Mikel
1618640046 Make Codacy happy 2017-08-02 22:02:36 +01:00
Mikel
d314964018 Merge from master and add icons to clickable fields 2017-08-02 21:57:13 +01:00
Mikel
a025cc97d5 Merge branch 'master' into media_detail_enhance 2017-08-02 21:24:47 +01:00
Mikel
584a030def Hack to avoid usage of exhausted thread pool 2017-08-02 02:09:57 +01:00
Jorge Casariego
b76fb516b6 Enable Stetho just on debug mode #813 2017-08-01 15:02:51 -04:00
Josephine Lim
546620b756 Merge pull request #824 from mwoguri/duplicate_activities_on_backstack_#665
don't start new activity if already in that activity
2017-08-01 21:09:49 +10:00
Josephine Lim
bc11896212 Update CREDITS.md 2017-08-01 19:54:13 +10:00
translatewiki.net
55e4f0592b Localisation updates from https://translatewiki.net. 2017-07-31 14:55:55 +02: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
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