Commit graph

2419 commits

Author SHA1 Message Date
David A. Velasco
71e64fdd45 Merge pull request #628 from owncloud/enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh
Enforce refresh even though ETag didn't changed when user pulls down the list of files (security blanket)
2014-09-17 17:18:09 +02:00
jabarros
6da86f04f6 Update with changes after CR 2014-09-17 17:10:20 +02:00
jabarros
9127ca6906 Merge branch 'develop' into enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh 2014-09-17 12:37:19 +02:00
Jenkins for ownCloud
c20c9100e5 [tx-robot] updated from transifex 2014-09-17 01:13:45 -04:00
jabarros
6a297ebe91 Fix bug. Etag is been ignored when navigating through folders 2014-09-16 12:48:24 +02:00
Jenkins for ownCloud
2878d39b05 [tx-robot] updated from transifex 2014-09-16 01:13:34 -04:00
jabarros
e549254059 Add boolean parameter 'ignoreTag' to SyncronizeFolderOperation constructor and pass ignoreTag = true in calls to #startSyncFolderOperation at FileDisplayActivity and MoveActivity in #onRefresh() 2014-09-15 13:14:32 +02:00
Jenkins for ownCloud
041bc26842 [tx-robot] updated from transifex 2014-09-15 01:13:31 -04:00
Jenkins for ownCloud
e630b8a342 [tx-robot] updated from transifex 2014-09-14 01:13:32 -04:00
Jenkins for ownCloud
98a9442219 [tx-robot] updated from transifex 2014-09-13 05:15:57 -04:00
jabarros
a720d1a049 Merge pull request #619 from owncloud/fix_crash_when_connecting_to_wifi
FileUploader service checks existance of account before accepting an upload
2014-09-12 13:55:03 +02:00
David A. Velasco
cbdb5d3ff0 Fixed mess created with b9eaffd 2014-09-12 13:49:37 +02:00
David A. Velasco
a36d9f9845 Fixed reference to library after recovering move_operation changes :S 2014-09-12 13:47:20 +02:00
David A. Velasco
009058b112 Fixed reference to android-library for mvn update 2014-09-12 13:08:56 +02:00
David A. Velasco
340bbd0d87 Merge pull request #620 from LukeOwncloud/develop
Fix mvn build
2014-09-12 13:01:27 +02:00
Luke Owncloud
28550f5c68 fix mvn build. needs to go together with update of pom.xml of
owncloud-android-library.
2014-09-12 11:55:14 +02:00
Jenkins for ownCloud
1d292aa224 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
David A. Velasco
b9eaffdecd Fixed typo in strings.xml 2014-09-11 17:18:54 +02:00
Jenkins for ownCloud
bb1177074c [tx-robot] updated from transifex 2014-09-11 01:13:35 -04:00
jabarros
7dd567050a Merge pull request #615 from owncloud/fast_account_selection
When an account is clicked, the app immediately shows its contents
2014-09-09 15:06:09 +02:00
David A. Velasco
f1fdfecb82 Changed title of settings activity to 'Settings' 2014-09-09 14:50:53 +02:00
David A. Velasco
4afd9dde49 Merge pull request #614 from owncloud/ADFS_auth_support
ADFS IdPs support added to SAML authentication
2014-09-09 13:52:06 +02:00
jabarros
62fc78754e Changes after CR 2014-09-09 13:42:01 +02:00
jabarros
ba6c6375cf Merge branch 'develop' into ADFS_auth_support
Conflicts:
	res/values/strings.xml
2014-09-09 13:17:41 +02:00
David A. Velasco
3fac2e01a1 FileUploader service checks existance of account when receives an upload request 2014-09-09 13:03:00 +02:00
David A. Velasco
a34a2cac8a When an account is clicked, the app immediately shows its contents 2014-09-09 12:23:09 +02:00
Jenkins for ownCloud
84d640e0c9 [tx-robot] updated from transifex 2014-09-09 01:13:38 -04:00
Jenkins for ownCloud
40f331dbd1 [tx-robot] updated from transifex 2014-09-07 01:13:35 -04:00
Jenkins for ownCloud
bf003e6c44 [tx-robot] updated from transifex 2014-09-06 01:13:43 -04:00
jabarros
12d64c769f Merge pull request #608 from owncloud/move_files_and_folders
Added capability to move files (and folders)
2014-09-05 14:20:54 +02:00
Jenkins for ownCloud
85eb7dd8b9 [tx-robot] updated from transifex 2014-09-05 01:13:41 -04:00
jabarros
499c691707 Changes after CR 2014-09-04 18:23:39 +02:00
jabarros
a0442b48b1 Fixed bug. Copy link when sharing a file has dissapear 2014-09-04 18:04:55 +02:00
David A. Velasco
657acefd76 Updated reference to android-library with improved tests 2014-09-04 14:05:14 +02:00
jabarros
d3a99fff00 Fixed bug it is not possible to login using two accounts in saml server. Clear webview cache. 2014-09-04 13:13:07 +02:00
Jenkins for ownCloud
2e9a926626 [tx-robot] updated from transifex 2014-09-04 01:13:34 -04:00
David A. Velasco
8614cd5982 Update reference to android-library in order to fix move and rename operations through redirected servers 2014-09-03 11:44:13 +02:00
Jenkins for ownCloud
e073ef1489 [tx-robot] updated from transifex 2014-09-03 01:13:33 -04:00
jabarros
f94781b459 Fixed message when trying to move to a folder which does not exist anymore 2014-09-02 14:30:28 +02:00
jabarros
85f63a0ff4 Create dialog fragment for showing authentication dialog 2014-09-02 14:03:56 +02:00
David A. Velasco
1dbba08c7b Improved messages for operations on files not existing anymore in the server 2014-09-02 10:13:14 +02:00
Jenkins for ownCloud
01599dde3d [tx-robot] updated from transifex 2014-09-02 01:13:29 -04:00
David A. Velasco
263d847ee1 Updated reference to android-library 2014-09-01 15:19:19 +02:00
David A. Velasco
679c7ed157 Fixed lost local copy of file when moved into a folder that is not created in the local file system yet 2014-09-01 10:35:47 +02:00
jabarros
baf4d6a627 Add menu restrictions for not showing move option on the Preview and details fragments 2014-09-01 09:03:15 +02:00
Jenkins for ownCloud
0f47ef4605 [tx-robot] updated from transifex 2014-08-31 13:01:27 -04:00
Jenkins for ownCloud
328969aba4 [tx-robot] updated from transifex 2014-08-30 01:13:34 -04:00
Jenkins for ownCloud
3535c8c577 [tx-robot] updated from transifex 2014-08-29 01:13:35 -04:00
David A. Velasco
24ffdc2c2f Fixed crash when selecting a folder to move file into after rotating the device in the selection view 2014-08-28 18:44:15 +02:00
jabarros
622523b3e3 Show alert message when user or password in authentication is not correct 2014-08-28 16:03:03 +02:00