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

2673 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mikel
ef1fc0c9d9 Improve code readability 2017-08-06 20:33:29 +01:00
Mikel
0443f65c4a Reorder to clarify 2017-08-06 20:11:27 +01:00
Mikel
22cd1ac72a Fix import 2017-08-06 20:09:45 +01:00
Mikel
b7215c580f Migrate network tasks to RxJava 2017-08-06 19:58:58 +01:00
Mikel
84a5f0a221 Move DB tasks to model/dao object 2017-08-06 19:27:47 +01:00
Mikel
0c0c814604 Refactor CategorizationFragment to use RxJava2 2017-08-06 17:58:31 +01:00
Mikel
494739da5e Implement equals and hashCode for CategoryItem 2017-08-06 17:57:29 +01:00
Mikel
4c0ea95670 Add dependencies for RxBindings 2017-08-06 17:56:51 +01:00
Mikel
7b879e459c Update RvAdapter dependency 2017-08-06 17:56:33 +01:00
Mikel
a2772b4891 Prevent multiline in Search for Categories 2017-08-06 17:56:16 +01: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
Mikel
ad9e848e83 Merge pull request #4 from commons-app/master 
Update to latest upstream master
 2017-08-03 18:42:21 +01: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
Bruce Nishimura
06efa26f5e Readding log that I accidently deleted 2017-08-02 00:44:27 -04:00
Bruce Nishimura
a014900e37 Removed username from preferences, now uses current account. 
Improved text positioning/styling slightly.
 2017-08-02 00:38:34 -04: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
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
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