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
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
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
