Commit graph

2158 commits

Author SHA1 Message Date
David A. Velasco
33b0909e7b Merge branch 'develop' into videoInstandUploads 2014-04-16 19:31:27 +02:00
David A. Velasco
e8d969f032 Allow instant upload of new videos although not using Wi-Fi, with the same policy as pictures 2014-04-16 19:30:01 +02:00
David A. Velasco
b711404094 Merge pull request #456 from owncloud/fixing_travis
Fixing builds in Travis - last version of android-sdk-installer is failing when updating the SDK; older version is working
2014-04-16 18:39:28 +02:00
David A. Velasco
703fc18a85 Merge pull request #463 from owncloud/save_position_in_scroll_when_browsing
Save position in scroll when browsing through the list of files
2014-04-16 18:37:52 +02:00
Mr. Jenkins
97d4975bc5 [tx-robot] updated from transifex 2014-04-16 01:15:02 -04:00
Mr. Jenkins
0004094313 [tx-robot] updated from transifex 2014-04-14 01:14:06 -04:00
Mr. Jenkins
43446e359f [tx-robot] updated from transifex 2014-04-13 01:14:05 -04:00
Mr. Jenkins
53840ec422 [tx-robot] updated from transifex 2014-04-11 01:14:08 -04:00
masensio
fb45997d5e Merge branch 'develop' into save_position_in_scroll_when_browsing 2014-04-10 09:01:52 +02:00
Mr. Jenkins
ebc4f59abd [tx-robot] updated from transifex 2014-04-10 01:14:08 -04:00
masensio
b96cce8384 Fix bug: When accessing an coming back several times, the folder is hidden 2014-04-09 17:37:57 +02:00
masensio
d318fce332 Merge branch 'develop' into save_position_in_scroll_when_browsing 2014-04-09 10:11:54 +02:00
masensio
1a33e4cf65 Merge branch 'develop' into videoInstandUploads 2014-04-09 08:42:30 +02:00
Mr. Jenkins
0e133984d4 [tx-robot] updated from transifex 2014-04-09 01:14:36 -04:00
masensio
e5ab756691 Add some comments for VideoInstantUploads 2014-04-08 14:58:41 +02:00
masensio
086985ad26 Fix bug: App crashes when coming back from a folder of second level 2014-04-08 13:58:27 +02:00
masensio
e8e1c7a0af Grant InstantUpload feature works as before. 2014-04-08 13:02:59 +02:00
masensio
3351db6527 Merge branch 'develop' into videoInstandUploads 2014-04-08 12:50:50 +02:00
David A. Velasco
14f359da5f Merge branch 'develop' into fixing_travis 2014-04-08 12:31:44 +02:00
masensio
812da2727d Merge branch 'develop' into save_position_in_scroll_when_browsing 2014-04-08 11:28:50 +02:00
masensio
d3ecaa5a38 Fix bug: folder is not shown after accessing to it and coming back 2014-04-08 11:27:44 +02:00
Mr. Jenkins
69d40e505e [tx-robot] updated from transifex 2014-04-08 04:59:00 -04:00
masensio
2b06f07b17 Merge branch 'develop' into save_position_in_scroll_when_browsing 2014-04-08 09:29:47 +02:00
David A. Velasco
44b61b3fe7 Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis 2014-04-08 09:23:29 +02:00
David A. Velasco
8e96e3cc3d Trying older version of android-sdk-installer 2014-04-08 09:22:10 +02:00
David A. Velasco
f6da58961f Updated travis script according to update instructions of android-sdk-installer 2014-04-08 09:22:09 +02:00
masensio
119c61dcf4 Merge pull request #458 from owncloud/operations_service
Operations started by AuthenticatorActivity are run in OperationsService, and end of operations is granted to be dispatched.
2014-04-08 09:17:47 +02:00
Mr. Jenkins
9cc8efc369 [tx-robot] updated from transifex 2014-04-08 01:15:33 -04:00
masensio
cbdcf7d457 Disable extra logs 2014-04-07 15:21:21 +02:00
David A. Velasco
cf3adf2598 Trying older version of android-sdk-installer 2014-04-07 14:17:14 +02:00
David A. Velasco
0b0cc609c9 Fixed broken life cicle in FileActivity 2014-04-07 14:09:43 +02:00
David A. Velasco
1b70e1cf2f Updated travis script according to update instructions of android-sdk-installer 2014-04-07 11:46:00 +02:00
David A. Velasco
f24e56d19d Removed commented code and remaining forced exception 2014-04-07 11:14:44 +02:00
David A. Velasco
a3798996e1 Recovered some extra logs before validating 2014-04-07 10:24:43 +02:00
David A. Velasco
12bbc51dcb Preventing hash colisions in identifier of operations 2014-04-07 10:22:08 +02:00
David A. Velasco
8d38fd331d Simplified interface to request 'lost results' during rotation of Activity 2014-04-07 09:24:57 +02:00
masensio
14a466edeb Merge branch 'develop' into save_position_in_scroll_when_browsing 2014-04-07 08:58:42 +02:00
masensio
af45cabf35 Merge branch 'develop' into operations_service 2014-04-07 08:49:01 +02:00
Mr. Jenkins
903bf0286e [tx-robot] updated from transifex 2014-04-07 01:15:11 -04:00
Mr. Jenkins
e573a7066e [tx-robot] updated from transifex 2014-04-06 01:15:09 -04:00
Mr. Jenkins
e0d4f3cab7 [tx-robot] updated from transifex 2014-04-05 01:15:10 -04:00
masensio
baa585550d Enable extra logs before validation to fix easily any possible bug 2014-04-04 15:05:21 +02:00
masensio
c1df34b5e3 Merge remote-tracking branch 'origin/operations_service' into operations_service 2014-04-04 14:50:46 +02:00
masensio
d535c420f2 Grant that OperationsService doesn't keep old saved results forever 2014-04-04 14:49:20 +02:00
David A. Velasco
8f5ab8df08 Merge remote-tracking branch 'origin/operations_service' into operations_service 2014-04-04 14:19:05 +02:00
David A. Velasco
7cf05f3647 Internal refactorization of AccountAuthenticatorActivity (and related dependencies) 2014-04-04 14:18:42 +02:00
masensio
46e949c826 Grant Share and Unshare work properly. 2014-04-04 12:57:25 +02:00
Mr. Jenkins
a391f987ae [tx-robot] updated from transifex 2014-04-04 01:15:17 -04:00
masensio
40f5eb6de6 Grant that same result is never processed twice by the same listener (one through callback, one through getResult) 2014-04-03 17:24:03 +02:00
masensio
b017073e96 Merge branch 'develop' into operations_service 2014-04-03 17:00:02 +02:00