Andy Scherzinger
cbf134a6e2
move strings to resource file
2016-02-12 12:29:05 +01:00
Jenkins for ownCloud
dfb8df1201
[tx-robot] updated from transifex
2016-02-12 01:13:35 -05:00
Jenkins for ownCloud
986b2c7b2b
[tx-robot] updated from transifex
2016-02-11 01:13:41 -05:00
David A. Velasco
7366dbff09
Update branch master with released code for version 1.9.1
2016-02-10 11:35:07 +01:00
Jenkins for ownCloud
e224125ae0
[tx-robot] updated from transifex
2016-02-10 01:13:36 -05:00
David A. Velasco
3885db5013
Positive button of remove dialog(s) changed to 'Yes'
2016-02-09 08:59:35 +01:00
Jenkins for ownCloud
62b13a6be9
[tx-robot] updated from transifex
2016-02-09 01:13:38 -05:00
Jenkins for ownCloud
f52e182971
[tx-robot] updated from transifex
2016-02-08 01:13:30 -05:00
Jenkins for ownCloud
27bcedfc72
[tx-robot] updated from transifex
2016-02-07 01:13:37 -05:00
Jenkins for ownCloud
35286be480
[tx-robot] updated from transifex
2016-02-06 01:13:35 -05:00
Jenkins for ownCloud
ff9862badd
[tx-robot] updated from transifex
2016-02-05 01:13:37 -05:00
David A. Velasco
6eca835d1d
Renamed scaring 'delete account' to 'remove account'
2016-02-04 14:51:54 +01:00
David A. Velasco
008153a541
Changed text color of secondary buttons to black
2016-02-04 14:51:54 +01:00
David A. Velasco
7931c321f2
Merge pull request #1461 from owncloud/manage_space_activity
...
Added own Activity to manage space instead of default "Clear data" button in device settings
2016-02-04 14:50:53 +01:00
Jenkins for ownCloud
9bfaaf3b8b
[tx-robot] updated from transifex
2016-02-04 01:13:37 -05:00
David A. Velasco
a827cfa791
Merge pull request #1314 from owncloud/prefDetails
...
Renamed "security" category to "details" in app settings, for further use
2016-02-03 17:51:13 +01:00
masensio
9fd38ca0dd
Changes from comments in Code Review: staring and NPE
2016-02-03 16:03:10 +01:00
masensio
dc2fdb9744
Changes from comments in Code Review: Strings and minor things
2016-02-03 14:28:12 +01:00
masensio
14530aa7b8
Changes from comments in PR Code Review
2016-02-03 13:45:53 +01:00
masensio
3d623ca911
Review string manage_space_description
2016-02-03 13:37:47 +01:00
masensio
96ce49707b
Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity
2016-02-03 13:37:45 +01:00
masensio
d6653ef684
Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java
2016-02-03 13:37:43 +01:00
Jenkins for ownCloud
c8dcf8b7ac
[tx-robot] updated from transifex
2016-02-03 01:13:37 -05:00
tobiasKaminsky
da0d98629c
Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master
2016-02-02 21:05:16 +01:00
tobiasKaminsky
5b7f44e0f7
renamed security category to details for further use
...
moved position
2016-02-02 17:45:01 +01:00
David A. Velasco
9761b34c76
Merge pull request #1439 from owncloud/wording-fixes
...
Wording fixes, simplify some strings and fix capitalization
2016-02-02 17:33:25 +01:00
Jenkins for ownCloud
9c18126bf0
[tx-robot] updated from transifex
2016-02-02 01:13:41 -05:00
Jenkins for ownCloud
3951b2db95
[tx-robot] updated from transifex
2016-02-01 01:13:31 -05:00
Jenkins for ownCloud
73d327a407
[tx-robot] updated from transifex
2016-01-31 01:13:30 -05:00
Jenkins for ownCloud
52d043be21
[tx-robot] updated from transifex
2016-01-30 01:13:40 -05:00
Jenkins for ownCloud
2795750c55
[tx-robot] updated from transifex
2016-01-29 01:13:33 -05:00
Jenkins for ownCloud
8bf14931b0
[tx-robot] updated from transifex
2016-01-28 01:13:39 -05:00
masensio
9c57aafab5
Review appereance of Uploads View
2016-01-27 13:59:51 +01:00
Maria Asensio
2e074864a2
Merge pull request #1451 from owncloud/share__edit_privileges
...
Share edit privileges
2016-01-27 11:28:16 +01:00
masensio
44f2894731
Checking Uploads with the same name
2016-01-26 17:53:13 +01:00
masensio
2f231561af
Checking Priviledges Error failed uploads
2016-01-25 15:20:50 +01:00
masensio
29cb1277c3
Checking File Error failed uploads
2016-01-25 14:54:31 +01:00
masensio
15d5350ef6
Checking Folder Error failed uploads
2016-01-25 14:23:23 +01:00
masensio
198c1bf3b0
Checking Credential Error failed uploads: show error as Credential error and relogin
2016-01-25 13:02:22 +01:00
masensio
b6f8e93504
Checking Network Connection failed uploads
2016-01-25 10:59:53 +01:00
Jenkins for ownCloud
f1fcab8e18
[tx-robot] updated from transifex
2016-01-24 01:13:30 -05:00
Jenkins for ownCloud
2818c41641
[tx-robot] updated from transifex
2016-01-23 01:13:36 -05:00
Jenkins for ownCloud
6a72d01d0e
[tx-robot] updated from transifex
2016-01-22 01:13:32 -05:00
masensio
f11646bc6e
Review ic_refresh dimensions
2016-01-21 09:29:58 +01:00
Jenkins for ownCloud
e909f8b625
[tx-robot] updated from transifex
2016-01-21 01:13:38 -05:00
masensio
814a70f6a3
Update refresh icon in uploads view
2016-01-20 18:41:52 +01:00
David A. Velasco
628e713268
Update model changed: permission updates are requested to the server as soon as the user changes any value
2016-01-20 18:18:14 +01:00
masensio
b353ed62cd
Show thumbnail or file icon depending on the file type in Uploads view
2016-01-20 18:06:35 +01:00
David A. Velasco
0d4c9b9961
Show error message from server when update of permissions fail
2016-01-20 12:22:24 +01:00
masensio
2c4daf3a93
Update the status of current upload when it finishes
2016-01-20 11:19:43 +01:00
Jenkins for ownCloud
e3d882b386
[tx-robot] updated from transifex
2016-01-20 01:13:33 -05:00
masensio
6f58527273
Update progress bar for Current Upload
2016-01-19 17:32:50 +01:00
Jenkins for ownCloud
9c59c5fb4c
[tx-robot] updated from transifex
2016-01-19 01:13:40 -05:00
Jan-Christoph Borchardt
61a1d97abc
wording fixes, simplify some strings and fix capitalization
2016-01-18 15:10:50 +01:00
Jenkins for ownCloud
98229db831
[tx-robot] updated from transifex
2016-01-18 01:13:31 -05:00
Jenkins for ownCloud
a5aa573594
[tx-robot] updated from transifex
2016-01-17 01:13:33 -05:00
Jenkins for ownCloud
81494e6246
[tx-robot] updated from transifex
2016-01-15 01:13:37 -05:00
Jenkins for ownCloud
13f8ed9d39
[tx-robot] updated from transifex
2016-01-14 01:13:41 -05:00
David A. Velasco
81b8918939
Fixed color of 'stop sharing' button in Android 4.x
2016-01-13 14:23:50 +01:00
David A. Velasco
e4078a5734
Added scroll to permissions editor to grant usability in landscape
2016-01-13 13:43:07 +01:00
Jenkins for ownCloud
6165134f60
[tx-robot] updated from transifex
2016-01-13 01:13:43 -05:00
masensio
990f16ca47
Add drawe access from uploads view
2016-01-12 14:16:22 +01:00
David A. Velasco
e7901656a1
Polish UI to edit permissions
2016-01-11 15:34:41 +01:00
David A. Velasco
d826451e2d
Added buttons to unshare (working) and finish (not working) in EditShareFragment layout
2016-01-11 12:17:11 +01:00
David A. Velasco
5fcb70beee
Added fragment to edit share permissions with basic layout
2016-01-11 12:17:08 +01:00
Jenkins for ownCloud
d8dca7243d
[tx-robot] updated from transifex
2016-01-11 01:13:42 -05:00
tobiasKaminsky
021fe9d14b
changes according to CR
2016-01-10 20:17:21 +01:00
Jenkins for ownCloud
233a881765
[tx-robot] updated from transifex
2016-01-10 01:13:46 -05:00
Jenkins for ownCloud
c371aa5b00
[tx-robot] updated from transifex
2016-01-09 01:13:44 -05:00
masensio
2181239c6d
Merge branch 'master' into reliable_uploads_actions_uploads_view
2016-01-08 11:21:23 +01:00
Maria Asensio
ab7b3c09c3
Merge pull request #1099 from owncloud/switchListVsGrid
...
Switch list vs grid
2016-01-08 10:18:00 +01:00
Jenkins for ownCloud
f97d57283b
[tx-robot] updated from transifex
2016-01-08 01:13:42 -05:00
Jenkins for ownCloud
73b58324a8
[tx-robot] updated from transifex
2016-01-07 01:13:44 -05:00
Jenkins for ownCloud
804be08c1b
[tx-robot] updated from transifex
2016-01-06 01:13:42 -05:00
David A. Velasco
d26da3cbc2
Recovered changes lost in complex rebase
2016-01-05 12:12:18 +01:00
tobiasKaminsky
d7e9ef92b8
fixed according to review
2016-01-05 11:50:00 +01:00
tobiasKaminsky
2586298380
moved switch menu item to three dots menu
2016-01-05 11:21:37 +01:00
tobiasKaminsky
6bd7065c73
wip
2016-01-05 11:16:00 +01:00
Jenkins for ownCloud
1fbcd81bd4
[tx-robot] updated from transifex
2016-01-05 01:13:48 -05:00
Jenkins for ownCloud
bc9a890b6f
[tx-robot] updated from transifex
2016-01-04 01:13:42 -05:00
Jenkins for ownCloud
d75f615031
[tx-robot] updated from transifex
2016-01-01 01:13:43 -05:00
tobiasKaminsky
b2ae3fa467
Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles
2015-12-31 13:26:36 +01:00
masensio
540d123ad5
Merge branch 'master' into reliable_uploads_actions_uploads_view
2015-12-29 12:46:45 +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
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
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
Jenkins for ownCloud
3182a9e00f
[tx-robot] updated from transifex
2015-12-19 01:13:41 -05: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
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
masensio
ade956dd7b
Merge branch 'master' into reliable_uploads_actions_uploads_view
2015-12-11 09:50:36 +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
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
Jenkins for ownCloud
d44f2a3a10
[tx-robot] updated from transifex
2015-12-04 01:13:39 -05:00
masensio
59442c80ea
Update string
2015-12-03 12:58:22 +01:00
Jenkins for ownCloud
db2256765d
[tx-robot] updated from transifex
2015-12-03 01:13:40 -05:00
Jenkins for ownCloud
872e32475b
[tx-robot] updated from transifex
2015-12-02 01:13:53 -05:00
tobiasKaminsky
04fc2e3cc2
changed according to latest discussion
2015-12-01 22:00:53 +01:00
Jenkins for ownCloud
eb5a24d25c
[tx-robot] updated from transifex
2015-12-01 01:13:42 -05:00
Jenkins for ownCloud
6f04c58f59
[tx-robot] updated from transifex
2015-11-30 01:13:52 -05:00
Jenkins for ownCloud
82fd5e47e2
[tx-robot] updated from transifex
2015-11-29 01:13:42 -05:00
Jenkins for ownCloud
248aaf4bf0
[tx-robot] updated from transifex
2015-11-28 01:13:42 -05:00
Jenkins for ownCloud
c173743870
[tx-robot] updated from transifex
2015-11-27 01:13:44 -05:00
Jenkins for ownCloud
70f59f6ad9
[tx-robot] updated from transifex
2015-11-26 01:13:44 -05:00
David A. Velasco
f5369ac4b2
Hide UI elements about public share when this is disabled in the server
2015-11-25 09:32:31 +01:00
masensio
3087a3af3e
Review padding values for expiration date and password rows in share view
2015-11-25 09:32:28 +01:00
masensio
030eaffcfc
List view is shown completelly on the ShareFileFragment
2015-11-25 09:32:27 +01:00
masensio
e08513a762
Delete any rest of old public share/unshare flow
2015-11-25 09:32:26 +01:00
David A. Velasco
729a9b7c77
Set or clear password to protect public link in ShareFileFragment
2015-11-25 09:32:19 +01:00
David A. Velasco
f1b3208f1a
Updated ShareFileFragment layout with extra section for public shares
2015-11-25 09:32:15 +01:00
David A. Velasco
a39c857680
Removed unneeded FrameLayout
2015-11-25 09:32:14 +01:00
Jenkins for ownCloud
d60023867c
[tx-robot] updated from transifex
2015-11-25 01:13:40 -05:00
Jenkins for ownCloud
83e2bd588d
[tx-robot] updated from transifex
2015-11-24 01:13:40 -05:00
Jenkins for ownCloud
d244d558e3
[tx-robot] updated from transifex
2015-11-23 01:13:32 -05:00
Andy Scherzinger
ecdb95fa0c
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-11-22 17:10:37 +01:00
Jenkins for ownCloud
bbfa65cba6
[tx-robot] updated from transifex
2015-11-22 01:13:39 -05:00
tobiasKaminsky
2aac1e5270
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
2015-11-21 08:48:40 +01:00
Jenkins for ownCloud
f8f99af255
[tx-robot] updated from transifex
2015-11-21 01:13:37 -05:00
Jenkins for ownCloud
76bfd8d452
[tx-robot] updated from transifex
2015-11-20 01:13:34 -05:00
Jenkins for ownCloud
05232de750
[tx-robot] updated from transifex
2015-11-19 01:13:47 -05:00
Jenkins for ownCloud
8331456825
[tx-robot] updated from transifex
2015-11-13 01:13:44 -05:00
Jenkins for ownCloud
adfe21b886
[tx-robot] updated from transifex
2015-11-11 01:13:45 -05:00
Jenkins for ownCloud
c229790208
[tx-robot] updated from transifex
2015-11-10 01:13:45 -05:00
Jenkins for ownCloud
c386801013
[tx-robot] updated from transifex
2015-11-09 01:13:41 -05:00
Jenkins for ownCloud
11be7f0f54
[tx-robot] updated from transifex
2015-11-08 01:13:44 -05:00
Jenkins for ownCloud
48b35330f1
[tx-robot] updated from transifex
2015-11-07 01:13:50 -05:00
Andy Scherzinger
c31f602fd1
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/list_item.xml
2015-11-06 11:38:51 +01:00
Maria Asensio
19cce9c90f
Merge pull request #1184 from Wikinaut/show-certificate-digest
...
fix #1024 show cert fingerprints when adding new account w/ untrusted certificate
2015-11-06 11:23:30 +01:00
Jenkins for ownCloud
bf53dfb3af
[tx-robot] updated from transifex
2015-11-06 01:14:02 -05:00
Maria Asensio
7e96305668
Merge pull request #1252 from owncloud/share_with_users
...
Share with users & groups
2015-11-05 13:19:24 +01:00
David A. Velasco
b985935f22
Removed spurious file
2015-11-05 10:24:38 +01:00
Jenkins for ownCloud
94b21ef5d9
[tx-robot] updated from transifex
2015-11-05 01:13:44 -05:00
Andy Scherzinger
f7fe0e00de
moved back to #eee for the divider coloring since the coloring hasn't worked yet for the standard list views, see discussion #1232
2015-11-04 10:51:43 +01:00
Jenkins for ownCloud
62287458b8
[tx-robot] updated from transifex
2015-11-04 01:13:47 -05:00
Jenkins for ownCloud
653a812684
[tx-robot] updated from transifex
2015-11-03 01:13:49 -05:00
Andy Scherzinger
2cfc7237ea
correct text field names
2015-11-02 15:26:00 +01:00
Andy Scherzinger
838aaff224
change devider color to #f8f8f8
2015-11-02 15:25:43 +01:00
Andy Scherzinger
90097b107d
typos fixed
2015-11-02 12:22:49 +01:00
Andy Scherzinger
efdcb97963
setting divider color to #eee as decided by @jancborchardt
2015-11-02 12:05:52 +01:00
Andy Scherzinger
f72289f7bf
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-11-02 08:41:51 +01:00
Andy Scherzinger
6e54dfc55c
flipped size and mod date
2015-11-02 08:40:18 +01:00
Jenkins for ownCloud
2f237fb0cc
[tx-robot] updated from transifex
2015-11-02 01:13:44 -05:00
Jenkins for ownCloud
f817e49515
[tx-robot] updated from transifex
2015-11-01 01:13:47 -04:00
Jenkins for ownCloud
bba2964726
[tx-robot] updated from transifex
2015-10-31 01:13:54 -04:00
masensio
f1bd33ce00
Fix: Having the device in landscape current shared users are not shown. Redimension 'Share with' dialog
2015-10-30 16:53:06 +01:00
masensio
d1294ca584
Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group
2015-10-30 16:50:49 +01:00
masensio
f8548b49f1
Delete search_user_item.xml
2015-10-30 16:48:33 +01:00
masensio
671fef617b
Show users/groups in Search Fragment list
2015-10-30 16:48:31 +01:00
masensio
b3dc5f477c
Show 'Add Users or Groups' button properly
2015-10-30 16:47:31 +01:00
David A. Velasco
33a9d1f447
Get rid of dependency on Context in CreateShareOperation
2015-10-30 16:41:59 +01:00
masensio
fcdef568ea
Remove share_group_indicator string
2015-10-30 16:39:23 +01:00
masensio
ceffbc4aa8
Remove unshare with users/groups option from the menu
2015-10-30 16:39:21 +01:00
David A. Velasco
305536f8c2
Users and groups retrieved from server to fill search suggestions
2015-10-30 16:31:08 +01:00
masensio
1fbc44b574
Add new string for share_groups_indicator
2015-10-30 16:28:41 +01:00
masensio
fff362d103
Add unshare with user option to share with view
2015-10-30 16:28:37 +01:00
David A. Velasco
e3d509a451
Complete search widget to send search requests to parent activity
2015-10-30 16:28:35 +01:00
masensio
20b0ec8977
Show users/groups in share with view, getting the data from the server
2015-10-30 16:26:26 +01:00
masensio
88eca70dbf
fix Travis
2015-10-30 16:25:55 +01:00
masensio
00a221ea8f
Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project
2015-10-30 16:25:54 +01:00
David A. Velasco
0db4fc9b17
Sync user and group shares into database
2015-10-30 16:25:52 +01:00
masensio
905b68b4ec
Show the 'search' layout in phone and tablet
2015-10-30 15:23:03 +01:00
David A. Velasco
bc5687b74a
Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)
2015-10-30 15:23:00 +01:00
masensio
2855a81cf0
Create the layout for searching users/groups
2015-10-30 15:22:58 +01:00
masensio
c6c5b732c7
Add get list of users in the library
2015-10-30 15:22:12 +01:00
masensio
f28faf0c26
Show the layout to hsare with user in phone and tablet
2015-10-30 15:21:48 +01:00
masensio
8e3d7bdc8f
Create the layout to share with a user
2015-10-30 15:10:42 +01:00
masensio
3a527a8fe4
Add 'Share with users/groups' to long press menu
2015-10-30 15:04:34 +01:00
Maria Asensio
eaa0612bfa
Merge pull request #1109 from owncloud/sync_full_folder
...
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder
2015-10-30 14:14:52 +01:00
Jenkins for ownCloud
720c49136a
[tx-robot] updated from transifex
2015-10-30 01:13:47 -04:00
Jenkins for ownCloud
00c6d8bffe
[tx-robot] updated from transifex
2015-10-29 01:13:42 -04:00
masensio
b9ef747a0b
Merge branch 'master' into sync_full_folder
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java
2015-10-27 08:52:17 +01:00
Jenkins for ownCloud
3918ec18a8
[tx-robot] updated from transifex
2015-10-27 01:13:47 -04:00
Andy Scherzinger
2603a35105
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-26 13:57:04 +01:00
Jenkins for ownCloud
2702951056
[tx-robot] updated from transifex
2015-10-23 01:13:41 -04:00
Andy Scherzinger
5c1e6e59ba
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-22 13:05:06 +02:00
David A. Velasco
08443f90c5
Merge pull request #1177 from owncloud/notification_coloring
...
Add ownCloud color to notifications for lollipop
2015-10-22 09:10:10 +02:00
Andy Scherzinger
dffd81e00c
removed primary color usage for textColor of the input fields on the loginscreen
2015-10-21 11:31:58 +02:00
Andy Scherzinger
e61641b39d
center align radio buttons
2015-10-21 11:05:11 +02:00
Jenkins for ownCloud
8269b6dee6
[tx-robot] updated from transifex
2015-10-21 01:13:40 -04:00
Jenkins for ownCloud
1db483d521
[tx-robot] updated from transifex
2015-10-20 01:13:41 -04:00
Andy Scherzinger
d64946f859
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-19 13:00:15 +02:00
Jenkins for ownCloud
d1dfc9958d
[tx-robot] updated from transifex
2015-10-19 01:13:44 -04:00
Jenkins for ownCloud
47e74b6271
[tx-robot] updated from transifex
2015-10-18 01:13:42 -04:00
Jenkins for ownCloud
185b670e5c
[tx-robot] updated from transifex
2015-10-17 01:13:48 -04:00
tobiasKaminsky
e18773465d
Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles
2015-10-15 18:27:07 +02:00
Andy Scherzinger
c56b3568c5
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
2015-10-14 10:34:48 +02:00
Andy Scherzinger
2610eb6805
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-14 10:33:49 +02:00
Jenkins for ownCloud
c47b0ab77a
[tx-robot] updated from transifex
2015-10-14 01:13:38 -04:00
Jenkins for ownCloud
28198ee983
[tx-robot] updated from transifex
2015-10-13 01:13:37 -04:00
Jenkins for ownCloud
a317483f44
[tx-robot] updated from transifex
2015-10-12 01:13:37 -04:00
Andy Scherzinger
e5a61893ec
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-11 12:30:05 +02:00
Jenkins for ownCloud
42f38fe876
[tx-robot] updated from transifex
2015-10-11 01:13:36 -04:00
Jenkins for ownCloud
f206eaaeb4
[tx-robot] updated from transifex
2015-10-10 01:13:37 -04:00
Andy Scherzinger
a61f862677
directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms.
2015-10-09 15:04:39 +02:00
Jenkins for ownCloud
f9b7cbd2d5
[tx-robot] updated from transifex
2015-10-09 01:13:37 -04:00
Andy Scherzinger
41a883549f
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-10-07 19:03:23 +02:00
Maria Asensio
567355eed0
Merge pull request #1190 from owncloud/1182_Open_With_Fix
...
Fix for #1182 on Android 5
2015-10-07 11:19:16 +02:00
Jenkins for ownCloud
8ba051f851
[tx-robot] updated from transifex
2015-10-07 01:13:37 -04:00
Jenkins for ownCloud
435d4969fe
[tx-robot] updated from transifex
2015-10-06 01:13:31 -04:00
Andy Scherzinger
8f0ea82efd
Fix for #1182 on Android 5
2015-10-05 18:44:50 +02:00
Jenkins for ownCloud
eddd3aa450
[tx-robot] updated from transifex
2015-10-04 01:13:38 -04:00
Jenkins for ownCloud
f056247e75
[tx-robot] updated from transifex
2015-10-03 01:13:37 -04:00
Wikinaut
cf063bf04a
fix #1024 show cert fingerprints when adding new account w/ untrusted cert
...
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
instead of signature hex dump
when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
2015-10-02 02:39:10 +02:00
masensio
8f67624a4f
Fix: Long press menu shows two extra options: old cancel download and old cancel upload
2015-10-01 10:37:37 +02:00
masensio
9494620cc4
Merge branch 'master' into sync_full_folder
...
Conflicts:
src/com/owncloud/android/providers/FileContentProvider.java
2015-09-30 12:24:01 +02:00
masensio
8090269d55
Merge branch 'master' of github.com:owncloud/android
...
Conflicts:
CHANGELOG.md
2015-09-30 10:49:47 +02:00
Jenkins for ownCloud
b6c5188fd0
[tx-robot] updated from transifex
2015-09-29 01:13:58 -04:00
masensio
4316d7082f
Remove strings for values-en_DE
2015-09-28 13:57:22 +02:00
masensio
ee9aa68d23
Merge branch 'release-1.8'
2015-09-28 12:33:47 +02:00
Jenkins for ownCloud
9a3872d003
[tx-robot] updated from transifex
2015-09-28 02:33:53 -04:00
Andy Scherzinger
917039411c
added a divider to the bottom part
2015-09-27 20:43:18 +02:00
Andy Scherzinger
2ffdb4db00
16dp right and left for checkpoxed
2015-09-27 20:32:44 +02:00
Andy Scherzinger
35a68aa337
custom list preference implementation for visual material consistency on pre-lollipop
2015-09-27 20:21:09 +02:00
tobiasKaminsky
57862ef52c
added 16dp padding
2015-09-25 17:30:30 +02:00
tobiasKaminsky
ff5202a5f6
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles
2015-09-25 17:23:31 +02:00
tobiasKaminsky
19bc90bf56
default value: do nothing
...
show summary for behaviour
2015-09-25 17:21:58 +02:00
Andy Scherzinger
5417b2a4e5
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
2015-09-25 16:09:01 +02:00
David A. Velasco
056b7c964d
Updated error message for failed folder synchronization ('download' not anymore)
2015-09-25 15:13:59 +02:00
David A. Velasco
e6c1454458
Persist conflicts in local database and show with an icon in the list of files
2015-09-25 15:13:46 +02:00
David A. Velasco
9b5506f81e
Join cancelation of downloads and uploads in 'cancel sync', both for files and folders
2015-09-25 15:13:41 +02:00
David A. Velasco
e885c78dc7
Added icon for files synchronizing; folders use it whenever downloading or uploading any file inside
2015-09-25 15:13:38 +02:00
David A. Velasco
ac685690a2
Extend SyncFolderOperation to check local changes of all files and trigger uploads
2015-09-25 15:13:35 +02:00
David A. Velasco
a38461aaa5
Same style for log-in buttons in potrait and landscape
2015-09-25 13:54:53 +02:00
David A. Velasco
c44ed4980c
Fixed lost background color for icon in login view
2015-09-25 11:11:46 +02:00
tobiasKaminsky
5034e42928
extracted hard-coded string to string resource
2015-09-23 19:49:01 +02:00
Andy Scherzinger
66aede2b3c
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-22 10:01:14 +02:00
Jenkins for ownCloud
92c39be013
[tx-robot] updated from transifex
2015-09-22 01:13:44 -04:00
tobiasKaminsky
2b6a61ddae
#819 part3: When uploading from filesystem inside the owncloud app, show question
2015-09-21 09:45:20 +02:00
tobiasKaminsky
a64308f382
wip
2015-09-21 09:03:09 +02:00
tobiasKaminsky
a1b2655d85
wip
2015-09-21 08:57:00 +02:00
Jenkins for ownCloud
664450a6bf
[tx-robot] updated from transifex
2015-09-21 01:13:34 -04:00
tobiasKaminsky
4b8a5a9c92
#819 , part 2: Instant uploads, depends on setting
2015-09-19 14:33:29 +02:00
Andy Scherzinger
eb7bcfbd2e
Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
owncloud-android-library
res/layout-land/account_setup.xml
2015-09-17 15:39:27 +02:00
Andy Scherzinger
f6b2b856cb
Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192
2015-09-17 11:46:37 +02:00
