Commit graph

3259 commits

Author SHA1 Message Date
David A. Velasco
1b628540c9 Fixes after CR 2015-04-22 10:33:58 +02:00
David A. Velasco
01536e1094 Updated reference to library after merging paired PR 2015-04-22 09:36:39 +02:00
David A. Velasco
968c535e19 Merge branch 'develop' into loging_different_servers_same_pattern
Conflicts SOLVED in:
	src/com/owncloud/android/ui/activity/FileActivity.java
2015-04-22 09:35:37 +02:00
masensio
70759950ba Update workaround version 2015-04-21 14:45:01 +02:00
David A. Velasco
21c34ee6d4 Transaction signaled as successful in the right place - and some clean-up 2015-04-21 10:16:11 +02:00
masensio
f531f284fb Merge pull request #956 from owncloud/fix_app_closes_new_account_and_try_to_upload
Fix app closes new account and try to upload
2015-04-20 11:37:17 +02:00
Jenkins for ownCloud
d5ea104e99 [tx-robot] updated from transifex 2015-04-19 01:13:33 -04:00
Jenkins for ownCloud
2f196c54d6 [tx-robot] updated from transifex 2015-04-18 01:13:48 -04:00
David A. Velasco
5ca1b94865 Fixed now - FileDisplayActivity is not recreated anymore when the user selects another account 2015-04-17 14:32:35 +02:00
David A. Velasco
ea14d6247e Got rid of other old dialogs in FileDisplayActivity 2015-04-17 13:49:01 +02:00
David A. Velasco
bed85b265a Some minor clean-up 2015-04-17 13:48:45 +02:00
David A. Velasco
8aa0060f4a Fixed bug: depecrated showdialog should not be used anymore, DialogFragment used instead 2015-04-17 13:45:45 +02:00
masensio
98f73400ca Fix bug: when installing the app for the first time, app crashes 2015-04-17 12:49:39 +02:00
masensio
f12956fe2a Remove comments 2015-04-17 11:05:13 +02:00
masensio
74b8e1a536 Replace rawQuery by query, onUpgrade --> updateDownloadedFiles 2015-04-17 09:00:53 +02:00
Jenkins for ownCloud
65b2da31cc [tx-robot] updated from transifex 2015-04-17 01:13:50 -04:00
masensio
77ed62dbcf Replace account.name by newAccountName in onUpgrade 2015-04-16 17:21:47 +02:00
masensio
27147e5e08 Select * in updateDownloadedFiles 2015-04-15 18:50:59 +02:00
masensio
ab7c998d07 Changes in update for downloaded files 2015-04-15 18:37:12 +02:00
masensio
123c7fc1cd Update downloaded files 2015-04-15 18:15:57 +02:00
masensio
d9e22f0752 Merge pull request #946 from owncloud/upgrading_account_manager
Upgrading account manager
2015-04-15 13:07:14 +02:00
David A. Velasco
cc9431feeb Upgraded accounts in AccountManager with new account name 2015-04-15 12:52:07 +02:00
masensio
19be4b4a6f Remove old update sql for 10 version, in onUpgrade method 2015-04-15 12:25:18 +02:00
David A. Velasco
4457dbd317 Merge branch 'develop' into upgrading_account_manager 2015-04-15 12:16:24 +02:00
masensio
ef948a46fd Change update query and add log in onUpgrade (10 DB version) 2015-04-15 10:14:19 +02:00
Jenkins for ownCloud
15512f8d63 [tx-robot] updated from transifex 2015-04-15 01:13:36 -04:00
David A. Velasco
1c579d1eb0 Removed 'support' for WebDAV entry point before OC 4, and dependent unused code 2015-04-14 15:00:43 +02:00
David A. Velasco
28d3b5fdaa Removed unused method 2015-04-14 14:42:39 +02:00
David A. Velasco
47dcbb219e Modify upgrade of account names in database; upgrade of accounts in AccountManager will be done before, not after 2015-04-14 14:34:27 +02:00
masensio
7efd1076aa Upgrade account name in all the rows of files table in database 2015-04-14 11:37:08 +02:00
David A. Velasco
e820c4f89c Merge pull request #941 from owncloud/add_header_OC-TOTAL-LENGHT_to_put_request
Update library reference, with OC-Total-Length header in ChunkedUploadRe...
2015-04-14 09:59:23 +02:00
David A. Velasco
931632774f Updated library reference after merge 2015-04-14 09:50:51 +02:00
masensio
7fa3ba83a2 Update library reference: Set new pattern for account name 2015-04-13 13:33:51 +02:00
masensio
3b6991cbbf Update Library Reference: Add OC-Total-Length to UploadRemoteFileOperation 2015-04-10 09:21:50 +02:00
Jenkins for ownCloud
3fa86ebe5b [tx-robot] updated from transifex 2015-04-10 01:13:49 -04:00
masensio
e22226ce73 Update library reference, with OC-Total-Length header in ChunkedUploadRemoteFileOperation 2015-04-09 18:20:45 +02:00
masensio
558a3af1eb Merge branch 'master' into develop 2015-04-09 16:57:09 +02:00
David A. Velasco
107f1aafaa Merge pull request #939 from owncloud/hotfix_user_agent
Hot fix for user-agent header
2015-04-09 16:52:48 +02:00
masensio
56703df78e Udpate imports in MainApp 2015-04-09 13:35:50 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00
masensio
05caa7dab2 Merge remote-tracking branch 'origin/develop' into develop 2015-04-07 15:12:44 +02:00
masensio
2444e4254c Merge branch 'release-1.7.1' 2015-04-07 14:06:32 +02:00
Jenkins for ownCloud
ffa503fa76 [tx-robot] updated from transifex 2015-04-06 01:13:38 -04:00
Jenkins for ownCloud
0ba1d7e65d [tx-robot] updated from transifex 2015-04-05 01:13:38 -04:00
Jenkins for ownCloud
bf6e03b0b6 [tx-robot] updated from transifex 2015-04-04 01:13:38 -04:00
Jenkins for ownCloud
8ebf88a31b [tx-robot] updated from transifex 2015-04-03 01:13:39 -04:00
Jenkins for ownCloud
daed811588 [tx-robot] updated from transifex 2015-04-02 01:13:45 -04:00
Jenkins for ownCloud
fc644a03fd [tx-robot] updated from transifex 2015-04-01 01:13:47 -04:00
David A. Velasco
340428d820 Once again, disable session based client 2015-03-31 14:29:09 +02:00
David A. Velasco
eb5b37efb2 Updated reference to library after fixing deadlock 2015-03-31 09:37:12 +02:00