tobiasKaminsky
|
b2ae3fa467
|
Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles
|
2015-12-31 13:26:36 +01:00 |
|
tobiasKaminsky
|
c426d1fb05
|
Merge branch 'master' of github.com:owncloud/android
|
2015-12-30 10:35:13 +01:00 |
|
masensio
|
aeaa422fed
|
Close cursors in UploadStorageManager methods
|
2015-12-29 13:22:31 +01:00 |
|
masensio
|
540d123ad5
|
Merge branch 'master' into reliable_uploads_actions_uploads_view
|
2015-12-29 12:46:45 +01:00 |
|
Maria Asensio
|
7c58039412
|
Merge pull request #1209 from owncloud/material_buttons
Material buttons - before in #1090
|
2015-12-29 12:31:39 +01:00 |
|
Andy Scherzinger
|
a812784ddd
|
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts (resolved):
res/layout/drawer.xml
res/values/colors.xml
res/values/setup.xml
|
2015-12-28 20:03:25 +01:00 |
|
Andy Scherzinger
|
cc2ba716fb
|
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_buttons
|
2015-12-28 19:22:40 +01:00 |
|
Andy Scherzinger
|
dd8c65dcd9
|
fix for #1381
|
2015-12-28 19:21:05 +01:00 |
|
masensio
|
aca6e66d19
|
Optimize set for boolean parameters in UploadsStorageManager. Fix problem in Uploads DB creation method
|
2015-12-28 15:04:33 +01:00 |
|
Maria Asensio
|
9954f71408
|
Merge pull request #1351 from owncloud/Update_of_brandable_colors
Added colors for header of navigation drawer and login button to the …
|
2015-12-28 14:17:05 +01:00 |
|
masensio
|
02ffba3715
|
Update library reference
|
2015-12-28 12:59:53 +01:00 |
|
masensio
|
eee7ea369d
|
Merge branch 'master' into reliable_uploads_actions_uploads_view
|
2015-12-28 10:13:38 +01:00 |
|
Jenkins for ownCloud
|
ca03f14752
|
[tx-robot] updated from transifex
|
2015-12-28 01:13:40 -05:00 |
|
Jenkins for ownCloud
|
f137759e6b
|
[tx-robot] updated from transifex
|
2015-12-25 01:13:46 -05:00 |
|
Jenkins for ownCloud
|
30a4201b33
|
[tx-robot] updated from transifex
|
2015-12-23 01:45:19 -05:00 |
|
David A. Velasco
|
bd1f6452ac
|
Make button colours easy to brand
|
2015-12-22 17:22:24 +01:00 |
|
David A. Velasco
|
c6bebdc6b3
|
Merge pull request #1359 from owncloud/bug_1338
Fix use of delayUntil property to grant automatic synchronization is not triggered before 3h
|
2015-12-22 11:51:29 +01:00 |
|
Bartosz Przybylski
|
35c0d318c2
|
Force ant and android studio to use Java7
|
2015-12-22 11:40:07 +01:00 |
|
David A. Velasco
|
e8d7651c0c
|
Merge pull request #1377 from owncloud/revert-1321-updateToJava7
Revert "Force ant and android studio to use Java7"
|
2015-12-22 11:12:55 +01:00 |
|
David A. Velasco
|
0c48a4686d
|
Revert "Force ant and android studio to use Java7"
|
2015-12-22 11:09:16 +01:00 |
|
Bartosz Przybylski
|
d3afbb2972
|
Merge pull request #1321 from owncloud/updateToJava7
Force ant and android studio to use Java7
|
2015-12-21 21:05:13 +01:00 |
|
Jenkins for ownCloud
|
3182a9e00f
|
[tx-robot] updated from transifex
|
2015-12-19 01:13:41 -05:00 |
|
Bartosz Przybylski
|
3f61dc5a8a
|
#1338: Correctly use delayUntil property of SyncResult
|
2015-12-18 15:55:05 +01:00 |
|
David A. Velasco
|
dee7c33235
|
Added style to buttons in share_file_layout and centered refresh button in account_setup
|
2015-12-17 16:58:47 +01:00 |
|
David A. Velasco
|
d5c4d7ab92
|
Changes from code review
|
2015-12-17 15:49:55 +01:00 |
|
Jenkins for ownCloud
|
669ebe083c
|
[tx-robot] updated from transifex
|
2015-12-17 01:13:44 -05:00 |
|
masensio
|
e89104b40e
|
Save OCFile into DB when a file is prepare to be uploaded, before uploading (WIP)
|
2015-12-16 09:17:35 +01:00 |
|
masensio
|
390e06efa8
|
Adapt UploadDBObject (new OCUpload) to manage uploads data
|
2015-12-15 13:00:38 +01:00 |
|
David A. Velasco
|
147e6989c8
|
Added colors for header of navigation drawer and login button to the list of brandable colors
|
2015-12-14 12:50:52 +01:00 |
|
Jenkins for ownCloud
|
dadf31f522
|
[tx-robot] updated from transifex
|
2015-12-13 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
27bc03b6de
|
[tx-robot] updated from transifex
|
2015-12-12 01:13:40 -05:00 |
|
David A. Velasco
|
41f1924bb6
|
Access to Uploads table through ContentResolver instead of direct access as DB
|
2015-12-11 15:40:59 +01:00 |
|
masensio
|
10874aa7a7
|
Add new table for uploads on database
|
2015-12-11 14:35:45 +01:00 |
|
masensio
|
1a74d5ba59
|
Changes from comments in reliable_uploads code review
|
2015-12-11 11:15:53 +01:00 |
|
masensio
|
ade956dd7b
|
Merge branch 'master' into reliable_uploads_actions_uploads_view
|
2015-12-11 09:50:36 +01:00 |
|
David A. Velasco
|
f35a349119
|
Merge pull request #1340 from owncloud/stable
Update Changelog for 1.9 version
|
2015-12-11 09:33:25 +01:00 |
|
masensio
|
9e5a49a6ac
|
Update Changelog for 1.9 version
|
2015-12-11 09:24:54 +01:00 |
|
masensio
|
a840e67a68
|
Add 'Uploads' option into NavigationDrawer
|
2015-12-11 08:43:33 +01:00 |
|
Jenkins for ownCloud
|
8855855a52
|
[tx-robot] updated from transifex
|
2015-12-11 01:13:40 -05:00 |
|
masensio
|
a2b680edd0
|
Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view
|
2015-12-10 17:35:32 +01:00 |
|
masensio
|
dc0aea30f0
|
Merge branch 'master' into reliable_uploads
Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/utils/FileStorageUtils.java
|
2015-12-10 17:18:52 +01:00 |
|
Jenkins for ownCloud
|
3e25c84863
|
[tx-robot] updated from transifex
|
2015-12-10 01:13:44 -05:00 |
|
Andy Scherzinger
|
71e87d98a8
|
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
|
2015-12-09 15:14:22 +01:00 |
|
Maria Asensio
|
896e4859c0
|
Merge pull request #1168 from owncloud/avoidDuplicateFiles
Avoid duplicate files
|
2015-12-09 09:27:54 +01:00 |
|
Jenkins for ownCloud
|
2f7690879a
|
[tx-robot] updated from transifex
|
2015-12-08 01:13:37 -05:00 |
|
Carla Schroder
|
09ee01c787
|
Merge branch 'master' of https://github.com/owncloud/android
|
2015-12-07 16:48:55 -08:00 |
|
Carla Schroder
|
1fea82efde
|
update submodule & integrate new theme changes
|
2015-12-07 16:48:21 -08:00 |
|
Jenkins for ownCloud
|
d696f10e06
|
[tx-robot] updated from transifex
|
2015-12-07 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
106a2324e1
|
[tx-robot] updated from transifex
|
2015-12-06 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
2e9c4ed217
|
[tx-robot] updated from transifex
|
2015-12-05 01:13:42 -05:00 |
|