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
638 commits 78 branches 116 tags 495 MiB
Commit graph

638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Josephine Lim
0f3a6ee43b Update README.md 2015-12-04 19:39:14 +13:00
Nicolas Raoul
af15101d60 Merge pull request #29 from misaochan/master 
Minor changes
 2015-11-09 14:26:11 +09:00
misaochan
70a43bba38 Fixed error with versionName 2015-11-09 18:10:16 +13:00
misaochan
05e82f0c40 Removed .apk file 2015-11-09 17:51:38 +13:00
misaochan
b63b04b411 Changed .gitignore to ignore IntelliJ build byproducts and APK file 2015-11-09 17:42:02 +13:00
misaochan
91763f62dd Removed residual Campaigns code 
Not sure why some got left behind. Didn't throw any errors until today.
 2015-11-06 16:15:30 +13:00
misaochan
1f3c0331bf Merge branch 'master' of https://github.com/misaochan/apps-android-commons 2015-11-04 19:26:09 +13:00
misaochan
8ce73d0a48 Rearranging ContributionsActivity code 
Rearranging with variable declarations on top and methods below to make
it clearer (previous code has variable declarations in between methods)
 2015-11-04 19:25:53 +13:00
misaochan
2a660ca0c2 New APK 2015-10-30 18:56:02 +13:00
misaochan
b4b03522e5 Includes APK and changes version in manifest 2015-10-30 18:56:01 +13:00
Josephine Lim
84c7faae29 Merge pull request #6 from misaochan/remove-campaigns2 
Removed dead  code behind campaigns shortcut
 2015-10-30 17:08:40 +13:00
misaochan
e02c74d0dd Merge remote-tracking branch 'refs/remotes/origin/master' into remove-campaigns2 2015-10-30 17:07:00 +13:00
misaochan
2763e9970f New APK 2015-10-30 17:01:33 +13:00
misaochan
a33e9bde15 Includes APK and changes version in manifest 2015-10-30 16:56:45 +13:00
Nicolas Raoul
a9eaa5c00b Merge pull request #26 from misaochan/remove-campaigns2 
Removes dead code behind campaigns feature
 2015-10-29 20:47:33 +09:00
misaochan
d0e9b8ae9a Modified UploadController 2015-10-29 21:50:29 +13:00
misaochan
a519b82761 Modified ShareActivity 2015-10-29 21:49:27 +13:00
misaochan
7ad697bf98 Modified DBOpenHelper 2015-10-29 21:48:42 +13:00
misaochan
29e2621a6d Modified ContributionsListFragmen 2015-10-29 21:48:11 +13:00
misaochan
cfdd4b2752 Modified ContributionController 2015-10-29 21:46:49 +13:00
misaochan
fff3cf05a9 Removed campaigns folder and modified ContributionsActivity 2015-10-29 21:44:40 +13:00
Josephine Lim
df023385d8 Merge pull request #5 from misaochan/remove-campaigns 
Remove campaigns
 2015-10-29 19:24:15 +13:00
misaochan
02dfa2117b Updated changelog with v1.3 2015-10-28 19:02:04 +13:00
misaochan
4876501d50 Resolves merge conflict 2015-10-28 15:52:09 +13:00
misaochan
3972ab9fd3 Revert "Removed dead code behind Campaigns feature" 
This reverts commit c64a64c905.

Conflicts:

	commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java

Changed version number

In preparation for uploading to Google Play
 2015-10-28 15:00:44 +13:00
misaochan
6225e04f9a Fixed extra semicolon 2015-10-21 19:58:39 +13:00
misaochan
c64a64c905 Removed dead code behind Campaigns feature 
- Removed entire Campaigns folder and associated classes
- Removed associated code in other classes (mostly that test for
campaign == null). I am assuming we want  to keep the behaviour where
campaign == null (ie campaigns are disabled) and discard the behaviour
where campaign != null
- Refactored code to fix spacing
 2015-10-21 19:29:08 +13:00
misaochan
235d290252 Removes extra Campaigns shortcut 
Removes extra Campaigns shortcut that is created when the app is
installed
 2015-10-21 18:49:02 +13:00
misaochan
f0eb6a795b Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2015-10-21 00:49:29 +13:00
Josephine Lim
118741e28c Merge pull request #4 from misaochan/signup-button 
Added "sign up" button
 2015-10-21 00:48:26 +13:00
Nicolas Raoul
3e2cef56cc Merge pull request #23 from misaochan/signup-button 
Signup button
 2015-10-20 20:03:41 +09:00
misaochan
04ee167c64 Added "sign up" button 
Fixes #6
 2015-10-20 23:33:58 +13:00
misaochan
9b256d591d Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2015-10-20 18:35:14 +13:00
misaochan
84acb320a7 Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master' 2015-10-20 18:27:07 +13:00
Nicolas Raoul
a2e37e1890 Merge branch 'master' of github.com:nicolas-raoul/apps-android-commons 2015-10-15 17:16:36 +09:00
Nicolas Raoul
e1ce562482 Google Play graphics 2015-10-15 17:15:40 +09:00
Nicolas Raoul
daa9ed9567 Merge pull request #21 from misaochan/master 
Changed directory to fr/free/nrw/commons
 2015-10-15 15:11:35 +09:00
Josephine Lim
401132f843 Merge pull request #3 from misaochan/folder-task 
Changed directory to fr/free/nrw/commons
 2015-10-15 18:43:05 +13:00
misaochan
ad88bb3929 Changed directory to fr/free/nrw/commons 
Fixes issue #14
 2015-10-15 18:41:19 +13:00
Nicolas Raoul
fd3595e336 Merge pull request #18 from misaochan/usage 
Removed usage reports option and code behind it
 2015-10-05 12:45:11 +09:00
Josephine Lim
3c2ff3d9d7 Removed usage tracking preference option in Settings layout file 2015-10-04 23:59:21 +13:00
Josephine Lim
23c73ab45a Removed Prefs.TRACKING_ENABLED condition in SettingsActivity.java 2015-10-04 23:58:08 +13:00
Josephine Lim
234c7ccd48 Removed EVENT_EVENTLOGGING_CHANGE Object in CommonsApplication 2015-10-04 23:56:57 +13:00
Nicolas Raoul
8434cd78de Merge pull request #2 from johnjohndoe/avoid-indirection 
Avoid indirection and redundant method calls.
 2015-09-18 21:38:13 +09:00
Tobias Preuss
a297dc39af Avoid indirection and redundant method calls. 2015-09-18 14:34:52 +02:00
Nicolas Raoul
919fe3b015 Design folder with Google Play assets 2015-09-09 14:29:49 +09:00
Nicolas Raoul
c1a93c64aa Bumped version 1.2 2015-09-09 10:29:25 +09:00
Nicolas Raoul
5ceb9aba69 Fixed namespace typo 2015-09-08 16:37:39 +09:00
Nicolas Raoul
061aa07df3 New logo 2015-09-08 16:32:51 +09:00
Nicolas Raoul
1154d33dfe Bumped version 1.1 2015-09-08 12:57:44 +09:00