Commit graph

3901 commits

Author SHA1 Message Date
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
masensio
ddfaa953c9 Merge pull request #1056 from owncloud/svgTransparentBackground
PNG transparent background
2015-08-24 12:34:50 +02:00
Jenkins for ownCloud
bf0942c6c3 [tx-robot] updated from transifex 2015-08-24 01:13:40 -04:00
Jenkins for ownCloud
15f6492020 [tx-robot] updated from transifex 2015-08-23 01:13:42 -04:00
tobiasKaminsky
84f9169e7a Thumbnails add checkerboard to png 2015-08-22 07:49:35 +02:00
Jenkins for ownCloud
e2e7b0464a [tx-robot] updated from transifex 2015-08-22 01:13:42 -04:00
gstraube
1a8a655747 Merge remote-tracking branch 'upstream/develop' into develop 2015-08-21 20:45:40 +02:00
tobiasKaminsky
8e3787909f Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground 2015-08-21 17:48:58 +02:00
purigarcia
e9ca430fa0 Merge branch 'develop' into ignoreHiddenFiles 2015-08-21 11:18:17 +02:00
Jenkins for ownCloud
632f3d23e0 [tx-robot] updated from transifex 2015-08-21 01:13:44 -04:00
masensio
0c7a9c3e3a Merge pull request #1076 from owncloud/material_toolbar
Material Design
2015-08-20 14:14:53 +02:00
Andy Scherzinger
a46eb270ab further m-prefixing 2015-08-20 13:46:27 +02:00
Andy Scherzinger
ee85bf9e8c fixed m-Prefixing 2015-08-20 13:39:59 +02:00
Andy Scherzinger
a544a0cfb6 correct copyright info 2015-08-20 13:08:28 +02:00
Andy Scherzinger
8db8b07be0 NullCheck for drawer 2015-08-20 12:47:31 +02:00
Andy Scherzinger
8b55e8b35c prefixed variables with 'm' 2015-08-20 11:35:40 +02:00
Jorge Antonio Diaz-Benito Soriano
ae0e116ffc Fixes the text preview issue 2015-08-19 21:07:14 +02:00
Andy Scherzinger
2ce3e2707a NPE Fix for setting the color on the IndeterminateProgressDialog 2015-08-19 19:17:09 +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
David A. Velasco
47512499b1 Removed dependency on Context in CopyFileOperation 2015-08-18 18:06:57 +02:00
Jorge Antonio Diaz-Benito Soriano
97da4d5c8a Fixes the last reported bugs 2015-08-18 18:05:20 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
21c391c0b2 Removes a static modifier that sneaked in 2015-08-18 17:39:50 +02:00
Jorge Antonio Diaz-Benito Soriano
97625170fa Taken out old activity 2015-08-18 17:37:57 +02:00
Jorge Antonio Diaz-Benito Soriano
3b2f51b5a5 Refactored functionality to use the new FolderPickerActivity class 2015-08-18 17:36:08 +02:00
Jorge Antonio Diaz-Benito Soriano
4fc0ef5abb Updated copy action 2015-08-18 17:20:56 +02:00
Jorge Antonio Diaz-Benito Soriano
fb423bf719 Updated submodule to point to the branch with the additional stuff for the copy action 2015-08-18 17:07:35 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76 Added error messages for copy action. English only. 2015-08-18 17:04:47 +02:00
Jorge Antonio Diaz-Benito Soriano
ccf8741fab Added copy action 2015-08-18 17:00:51 +02:00
Jorge Antonio Diaz-Benito Soriano
bc50129881 Fixed 'Move' action 2015-08-18 16:21:39 +02:00
Jorge Antonio Diaz-Benito Soriano
db40d1ad68 Added 'ACTION_COPY_FILES'. 2015-08-18 16:15:00 +02:00
Jorge Antonio Diaz-Benito Soriano
dcffd79b60 Tweaks for source 1.5 2015-08-18 15:55:00 +02:00
Jorge Antonio Diaz-Benito Soriano
91f027fd06 Make oC-android-library track the copy_operation branch 2015-08-18 15:42:05 +02:00
Jorge Antonio Diaz-Benito Soriano
b843bc4387 Updated submodule to point to the branch with the additional stuff for the copy action 2015-08-18 14:20:18 +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
c7205b8f56 Added CopyActivity 2015-08-18 11:39:18 +02:00
Jorge Antonio Diaz-Benito Soriano
dc8ceffddc Fixed 'Move' action 2015-08-18 11:37:23 +02:00
Jorge Antonio Diaz-Benito Soriano
d9db150a31 Added 'ACTION_COPY_FILES'. 2015-08-18 11:17:54 +02:00
Jorge Antonio Diaz-Benito Soriano
f4432afdeb Added 'Copy' action 2015-08-18 10:58:37 +02:00
masensio
95db3421f6 Merge branch 'master' into develop 2015-08-18 10:16:13 +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
4ff231f256 Java Doc added 2015-08-17 16:00:16 +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
80e7836840 set back font weight on drawer list items 2015-08-17 09:04:37 +02:00