mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 00:12:05 +03:00
Code Issues Projects Releases Packages Wiki Activity
6265 commits 220 branches 1587 tags 639 MiB
Commit graph

6265 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
a883a0fbde
[tx-robot] updated from transifex 2016-11-13 01:32:47 +00:00
Nextcloud bot
3416b77f13
[tx-robot] updated from transifex 2016-11-12 01:32:48 +00:00
Nextcloud bot
8dc52325fe
[tx-robot] updated from transifex 2016-11-11 01:32:50 +00:00
AndyScherzinger
e13a85fb53
fix access 2016-11-10 22:33:04 +01:00
AndyScherzinger
6c8bbd6c2c
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 
# Conflicts:
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/db/ProviderMeta.java
#	src/com/owncloud/android/providers/FileContentProvider.java
#	src/com/owncloud/android/services/observer/FolderObserver.java
#	src/com/owncloud/android/ui/activity/Preferences.java
 2016-11-10 22:18:15 +01:00
tobiasKaminsky
fb4fe4663e Merge remote-tracking branch 'origin/syncedFolders' into syncedFolders2 2016-11-10 21:50:43 +01:00
tobiasKaminsky
4c56ce2b0d fix only one picture is uploaded 2016-11-10 21:46:37 +01:00
AndyScherzinger
e34ccc8de3
1.4.1 RC1 + Changelog 2016-11-10 21:33:13 +01:00
Andy Scherzinger
d8f07d3abc Merge pull request #372 from nextcloud/fixSendLogCrash 
fix crash during log sending when exposing URI on Android 7+
 2016-11-10 21:13:56 +01:00
Andy Scherzinger
5f99b97044 Merge pull request #374 from nextcloud/fixPythonWarnings 
removed unused code warnings
 2016-11-10 21:13:38 +01:00
Andy Scherzinger
b3678f207b Merge pull request #346 from nextcloud/sortFix 
Use correct array of options
 2016-11-10 21:12:14 +01:00
Andy Scherzinger
113ebf6c93 Merge pull request #330 from iskradelta/master 
FindBugs and PMD appeased
 2016-11-10 20:51:37 +01:00
AndyScherzinger
a325a5ea55
removed unused code warnings 2016-11-10 11:43:15 +01:00
AndyScherzinger
73b8220df0
fix crash when exposing URI on Android 7+ 2016-11-10 11:42:19 +01:00
AndyScherzinger
b38cd1f00a
remove unused array list 2016-11-10 11:40:13 +01:00
AndyScherzinger
d64eabcc0f
re-add sort by size for local folder views while sorting folders in the list alphabetically 2016-11-10 11:40:13 +01:00
AndyScherzinger
eeff36b6a1
Use correct array of options 
Resolves: #336
 2016-11-10 11:40:10 +01:00
AndyScherzinger
48c4eb8754
Merge branch 'master' of https://github.com/iskradelta/android 2016-11-10 10:31:01 +01:00
AndyScherzinger
3bfe30ea8e
wrong access level 2016-11-10 10:20:12 +01:00
AndyScherzinger
8f10f62c51
fix codacy warnings after rebase 2016-11-10 10:20:11 +01:00
AndyScherzinger
0d0321b001
Fixes after rebase 2016-11-10 10:20:11 +01:00
AndyScherzinger
feae5b7647
further formatting issues 2016-11-10 10:20:10 +01:00
AndyScherzinger
8da1f33123
fixed minor warnings 2016-11-10 10:20:10 +01:00
Iskra Delta
01a70fed85
PMD appeased 
Some warnings have been supressed.
 2016-11-10 10:20:09 +01:00
Iskra Delta
56af1f4205
FindBugs appeased 2016-11-10 10:20:09 +01:00
AndyScherzinger
aa3d3c262c
further findbugs/pmd fixes for new feature (sd card) 2016-11-10 10:20:09 +01:00
AndyScherzinger
f5dab28729
fixed minor warnings 2016-11-10 10:20:08 +01:00
Iskra Delta
89137a0819
PMD appeased 
Some warnings have been supressed.
 2016-11-10 10:20:08 +01:00
Iskra Delta
6c12644cf7
FindBugs appeased 2016-11-10 10:20:07 +01:00
AndyScherzinger
3f343a3399
fix codacy findings 2016-11-10 10:20:07 +01:00
AndyScherzinger
39ed78b5cc
remove unnecessary valueOf call 2016-11-10 10:20:06 +01:00
AndyScherzinger
e3f8a49f3f
remove unused code 2016-11-10 10:20:06 +01:00
AndyScherzinger
4efdc6b00f
further formatting issues 2016-11-10 10:20:05 +01:00
AndyScherzinger
a30985ca1e
formatting 2016-11-10 10:20:05 +01:00
AndyScherzinger
99ef7cb84b
centralize repeated texts 2016-11-10 10:20:05 +01:00
Iskra Delta
433b684a24
PMD appeased 
Some warnings have been supressed.
 2016-11-10 10:20:04 +01:00
Iskra Delta
9d521be13b
FindBugs appeased 2016-11-10 10:20:04 +01:00
AndyScherzinger
54f4dc7032
further findbugs/pmd fixes for new feature (sd card) 2016-11-10 10:20:03 +01:00
AndyScherzinger
544825e947
fixed minor warnings 2016-11-10 10:20:02 +01:00
AndyScherzinger
1934bfd33e
add Null Checks to fix isGrid/list checks 2016-11-10 10:20:02 +01:00
AndyScherzinger
aacdfc0c13
fix new PMD error after rebase, fix display remote file list issue 2016-11-10 10:20:02 +01:00
Iskra Delta
0a13a5b818
PMD appeased 
Some warnings have been supressed.
 2016-11-10 10:20:01 +01:00
Iskra Delta
97da0cbc94
FindBugs appeased 2016-11-10 10:19:52 +01:00
Nextcloud bot
10c1f0ff3b
[tx-robot] updated from transifex 2016-11-10 01:32:56 +00:00
AndyScherzinger
65c4f416c0
wrong access level 2016-11-09 19:49:27 +01:00
AndyScherzinger
d05a601cd1
fix codacy warnings after rebase 2016-11-09 19:37:18 +01:00
AndyScherzinger
d71a3d65e9
Fixes after rebase 2016-11-09 19:13:16 +01:00
AndyScherzinger
52cd77e1b6
further formatting issues 2016-11-09 18:26:56 +01:00
AndyScherzinger
97dc860ece
fixed minor warnings 2016-11-09 18:25:57 +01:00
Iskra Delta
2efc49c3d5
PMD appeased 
Some warnings have been supressed.
 2016-11-09 18:25:38 +01:00