Jenkins for ownCloud
2adeab1fc5
[tx-robot] updated from transifex
2016-02-21 01:13:32 -05:00
Jenkins for ownCloud
6009ef939b
[tx-robot] updated from transifex
2016-02-20 01:13:39 -05:00
Maria Asensio
482d43a08d
Merge pull request #1473 from owncloud/target_marshmallow_rebased
...
Move to compile target Marshmallow (Android 6 - v23) - rebased without FAB
2016-02-19 11:28:05 +01:00
Jenkins for ownCloud
5828ec35b8
[tx-robot] updated from transifex
2016-02-19 01:13:36 -05:00
Jenkins for ownCloud
79c7cc86bc
[tx-robot] updated from transifex
2016-02-18 01:13:43 -05:00
Jenkins for ownCloud
e12734c551
[tx-robot] updated from transifex
2016-02-17 01:13:47 -05:00
Jenkins for ownCloud
e219eebaa0
[tx-robot] updated from transifex
2016-02-16 01:13:36 -05:00
Andy Scherzinger
3fa2d292bb
fixed ic_refresh icon work with 24dp origial grey600 version
2016-02-15 17:34:45 +01:00
David A. Velasco
82b0b7a84f
Merge branch 'master' into reliable_uploads_actions_uploads_view
2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero
9fe62d15ea
Refresh listview when clear failed/finished uploads clicked
2016-02-15 10:58:53 +01:00
Jenkins for ownCloud
5f15321445
[tx-robot] updated from transifex
2016-02-15 01:13:39 -05:00
Jenkins for ownCloud
d31c2ada3b
[tx-robot] updated from transifex
2016-02-14 01:13:33 -05:00
Jenkins for ownCloud
5800ab977e
[tx-robot] updated from transifex
2016-02-13 01:13:37 -05:00
Andy Scherzinger
bc4de91e93
material style play icon added
2016-02-12 12:50:00 +01:00
Andy Scherzinger
9d9bc6958b
changes color of the OK button and the text
2016-02-12 12:29:05 +01:00
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
tobiasKaminsky
e92297ccaf
split "on charging" to photo and video
2015-10-18 12:51:08 +02:00
tobiasKaminsky
e5caabd104
Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
2015-10-18 12:50:54 +02:00
tobiasKaminsky
1db620124a
update according to jan
2015-10-18 10:21:29 +02:00
tobiasKaminsky
7fe9c02bff
Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
2015-10-18 10:08:46 +02: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
Jenkins for ownCloud
0cb5cee031
[tx-robot] updated from transifex
2015-09-17 01:13:47 -04:00
Andy Scherzinger
bbbb7026b4
fix for refrsh icon in text view in landscape mode
2015-09-16 17:34:29 +02:00
Andy Scherzinger
549284e4f9
fix click listener
2015-09-16 17:31:27 +02:00
Andy Scherzinger
044c597e2b
fix for refresh bug
2015-09-16 17:21:53 +02:00
Andy Scherzinger
94bc0699ac
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
...
fixed realignment item badges
Conflicts:
res/layout/list_item.xml
2015-09-16 16:27:47 +02:00
masensio
459bd1e9d0
Merge pull request #1157 from owncloud/fix_file_list_icon_alignment
...
center aligned the folder icon with the drawer icon
2015-09-16 12:34:30 +02:00
Andy Scherzinger
4c0371f82b
center aligned the folder icon with the drawer icon
2015-09-16 11:41:37 +02:00
masensio
359ede5fdd
Merge pull request #1149 from owncloud/new_filetype_icons
...
New icon detection in general + support for additional mimetype icons
2015-09-16 11:39:26 +02:00
Andy Scherzinger
9e15d2459d
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons
2015-09-15 18:44:49 +02:00
Andy Scherzinger
6f5cb9aaca
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-15 18:43:48 +02:00
David A. Velasco
eaf249803c
Removed unneeded LDPI drawables
2015-09-15 18:08:00 +02:00
David A. Velasco
0290523c03
Added icons for file type TEXT
2015-09-15 18:07:59 +02:00
Andy Scherzinger
3ff4d6df0f
adapting web's way of choosing icons
2015-09-15 18:02:34 +02:00
Jenkins for ownCloud
9b8b29d98b
[tx-robot] updated from transifex
2015-09-14 01:13:43 -04:00
Jenkins for ownCloud
83eed1a8d8
[tx-robot] updated from transifex
2015-09-12 01:13:45 -04:00
Andy Scherzinger
6eccdc25b3
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
2015-09-11 13:06:14 +02:00
Andy Scherzinger
13a73dd568
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-11 12:47:01 +02:00
David A. Velasco
7182b1d2b1
Merge pull request #1141 from owncloud/559_longpress_filename
...
Show file name in the contextual menu, see #559
2015-09-11 12:37:04 +02:00
Jenkins for ownCloud
7ae7cef2b3
[tx-robot] updated from transifex
2015-09-11 01:13:42 -04:00
Marc Plano-Lesay
b4875c69cc
Add additional filetype icons
2015-09-09 23:30:09 +02:00
Andy Scherzinger
0234ca22ea
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-09 11:42:11 +02:00
masensio
84a4a086d6
Merge pull request #1124 from Kernald/new-filetype-icons
...
New filetype icons
2015-09-09 08:50:50 +02:00
Jenkins for ownCloud
fbe533c974
[tx-robot] updated from transifex
2015-09-09 01:13:45 -04:00
Andy Scherzinger
ed86a0560a
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-08 13:50:02 +02:00
Jenkins for ownCloud
1d4b191fb3
[tx-robot] updated from transifex
2015-09-08 01:13:44 -04:00
Andy Scherzinger
e9f793755e
showing the filename in the long press menu on file list, see #559
2015-09-07 12:24:01 +02:00
Andy Scherzinger
6d670fb678
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-07 11:16:29 +02:00
masensio
1586eea7cb
Merge branch 'master' into text_file_preview_pr_707_with_develop
2015-09-07 10:42:09 +02:00
David A. Velasco
1ff57e0665
HOT FIX: recovered lost strings
2015-09-07 10:07:54 +02:00
Jenkins for ownCloud
244f3bd4e4
[tx-robot] updated from transifex
2015-09-07 01:13:41 -04:00
Andy Scherzinger
c1e73ec56f
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-09-06 20:49:49 +02:00
Jenkins for ownCloud
5ceecb4a82
[tx-robot] updated from transifex
2015-09-06 01:13:44 -04:00
Jenkins for ownCloud
11c0d77648
[tx-robot] updated from transifex
2015-09-05 01:13:44 -04:00
masensio
fc5c4d899c
Merge branch 'master' into text_file_preview_pr_707_with_develop
...
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-09-04 14:31:10 +02:00
Andy Scherzinger
e7674368e2
fix duplicate
2015-09-04 13:24:12 +02:00
Andy Scherzinger
7ac2a0d297
fix layout/uploader_layout.xml
2015-09-04 13:20:41 +02:00
Andy Scherzinger
32145d57db
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/uploader_layout.xml
2015-09-04 13:16:11 +02:00
masensio
f787213cd1
Merge pull request #1102 from owncloud/copy
...
Copy files
2015-09-04 11:14:42 +02:00
Jenkins for ownCloud
f70de1736e
[tx-robot] updated from transifex
2015-09-04 01:13:40 -04:00
masensio
3b2c61a48c
Merge branch 'master' into uploadShowsFiles
...
Conflicts:
res/layout/uploader_layout.xml
res/layout/uploader_list_item_layout.xml
src/com/owncloud/android/ui/activity/Uploader.java
2015-09-02 16:45:33 +02:00
masensio
a0707428ff
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
...
Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2015-09-02 13:23:42 +02:00
Jenkins for ownCloud
2b001a8bf2
[tx-robot] updated from transifex
2015-09-02 07:06:14 -04:00
Jenkins for ownCloud
f70817f5fb
[tx-robot] updated from transifex
2015-09-01 13:02:18 -04:00
David A. Velasco
e6be60679f
Merge branch 'master' into copy
...
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
2015-09-01 18:35:51 +02:00
masensio
9364edbb11
fix strings.fr
2015-09-01 16:55:23 +02:00
masensio
efb3989ee6
Merge branch 'develop' into uploadWhenCharging
...
Conflicts:
res/values-fr/strings.xml
res/xml/preferences.xml
2015-09-01 16:51:40 +02:00
Marc Plano-Lesay
502ff0a216
Use new filetype icons
2015-08-31 19:17:05 +02:00
David A. Velasco
136db6a765
Merge pull request #1122 from owncloud/create_folder_button_on_action_bar_for_uploader
...
'Create folder' button moved to action bar in Uploader activity
2015-08-31 17:48:12 +02:00
Jenkins for ownCloud
ef7cf6edb0
[tx-robot] updated from transifex
2015-08-31 01:13:46 -04:00
Jenkins for ownCloud
11fa921860
[tx-robot] updated from transifex
2015-08-28 01:13:40 -04:00
Jenkins for ownCloud
6b8a052a5e
[tx-robot] updated from transifex
2015-08-27 01:13:43 -04:00
Jenkins for ownCloud
8ecfdfe614
[tx-robot] updated from transifex
2015-08-26 01:13:41 -04:00
masensio
b81de1d547
Merge branch 'master' into create_folder_button_on_action_bar_for_uploader
...
Conflicts:
res/layout/uploader_layout.xml
2015-08-25 14:53:42 +02:00
Jenkins for ownCloud
8f0a83a495
[tx-robot] updated from transifex
2015-08-25 01:13:43 -04:00
Jenkins for ownCloud
573b9d1727
[tx-robot] updated from transifex
2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
806f258bbd
[tx-robot] updated from transifex
2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
763ecd2d84
[tx-robot] updated from transifex
2015-08-24 12:38:29 +02:00
Jenkins for ownCloud
9448a809b1
[tx-robot] updated from transifex
2015-08-24 12:38:28 +02:00
tobiasKaminsky
8e3787909f
Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground
2015-08-21 17:48:58 +02:00
Andy Scherzinger
fd39e9168b
replaced the icons and header coloring
2015-08-21 17:32:24 +02:00
Andy Scherzinger
18811141fb
added delete icon files
2015-08-21 17:09:18 +02:00
masensio
3c2da890ce
Merge branch 'master' into reliable_uploads
2015-08-21 13:09:54 +02:00
Jenkins for ownCloud
632f3d23e0
[tx-robot] updated from transifex
2015-08-21 01:13:44 -04:00
masensio
3e6bcda9a4
Merge branch 'develop' into reliable_uploads
...
Conflicts:
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2015-08-20 16:37:10 +02:00
Andy Scherzinger
d24b396d54
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-20 13:50:44 +02:00
Andy Scherzinger
a544a0cfb6
correct copyright info
2015-08-20 13:08:28 +02:00
Andy Scherzinger
7f13b98cc0
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
2015-08-18 23:20:01 +02:00
Andy Scherzinger
cbb0f8743f
Fix for long click menue for account management in preferences screen
2015-08-18 23:13:10 +02:00
Andy Scherzinger
dbed65610b
fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle
2015-08-18 22:09:53 +02:00
Andy Scherzinger
da89715045
reverted back to light colored login
2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76
Added error messages for copy action. English only.
2015-08-18 17:04:47 +02:00
masensio
e5e5b3638c
Merge branch 'develop' into reliable_uploads
...
Conflicts:
SETUP.md
owncloud-android-library
res/menu/main_menu.xml
res/values/strings.xml
src/com/owncloud/android/db/DbHandler.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/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/ComponentsGetter.java
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/activity/Uploader.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-08-18 15:14:37 +02:00
Andy Scherzinger
e79f92f566
Conflict Dialog Fix
2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
7c19fcdc94
Added error messages for copy action. English only.
2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8
Added copy action
2015-08-18 13:35:28 +02:00
Andy Scherzinger
a393531774
visual fix for Progress DialogFragment(s)
2015-08-18 13:08:58 +02:00
Jorge Antonio Diaz-Benito Soriano
f4432afdeb
Added 'Copy' action
2015-08-18 10:58:37 +02:00
Andy Scherzinger
c13741ba20
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 16:14:12 +02:00
Andy Scherzinger
3a82db451c
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
2015-08-17 16:13:30 +02:00
Andy Scherzinger
b669bd7737
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 16:04:17 +02:00
Andy Scherzinger
ba80646e4e
Fix for 4.0 file action context menu (re-implement it via DialogFragment)
2015-08-17 15:58:03 +02:00
Andy Scherzinger
16a5bdc8d1
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-17 09:05:33 +02:00
Andy Scherzinger
80e7836840
set back font weight on drawer list items
2015-08-17 09:04:37 +02:00
Jenkins for ownCloud
ba4b258697
[tx-robot] updated from transifex
2015-08-17 01:13:37 -04:00
Jenkins for ownCloud
d09baff068
[tx-robot] updated from transifex
2015-08-15 01:13:39 -04:00
Andy Scherzinger
267179ef2e
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
2015-08-14 18:55:58 +02:00
Andy Scherzinger
71f68b4c8c
fix for progressbars on pre lollipop and post ics for seekbar thumbs
2015-08-14 18:55:31 +02:00
Andy Scherzinger
a7859b4ab4
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/drawer.xml
res/layout/drawer_list_item.xml
res/values/styles.xml
2015-08-14 17:45:22 +02:00
Andy Scherzinger
92af92ee3b
merged part of the fixes from material buttons branch to fix bugs reported in PR #1076
2015-08-14 17:18:36 +02:00
Andy Scherzinger
7df40c01c8
fixed drawer font size, changed color according to material guide
2015-08-14 16:00:35 +02:00
Andy Scherzinger
9d08a3f306
fix for drawer width
2015-08-14 15:40:22 +02:00
tobiasKaminsky
c50aa8bc2a
Merge remote-tracking branch 'upstream/video_thumbnail' into video_thumbnail
2015-08-14 15:39:35 +02:00
Andy Scherzinger
abb6e2dbd5
Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices
2015-08-14 15:29:22 +02:00
Andy Scherzinger
607fb6f587
group change data and size together and calculate decimals based on total size see comment in PR #1090
2015-08-14 10:05:26 +02:00
Andy Scherzinger
c86e92870f
fixed padding of list items
2015-08-14 00:34:12 +02:00
Andy Scherzinger
927ce968d7
fixed progress wheel
2015-08-13 19:43:56 +02:00
Andy Scherzinger
f17011ff68
some more styling for the log screen
2015-08-13 19:05:20 +02:00
Andy Scherzinger
5b92747895
standard material paddings set
2015-08-13 18:39:53 +02:00
Andy Scherzinger
64910f59bb
fixed checkbox (now also material design on pre lollipop)
2015-08-13 18:39:36 +02:00
Andy Scherzinger
8a8eb435a3
set standard 16dp whitespaces via config values not hardcoded
2015-08-13 18:08:21 +02:00
Andy Scherzinger
ba3bc9cbfd
minor padding change on logo
2015-08-13 17:54:58 +02:00
Andy Scherzinger
af2af7198b
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
...
Conflicts:
res/layout/ssl_untrusted_cert_layout.xml
res/layout/ssl_validator_layout.xml
2015-08-13 15:57:38 +02:00
Andy Scherzinger
60e0f09278
Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons
2015-08-13 15:41:59 +02:00
Jenkins for ownCloud
a244bdf1ca
[tx-robot] updated from transifex
2015-08-13 01:13:38 -04:00
Andy Scherzinger
f7d6939264
fix for text field focus colors
2015-08-12 19:12:56 +02:00
Andy Scherzinger
05ca0270a8
fixed button style blue/grey
2015-08-12 18:54:27 +02:00
Andy Scherzinger
5257af90bc
fixed username to be single line and ellipsized in case of lang names
2015-08-12 18:48:33 +02:00
Jenkins for ownCloud
c4b639e964
[tx-robot] updated from transifex
2015-08-12 01:13:37 -04:00
masensio
eda6f71491
Move create folder button to action bar in Uploader
2015-08-11 11:14:26 +02:00
Jenkins for ownCloud
c19bb85a24
[tx-robot] updated from transifex
2015-08-11 01:13:39 -04:00
Andy Scherzinger
6809e4a9de
16dp spacing for the footer too
2015-08-10 18:50:24 +02:00
Andy Scherzinger
e22b547401
further 16dp spacings
2015-08-10 18:36:50 +02:00
Andy Scherzinger
c085ffd545
inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes
2015-08-10 18:32:25 +02:00
Andy Scherzinger
a1b24dea37
Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail
2015-08-10 16:02:02 +02:00
Andy Scherzinger
928ce1a8b6
play icon (from google's material icon set) for the various resolutions #1035
2015-08-10 15:56:51 +02:00
Andy Scherzinger
275028a5e3
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
2015-08-10 13:01:40 +02:00
Andy Scherzinger
6a22a8cd3b
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-08-10 10:54:05 +02:00
Jenkins for ownCloud
2b79f3292f
[tx-robot] updated from transifex
2015-08-10 01:13:35 -04:00
Jenkins for ownCloud
2206585f52
[tx-robot] updated from transifex
2015-08-09 01:13:36 -04:00
Jenkins for ownCloud
5258172ffd
[tx-robot] updated from transifex
2015-08-08 01:13:38 -04:00
Andy Scherzinger
a3ccc6a559
fix for the button styling (land)
2015-08-07 18:05:50 +02:00
Andy Scherzinger
f4445284d0
material checkbox drawables instead of version dependend ones
2015-08-07 18:05:34 +02:00
Andy Scherzinger
bbfb414695
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
2015-08-07 17:11:04 +02:00
Andy Scherzinger
4a4296a07e
Material Buttons (draft)
2015-08-07 17:09:47 +02:00
Jenkins for ownCloud
8d4d1bfffb
[tx-robot] updated from transifex
2015-08-07 04:57:36 -04:00
Jenkins for ownCloud
e935e9239d
[tx-robot] updated from transifex
2015-08-07 01:13:50 -04:00
Andy Scherzinger
ddd01569cd
Optimized translucence for lollipop on image preview
2015-08-06 19:14:52 +02:00
Andy Scherzinger
6b6227125b
added back translucent action bar for image preview
2015-08-06 19:04:22 +02:00
Andy Scherzinger
9d9efd1c1d
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
...
Conflicts:
owncloud-android-library
2015-08-06 17:23:02 +02:00
Andy Scherzinger
a257935b8c
Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency
2015-08-06 17:13:00 +02:00
Andy Scherzinger
1ce7d79ff0
Move alert dialog to material variant and setting the correct accent color for the button texts via styles
2015-08-06 16:27:56 +02:00
purigarcia
91000ba405
change the subject
2015-08-06 10:23:27 +02:00
Jenkins for ownCloud
e0594d4005
[tx-robot] updated from transifex
2015-08-06 01:14:11 -04:00
masensio
b694fee63d
Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
...
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-08-05 16:48:12 +02:00
Andy Scherzinger
270fea6a33
fix for the grid footer
2015-08-05 15:21:05 +02:00
Andy Scherzinger
b276b623a9
added bottom padding to logo, logo slightly bigger
2015-08-05 14:48:04 +02:00
Andy Scherzinger
5ded9e818b
aligned account name with menu items
2015-08-05 14:07:00 +02:00
Andy Scherzinger
c2418d24d5
added missing progressbar
2015-08-05 13:43:23 +02:00
Andy Scherzinger
97b9932d81
changed color for hint text on login screens to 777
2015-08-05 13:36:12 +02:00
Andy Scherzinger
b5f8c0b087
changed alignment of drawer's content according to jan's suggestions
2015-08-04 19:02:36 +02:00
Andy Scherzinger
e36349f77e
fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment
2015-08-04 18:32:33 +02:00
David A. Velasco
156cb5e81b
Updated conflict message (same as in web app)
2015-08-04 17:29:42 +02:00
Andy Scherzinger
f7f468b578
extracted color values for download fragment, see comments 172c3f56a3
2015-08-04 17:06:27 +02:00
Andy Scherzinger
a329d49ddf
Fix for color reference in portrait 8f401a38d8 (comments)
2015-08-04 16:49:20 +02:00
Andy Scherzinger
10c5498879
extracted text colors for account setup to color.xml, see e72caebbce comments
2015-08-04 16:41:53 +02:00
tobiasKaminsky
d2df3f9b33
re-added values-tzl
2015-08-04 12:39:58 +02:00
tobiasKaminsky
c907f6a742
Partially revert 50819ce
2015-08-04 12:39:57 +02:00
tobiasKaminsky
1327ce7315
renamed string values
2015-08-04 12:39:56 +02:00
Andy Scherzinger
3c78d4fcfb
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
2015-08-04 11:47:44 +02:00
Jenkins for ownCloud
74d5911e56
[tx-robot] updated from transifex
2015-08-04 01:14:04 -04:00
Andy Scherzinger
6235022b56
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
2015-08-03 21:38:32 +02:00
tobiasKaminsky
8fab264a05
resized video overlay
...
removed empty image parts
2015-08-02 08:33:07 +02:00
Jenkins for ownCloud
519ba0393c
[tx-robot] updated from transifex
2015-07-31 01:14:01 -04:00
Jenkins for ownCloud
bacebffeb7
[tx-robot] updated from transifex
2015-07-30 01:14:02 -04:00
Jenkins for ownCloud
28284da055
[tx-robot] updated from transifex
2015-07-29 01:14:04 -04:00
Jenkins for ownCloud
2ac67e5e06
[tx-robot] updated from transifex
2015-07-28 01:14:02 -04:00
AndyScherzinger
bfea14e876
setting the username on the drawer header for startup and coming back from the preferences screen for account switching
2015-07-27 20:20:46 +02:00
AndyScherzinger
c49fbfb02c
adding a new accent color see #1076 comment by @jancborchardt
2015-07-27 16:34:16 +02:00
AndyScherzinger
687318e549
changing the logo padding top/bottom according to #1076 comment by @jancborchardt
2015-07-27 16:33:36 +02:00
AndyScherzinger
8c0376229e
changing the leight_height in order to get the screen backround color right mentioned by @jancborchardt in #1076
2015-07-27 16:33:10 +02:00
AndyScherzinger
ff2d55cede
replaced hard coded background color with coresponding color-definition
2015-07-27 16:18:53 +02:00
AndyScherzinger
172c3f56a3
colored background black for image download #710 as proposed by @jancborchardt
2015-07-27 01:00:51 +02:00
AndyScherzinger
77457f276f
adding material icons to resolutions < xxhdpi
2015-07-26 19:40:31 +02:00
AndyScherzinger
0a3b4c80c2
progress bar drawable definitions (forgot to commit earlier)
2015-07-26 18:36:29 +02:00
AndyScherzinger
e72caebbce
fine tuning icon work on login screen, making landscape visually en par with portrait mode
2015-07-26 18:36:00 +02:00
AndyScherzinger
49b3acd2be
added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore
2015-07-26 17:52:29 +02:00
AndyScherzinger
0c3e198e77
download fixing for #710
2015-07-26 02:54:03 +02:00
AndyScherzinger
35b971de10
further xxxhdpi cion work
2015-07-26 02:11:15 +02:00
AndyScherzinger
8f401a38d8
redone color changes for login screen
2015-07-26 02:10:51 +02:00
AndyScherzinger
d474239b21
initial material design changes for the action bar
2015-07-26 01:49:27 +02:00
Jenkins for ownCloud
82f4123260
[tx-robot] updated from transifex
2015-07-25 01:13:46 -04:00
tobiasKaminsky
e14533e387
overlay is added also when downloading new thumbnails
2015-07-24 18:29:24 +02:00
Jenkins for ownCloud
3d18b6b207
[tx-robot] updated from transifex
2015-07-24 01:14:12 -04:00
David A. Velasco
c21fa6c6e5
Merge pull request #1050 from owncloud/favourites_context_menu
...
'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
2015-07-23 09:37:13 +02:00
Jenkins for ownCloud
650c4fd290
[tx-robot] updated from transifex
2015-07-23 01:13:51 -04:00
tobiasKaminsky
37df675ca3
update
2015-07-22 21:00:09 +02:00
tobiasKaminsky
8c92889fa1
Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
2015-07-22 20:15:14 +02:00
purigarcia
61e6191342
change the name of the method from keepInSync to favorite. Other changes commented in the review
2015-07-22 18:13:45 +02:00
Jenkins for ownCloud
1976dfe9a1
[tx-robot] updated from transifex
2015-07-20 01:14:05 -04:00
Jenkins for ownCloud
aab283a15b
[tx-robot] updated from transifex
2015-07-18 01:14:06 -04:00
Jenkins for ownCloud
f173670351
[tx-robot] updated from transifex
2015-07-17 01:14:04 -04:00
Jenkins for ownCloud
48cd33ae2d
[tx-robot] updated from transifex
2015-07-14 01:14:02 -04:00
Jenkins for ownCloud
05896ff491
[tx-robot] updated from transifex
2015-07-13 01:14:04 -04:00
Jenkins for ownCloud
00e6d45abb
[tx-robot] updated from transifex
2015-07-12 01:14:02 -04:00
tobiasKaminsky
9ea3f7794f
add missing checker pattern
2015-07-11 09:40:06 +02:00
tobiasKaminsky
0527754c50
add checker background pattern for all png images.
2015-07-11 09:18:26 +02:00
Jenkins for ownCloud
7bb1307a6b
[tx-robot] updated from transifex
2015-07-11 01:14:06 -04:00
purigarcia
a3bfcdcd85
Merge branch 'develop' into favourites_context_menu
2015-07-10 08:44:56 +02:00
Jenkins for ownCloud
1e08c40f31
[tx-robot] updated from transifex
2015-07-10 01:14:03 -04:00
Jenkins for ownCloud
d32032fc96
[tx-robot] updated from transifex
2015-07-09 01:14:02 -04:00
purigarcia
7df9aa7310
add unfavorite option in context menu
2015-07-08 08:50:24 +02:00
purigarcia
ebe5a62f73
change the name from favorites to keep_up_to_date
2015-07-08 08:43:49 +02:00
purigarcia
e0efee57b4
add keep up to date option in the menu
2015-07-08 08:36:10 +02:00
Jenkins for ownCloud
7623a8af61
[tx-robot] updated from transifex
2015-07-08 01:14:04 -04:00
masensio
629cff2d3f
Merge branch 'master' into develop
2015-07-07 13:15:35 +02:00
masensio
174fa1f36b
delete values-tzl
2015-07-07 10:41:22 +02:00
Jenkins for ownCloud
cfe5b84573
[tx-robot] updated from transifex
2015-07-05 01:14:02 -04:00
Jenkins for ownCloud
d762a8747b
[tx-robot] updated from transifex
2015-07-03 01:15:16 -04:00
Jenkins for ownCloud
491e8a0bb3
[tx-robot] updated from transifex
2015-07-01 01:14:53 -04:00
Jenkins for ownCloud
eaf860d7c1
[tx-robot] updated from transifex
2015-06-30 01:13:52 -04:00
Jenkins for ownCloud
9ab961aa88
[tx-robot] updated from transifex
2015-06-29 01:13:34 -04:00
Jenkins for ownCloud
93b6c37400
[tx-robot] updated from transifex
2015-06-28 01:13:41 -04:00
Jenkins for ownCloud
24c564ab5f
[tx-robot] updated from transifex
2015-06-27 01:13:58 -04:00
David A. Velasco
9babe1b38c
Merge branch 'develop' into release-1.7.2
2015-06-25 14:43:04 +02:00
Jenkins for ownCloud
b4c217b505
[tx-robot] updated from transifex
2015-06-25 01:13:56 -04:00
Jorge Antonio Diaz-Benito Soriano
9a2f6c6c4b
Support margins for API levels pre-17
2015-06-24 22:12:36 +02:00
Jenkins for ownCloud
4aed07aae1
[tx-robot] updated from transifex
2015-06-24 01:13:55 -04:00
masensio
378b28f346
Update some file icons
2015-06-23 14:50:02 +02:00
David A. Velasco
8107d9dc4f
Fixed wrong format of files & folder count
2015-06-23 14:40:51 +02:00
David A. Velasco
36128298d4
Updated file icons with higher resolutions
2015-06-23 14:40:49 +02:00
Jenkins for ownCloud
51a539f4ee
[tx-robot] updated from transifex
2015-06-23 01:14:15 -04:00
David A. Velasco
8c5b2b7b13
Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2
2015-06-22 14:56:13 +02:00
masensio
fb57bbc8c8
Merge pull request #1023 from owncloud/fix_issues_from_Transifex
...
Message with count of list(s) and folder(s) reestructured for better translations
2015-06-22 14:14:36 +02:00
masensio
2fbd757d66
Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads
...
Conflicts:
owncloud-android-library
2015-06-22 14:03:21 +02:00
masensio
84678c9903
Fix: Import file from other app shows all folders as TextView
2015-06-22 12:58:41 +02:00
David A. Velasco
69a5b6f25d
More i18n-friendly format for footer in list of files (no string composition)
...
Conflicts FIXED:
res/values/strings.xml
2015-06-22 11:42:37 +02:00
Jenkins for ownCloud
a860ff6f96
[tx-robot] updated from transifex
2015-06-22 01:13:55 -04:00
Jenkins for ownCloud
37b2991755
[tx-robot] updated from transifex
2015-06-21 01:13:57 -04:00
Jenkins for ownCloud
f6abd41e09
[tx-robot] updated from transifex
2015-06-20 01:14:01 -04:00
masensio
e7710e7383
Update string subject_token and update library reference
2015-06-19 15:11:49 +02:00
Jenkins for ownCloud
f150ccd21c
[tx-robot] updated from transifex
2015-06-19 01:13:55 -04:00
Jenkins for ownCloud
95bdfc0643
[tx-robot] updated from transifex
2015-06-18 01:14:01 -04:00
David A. Velasco
3febfa1e08
Merge pull request #1014 from owncloud/forbidden_characters_from_server
...
Delegate check of forbidden characters on server, for OC >= 8.1
2015-06-17 09:20:27 +02:00
Jenkins for ownCloud
122ee28b85
[tx-robot] updated from transifex
2015-06-17 01:13:57 -04:00
Jenkins for ownCloud
32470c97eb
[tx-robot] updated from transifex
2015-06-16 01:14:07 -04:00
masensio
75fd0f40c6
Merge branch 'develop' into forbidden_characters_from_server
...
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
2015-06-15 14:51:13 +02:00
David A. Velasco
66f3a45d05
Merge branch 'develop' into navigationDrawer_basic
...
Conflicts FIXED:
res/layout/files.xml
2015-06-15 13:43:17 +02:00
Jenkins for ownCloud
42da742d5e
[tx-robot] updated from transifex
2015-06-15 01:13:52 -04:00
Jenkins for ownCloud
f4f0750b1a
[tx-robot] updated from transifex
2015-06-14 01:13:39 -04:00
Jenkins for ownCloud
96f64863d1
[tx-robot] updated from transifex
2015-06-13 01:13:55 -04:00
Jenkins for ownCloud
d094ea108d
[tx-robot] updated from transifex
2015-06-12 01:13:56 -04:00
Jenkins for ownCloud
486ad08e79
[tx-robot] updated from transifex
2015-06-11 01:13:55 -04:00
Jenkins for ownCloud
2075255313
[tx-robot] updated from transifex
2015-06-10 01:13:39 -04:00
masensio
33fae4d071
Merge pull request #978 from owncloud/automationTest
...
Automation test
2015-06-08 12:53:15 +02:00
Jenkins for ownCloud
d93eb752a1
[tx-robot] updated from transifex
2015-06-08 01:13:49 -04:00
purigarcia
23af1d2310
Merge branch 'develop' into automationTest
2015-06-05 10:32:37 +02:00
Jenkins for ownCloud
e93502657c
[tx-robot] updated from transifex
2015-06-05 01:13:53 -04:00
Jenkins for ownCloud
7194818bc0
[tx-robot] updated from transifex
2015-06-04 01:13:55 -04:00
Jenkins for ownCloud
9bf27e63a6
[tx-robot] updated from transifex
2015-06-03 01:13:53 -04:00
masensio
febe1fef89
Add new string message for forbidden characters controlled by the server
2015-06-02 11:07:34 +02:00
Jenkins for ownCloud
ed10941085
[tx-robot] updated from transifex
2015-06-02 01:13:46 -04:00
David A. Velasco
0117006313
Fixed update of id.home action bar button on navigation through FileDisplayActivity
2015-06-02 01:00:14 +02:00
Jenkins for ownCloud
c74164ecd9
[tx-robot] updated from transifex
2015-05-31 01:13:34 -04:00
Jenkins for ownCloud
b1a99c83f6
[tx-robot] updated from transifex
2015-05-30 01:13:45 -04:00
purigarcia
916bd5c6ca
Merge branch 'develop' into automationTest
2015-05-29 14:17:52 +02:00
David A. Velasco
41b5eb13b1
Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic
2015-05-29 13:46:30 +02:00
David A. Velasco
27148acf16
Fixed style in log-in activity; should be Light, as before
2015-05-29 13:30:02 +02:00
masensio
cf535b70f1
Disable 'Accounts' in Navigation Drawer
2015-05-29 11:32:36 +02:00
masensio
6e2dd6b191
Enable fitsSystemWindows in drawer.xml
2015-05-28 13:18:56 +02:00
masensio
c83925b454
Add license in some files
2015-05-28 11:30:02 +02:00
masensio
db01425a07
Add NavigationDrawer to image preview
2015-05-28 11:07:14 +02:00
Jenkins for ownCloud
a544613d75
[tx-robot] updated from transifex
2015-05-28 01:13:53 -04:00
tobiasKaminsky
3dc9a78696
Updated to work with latest update
2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f
Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update
2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed
Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update
2015-05-27 18:35:21 +02:00
masensio
35eb4dbfcf
Update main_menu.xml
2015-05-27 16:53:35 +02:00
masensio
c20041d157
Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update
...
Conflicts:
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-05-27 14:19:30 +02:00
masensio
e7493203de
Merge branch 'develop' into remove_ActionBarSherlock
2015-05-27 13:10:15 +02:00
tobiasKaminsky
bc5e05934f
added rectangle with first character
2015-05-26 20:49:03 +02:00
masensio
0238727d13
Add ic_drawer for mdpi and xhdpi
2015-05-26 13:12:19 +02:00
masensio
a9dad9e480
Add content_description to Navigation Drawer options
2015-05-26 11:46:15 +02:00
masensio
101989b70c
Move 'Logs' from Settings to Navigation Drawer
2015-05-26 09:11:27 +02:00
Jenkins for ownCloud
973aa26b5d
[tx-robot] updated from transifex
2015-05-26 01:13:51 -04:00
masensio
015eb6fee9
Disable On Device option in Navigation Drawer
2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80
Add actionBar
2015-05-25 12:39:05 +02:00
Jenkins for ownCloud
f22c19a28d
[tx-robot] updated from transifex
2015-05-25 01:13:49 -04:00
Jenkins for ownCloud
6e8fab5503
[tx-robot] updated from transifex
2015-05-24 01:13:52 -04:00
Jenkins for ownCloud
9f094c8946
[tx-robot] updated from transifex
2015-05-23 01:13:49 -04:00
Jenkins for ownCloud
24a6dfda9e
[tx-robot] updated from transifex
2015-05-22 01:13:49 -04:00
tobiasKaminsky
6d4207a06b
Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
2015-05-21 21:12:44 +02:00
masensio
5f2820355d
Merge branch 'develop' into navigation_drawer
...
Conflicts:
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
2015-05-21 09:46:59 +02:00
Jenkins for ownCloud
07acad20b5
[tx-robot] updated from transifex
2015-05-21 01:13:53 -04:00
masensio
288c148b51
Merge pull request #955 from owncloud/thumbnailOOM
...
HOTFIX: prevent OOM when scrolling Thumbnails
2015-05-20 11:07:14 +02:00
masensio
25718e7992
Merge branch 'develop' into navigation_drawer
2015-05-18 15:04:15 +02:00
David A. Velasco
a3642ab864
Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale
2015-05-18 14:29:00 +02:00
masensio
a496f08717
Remove actionbarsherlock , replace it with Android Support Library (v7)
2015-05-18 12:59:46 +02:00
Jenkins for ownCloud
2c37b73a55
[tx-robot] updated from transifex
2015-05-18 01:13:50 -04:00
masensio
d43fbbac6b
[DEV] Remove actionbarsherlock , replace it with Android Support Library (v7)
2015-05-15 11:24:14 +02:00
purigarcia
c775fa0691
Merge branch 'develop' into automationTest
2015-05-14 10:18:12 +02:00
Jenkins for ownCloud
efefb3bf2d
[tx-robot] updated from transifex
2015-05-14 01:13:58 -04:00
Jenkins for ownCloud
48d356d817
[tx-robot] updated from transifex
2015-05-13 01:13:51 -04:00
