Commit graph

1975 commits

Author SHA1 Message Date
masensio
77ead554d4 Merge branch 'develop' into refactor_update_filelist_from_database 2014-04-28 12:10:37 +02:00
masensio
44dae87d2f FileListListAdapter is a SimpleCursorAdapter 2014-04-28 12:09:07 +02:00
Jenkins for ownCloud
05abbd857f [tx-robot] updated from transifex 2014-04-28 01:13:44 -04:00
Jenkins for ownCloud
3769851ef6 [tx-robot] updated from transifex 2014-04-26 01:13:45 -04:00
Jenkins for ownCloud
c2a523f8d1 [tx-robot] updated from transifex 2014-04-25 01:13:45 -04:00
David A. Velasco
af410430c3 Update reference to owncloud-android-library 2014-04-24 11:12:01 +02:00
Jenkins for ownCloud
6c332a15c0 [tx-robot] updated from transifex 2014-04-24 01:13:43 -04:00
Jenkins for ownCloud
1bf039dfbd [tx-robot] updated from transifex 2014-04-23 01:13:48 -04:00
Javier Gonzalez
d60ddd81a0 Merge pull request #149 from owncloud/videoInstandUploads
Issue #136  [Feature] Instant upload of videos
2014-04-22 12:47:26 +02:00
David A. Velasco
e7a6a68531 Minimized imports 2014-04-22 12:30:15 +02:00
Jenkins for ownCloud
f5b6a68b62 [tx-robot] updated from transifex 2014-04-22 01:13:43 -04:00
David A. Velasco
e2f0af1c26 Fixed lost automatic check of OC server on enforced update of password 2014-04-21 14:49:00 +02:00
David A. Velasco
37b44a551a Fixed crash when browsing app from instantUploads folder after entering into the app from a notification 2014-04-21 14:27:06 +02:00
David A. Velasco
68f4ceb5a7 Separate options to enable & disable instant upload of new pictures and new videos 2014-04-21 10:49:31 +02:00
Jenkins for ownCloud
780c7e89a0 [tx-robot] updated from transifex 2014-04-21 01:14:57 -04:00
Jenkins for ownCloud
cc95c1321b [tx-robot] updated from transifex 2014-04-20 01:14:56 -04:00
David A. Velasco
ffdc77f8d8 Fixed crash when clicking on an error notification due to wrong credentials 2014-04-16 20:13:35 +02:00
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