David A. Velasco
|
51a04aa541
|
Refactored extractions of server version from AccountManager through
AccountUtils; fixed line lengths and some warnings
|
2015-06-25 09:10:48 +02:00 |
|
David A. Velasco
|
1a3a150248
|
Automatic grid view is only enabled if server supports remote thumbnails and ALL the files in a folder are images
|
2015-06-25 09:10:47 +02:00 |
|
Jenkins for ownCloud
|
b4c217b505
|
[tx-robot] updated from transifex
|
2015-06-25 01:13:56 -04:00 |
|
Jenkins for ownCloud
|
4aed07aae1
|
[tx-robot] updated from transifex
|
2015-06-24 01:13:55 -04:00 |
|
Jenkins for ownCloud
|
51a539f4ee
|
[tx-robot] updated from transifex
|
2015-06-23 01:14:15 -04:00 |
|
David A. Velasco
|
bdf2b58865
|
Merge pull request #1024 from owncloud/fix_shared_by_link_for_server_without_public_uploads
Fix shared by link for server without public uploads
|
2015-06-22 14:53:47 +02:00 |
|
masensio
|
2fbd757d66
|
Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
Conflicts:
owncloud-android-library
|
2015-06-22 14:03:21 +02:00 |
|
David A. Velasco
|
8981be0c71
|
Merge branch 'master' into develop
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2015-06-22 11:23:05 +02:00 |
|
David A. Velasco
|
f606fe97c5
|
Merge pull request #999 from owncloud/fix-code-that-never-worked
Use .equals instead of !=
|
2015-06-22 10:05:38 +02:00 |
|
David A. Velasco
|
c8386e463a
|
Constant first
|
2015-06-22 09:52:35 +02:00 |
|
Jenkins for ownCloud
|
a860ff6f96
|
[tx-robot] updated from transifex
|
2015-06-22 01:13:55 -04:00 |
|
Jenkins for ownCloud
|
37b2991755
|
[tx-robot] updated from transifex
|
2015-06-21 01:13:57 -04:00 |
|
Jenkins for ownCloud
|
f6abd41e09
|
[tx-robot] updated from transifex
|
2015-06-20 01:14:01 -04:00 |
|
masensio
|
e7710e7383
|
Update string subject_token and update library reference
|
2015-06-19 15:11:49 +02:00 |
|
Jenkins for ownCloud
|
f150ccd21c
|
[tx-robot] updated from transifex
|
2015-06-19 01:13:55 -04:00 |
|
Jenkins for ownCloud
|
95bdfc0643
|
[tx-robot] updated from transifex
|
2015-06-18 01:14:01 -04:00 |
|
David A. Velasco
|
3febfa1e08
|
Merge pull request #1014 from owncloud/forbidden_characters_from_server
Delegate check of forbidden characters on server, for OC >= 8.1
|
2015-06-17 09:20:27 +02:00 |
|
David A. Velasco
|
01d039239d
|
Updated reference to library after merging support for forbidden characters in server into develop
|
2015-06-17 09:15:53 +02:00 |
|
Jenkins for ownCloud
|
122ee28b85
|
[tx-robot] updated from transifex
|
2015-06-17 01:13:57 -04:00 |
|
masensio
|
75ea28aefe
|
Update library reference (Code Review)
|
2015-06-16 15:16:16 +02:00 |
|
masensio
|
935e9d4c34
|
Update library reference
|
2015-06-16 10:54:40 +02:00 |
|
Jenkins for ownCloud
|
32470c97eb
|
[tx-robot] updated from transifex
|
2015-06-16 01:14:07 -04:00 |
|
masensio
|
75fd0f40c6
|
Merge branch 'develop' into forbidden_characters_from_server
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
|
2015-06-15 14:51:13 +02:00 |
|
masensio
|
1ef9c86b59
|
Merge pull request #995 from owncloud/navigationDrawer_basic
Navigation drawer basic
|
2015-06-15 14:30:57 +02:00 |
|
masensio
|
fbfb6dee90
|
Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic
Conflicts:
.travis.yml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
|
2015-06-15 14:07:49 +02:00 |
|
masensio
|
0b567b9713
|
Merge pull request #1013 from owncloud/keep_permanent_redirections
Keep permanent redirections
|
2015-06-15 13:56:41 +02:00 |
|
masensio
|
d75cb8d6a0
|
Fix travis compilation
|
2015-06-15 13:49:00 +02:00 |
|
David A. Velasco
|
66f3a45d05
|
Merge branch 'develop' into navigationDrawer_basic
Conflicts FIXED:
res/layout/files.xml
|
2015-06-15 13:43:17 +02:00 |
|
David A. Velasco
|
e81b00207f
|
Removed unneeded dependency
|
2015-06-15 13:39:01 +02:00 |
|
David A. Velasco
|
e86dc8046e
|
Prevent updating to last version of platform tools
|
2015-06-15 13:26:41 +02:00 |
|
David A. Velasco
|
516650d52c
|
Trying different options to update support library project (fixing Travis build)
|
2015-06-15 13:19:50 +02:00 |
|
masensio
|
6fb489fd20
|
Update library reference
|
2015-06-15 13:19:44 +02:00 |
|
David A. Velasco
|
59f69dfa25
|
Adding binary dependencies for aapt
|
2015-06-15 13:04:38 +02:00 |
|
David A. Velasco
|
63457041d6
|
Fixed indentation in .travis.yml
|
2015-06-15 12:46:48 +02:00 |
|
David A. Velasco
|
fc124a8408
|
Added Android SDK Platform with API level 16 to Travis build file
|
2015-06-15 12:45:02 +02:00 |
|
David A. Velasco
|
d5f1dc8b45
|
Reviewed and updated project setup instructions
|
2015-06-15 12:33:03 +02:00 |
|
Jenkins for ownCloud
|
42da742d5e
|
[tx-robot] updated from transifex
|
2015-06-15 01:13:52 -04:00 |
|
Jenkins for ownCloud
|
f4f0750b1a
|
[tx-robot] updated from transifex
|
2015-06-14 01:13:39 -04:00 |
|
Jenkins for ownCloud
|
96f64863d1
|
[tx-robot] updated from transifex
|
2015-06-13 01:13:55 -04:00 |
|
Jenkins for ownCloud
|
d094ea108d
|
[tx-robot] updated from transifex
|
2015-06-12 01:13:56 -04:00 |
|
David A. Velasco
|
d869cdeb6f
|
Updated reference to correct commit in owncloud-android-library
|
2015-06-11 10:35:38 +02:00 |
|
David A. Velasco
|
d4390de111
|
Save target location of server behind a permanent redirection after password validation
|
2015-06-11 09:42:21 +02:00 |
|
Jenkins for ownCloud
|
486ad08e79
|
[tx-robot] updated from transifex
|
2015-06-11 01:13:55 -04:00 |
|
Jenkins for ownCloud
|
2075255313
|
[tx-robot] updated from transifex
|
2015-06-10 01:13:39 -04:00 |
|
David A. Velasco
|
5160dc58dc
|
Fixed bug of action bar position in PreviewImageActvitiy in Android <=4.2
|
2015-06-09 11:17:01 +02:00 |
|
purigarcia
|
2a217ad905
|
update -gitignore and readme
|
2015-06-08 15:02:29 +02:00 |
|
masensio
|
33fae4d071
|
Merge pull request #978 from owncloud/automationTest
Automation test
|
2015-06-08 12:53:15 +02:00 |
|
David A. Velasco
|
478ca7c205
|
Update link
|
2015-06-08 11:26:10 +02:00 |
|
David A. Velasco
|
e05346857a
|
Merge remote-tracking branch 'origin/automationTest' into automationTest
|
2015-06-08 11:15:46 +02:00 |
|
David A. Velasco
|
7be0fd039b
|
Quick instructions to use automation tests
|
2015-06-08 11:15:11 +02:00 |
|