mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 00:12:05 +03:00
Code Issues Projects Releases Packages Wiki Activity
4341 commits 220 branches 1587 tags 639 MiB
Commit graph

2374 commits

Author SHA1 Message Date
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
Maria Asensio
4a11470630 Merge pull request #1200 from owncloud/fix_1192_date_time 
fix for #1192
 2015-10-30 10:38:14 +01:00
LukeOwncloud
9d4ce6becd MC: Updated comment only 
Comment did not reflect last commit change.
 2015-10-29 21:03:32 +01:00
masensio
3444d61be8 Detect conflict when local and server version are changed 2015-10-29 17:13:24 +01:00
Andy Scherzinger
448124cc7e return standard date string as fallback 2015-10-29 10:24:15 +01:00
masensio
bcfa07f565 Fix Select Local Version or Keep Both behaviour when solving file coflict 2015-10-27 14:32:42 +01: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
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
e8eda963ae flipped the if/else for performance optimization 2015-10-16 11:41:26 +02:00
Andy Scherzinger
be83702fd7 Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time 2015-10-16 10:42:02 +02:00
Andy Scherzinger
30720e98a5 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-16 10:41:32 +02:00
tobiasKaminsky
e18773465d Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles 2015-10-15 18:27:07 +02:00
tobiasKaminsky
960ea3ceac fixed missing refresh of thumbnail after sync 2015-10-15 16:20:14 +02:00
masensio
8e87cc2bf4 Merge remote-tracking branch 'origin/develop' 2015-10-15 16:17:32 +02:00
masensio
1f964a79dd Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail 
Conflicts:
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
 2015-10-15 16:10:55 +02:00
Andy Scherzinger
ae6194ffee fix for #1192 2015-10-15 14:04:56 +02:00
Andy Scherzinger
5db8c47b8a Merge branch 'master' of https://github.com/owncloud/android into notification_coloring 2015-10-09 14:45:32 +02: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
Maria Asensio
72e588b6b7 Merge pull request #1117 from owncloud/sortAccents 
Sort accents
 2015-10-06 14:51:14 +02:00
Andy Scherzinger
75e2349e5b Code review 2015-10-06 09:58:16 +02:00
Andy Scherzinger
8f0ea82efd Fix for #1182 on Android 5 2015-10-05 18:44:50 +02:00
tobiasKaminsky
7579d3daf7 Merge remote-tracking branch 'remotes/upstream/master' into sortAccents 2015-10-02 16:04:18 +02: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
99d7e18916 Merge pull request #839 from fluffy88/develop 
Trigger media scan after file upload
 2015-10-01 18:45:01 +02:00
masensio
08d02058c8 Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation 2015-09-30 17:59:12 +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
David A. Velasco
001801a39b Upload operations end in conflict if overriding a version different than the last known 2015-09-28 11:21:33 +02:00
Andy Scherzinger
796b1bd297 Add ownCloud color to notifications (only works on lollipop and up) for progress bar and icon background 2015-09-27 21:40:52 +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
126d251375 fixed bug: behaviour is now obeyed for files that are uploaded after connection switch (no wlan to wlan) 2015-09-25 17:22:40 +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
7d7767aa11 Removed some logs 2015-09-25 15:13:57 +02:00
David A. Velasco
44023a6059 Clean-up: removed unused imports and methods, and commented code 2015-09-25 15:13:56 +02:00
David A. Velasco
499d628aa1 Removed separated 'download folder' in contextual menu and unused DownloadFolderOperation class 2015-09-25 15:13:54 +02:00
David A. Velasco
1e59a632bc Fixed permanent 'uploading' icon on files that are automatically renamed during the upload 2015-09-25 15:13:53 +02:00
David A. Velasco
b8a3dc71e4 Safe blanket to clean DB if wrong conflicts keep stored 2015-09-25 15:13:51 +02:00
David A. Velasco
95bebe9382 Remove conflict badge from ancestors when conflict is solved there are no more conflicts below 2015-09-25 15:13:50 +02:00
David A. Velasco
7399508e05 Removed conflict badge when conflict is solved 2015-09-25 15:13:49 +02:00
David A. Velasco
a2aa0479fc Added conflict icon to folders containing files with conflicts 2015-09-25 15:13:47 +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
5f41bb14d3 ETag used to detect changes in remote files (not only in folders) 2015-09-25 15:13:44 +02:00
David A. Velasco
c0c52fa16a Fixed NullPointerExceptionS in upload cancelations 2015-09-25 15:13:43 +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
68b52ddc5f Rewritten queue of FileUploader based on IndexedForest 2015-09-25 15:13:40 +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
0162d2f9c9 Keep the old operation to sync folder as DownloadFolderOperation to allow its use while the new SyncFolderOperation gets stable 2015-09-25 15:13:37 +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
masensio
9948180550 Merge pull request #1174 from owncloud/release_bug_fixes 
Fixed a couple of tiny bugs
 2015-09-24 17:33:22 +02:00
David A. Velasco
0c8dfb6e8d Close dangling Cursors in FileContentProvider 2015-09-24 17:06:54 +02:00
David A. Velasco
c7a29bc07b Set default static values to prevent weird crash 2015-09-24 17:06:39 +02:00
David A. Velasco
c8c3e84268 Fix repetition of already finished access to root folder (AsyncTask) on rotation, in log-in view 2015-09-24 16:13:58 +02:00
Andy Scherzinger
de13ecc4e3 Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons 2015-09-24 09:46:58 +02:00
David A. Velasco
b7bb1ec0e9 Fixed crashed on cancelled download in gallery 2015-09-22 09:29:33 +02:00
David A. Velasco
cd165b7ce6 Grant that cancellations of tasks generating thumbnails really works for reused icon views 2015-09-21 21:25:11 +02:00
tobiasKaminsky
a0b061a058 java 1.5 does not support switch with strings :/ 2015-09-21 09:57:00 +02:00
tobiasKaminsky
2b6a61ddae #819 part3: When uploading from filesystem inside the owncloud app, show question 2015-09-21 09:45:20 +02:00
tobiasKaminsky
4b8a5a9c92 #819, part 2: Instant uploads, depends on setting 2015-09-19 14:33:29 +02:00
tobiasKaminsky
69bbb5c8cb #819: sending files to owncloud from another app: only upload, no copy 2015-09-18 17:47:23 +02:00
Andy Scherzinger
044c597e2b fix for refresh bug 2015-09-16 17:21:53 +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
3ff4d6df0f adapting web's way of choosing icons 2015-09-15 18:02:34 +02: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
Andy Scherzinger
b1aff42715 further cleanup, moving folder icon determination into util class 2015-09-11 11:15:55 +02:00
Andy Scherzinger
ed094a7df6 Add further javadoc descsribing how to maintain further mappings in the future 2015-09-11 10:57:11 +02:00
Andy Scherzinger
1a26995be2 remove commented out test code 2015-09-10 18:20:26 +02:00
Andy Scherzinger
97fc896fd4 added mapping for bin to be iconized with "application" 2015-09-10 18:16:35 +02:00
Andy Scherzinger
fa12c619b0 rewrite for icon determination with refactoring into its own class + fixed a typo 2015-09-10 17:55:26 +02:00
Andy Scherzinger
8c19d0fa50 shortened this prediction, since it will always be image... 2015-09-10 17:54:05 +02: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
David A. Velasco
3f40da0ac9 Fixed text preview filter to take into account local knowledge about MIME types 2015-09-07 09:14:00 +02:00
David A. Velasco
68ce6e62bf Reverse filter for preview of text files: all text/ but those in black list 2015-09-04 15:01:25 +02: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
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
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
6b84d83b35 Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop 2015-09-02 13:29:14 +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
David A. Velasco
f626b13634 Merge pull request #1114 from owncloud/tryFix1113 
Removed squared background for transparencies from file type icons and thumbnails (stays for images in gallery view)
 2015-09-02 11:00:30 +02: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
313df93e95 Set background color as background for png with tranparency 2015-08-31 16:40:04 +02:00
Joas Schilling
03492691fc Strip away index.php/apps/files to allow copy pasting from the server 2015-08-28 20:21:53 +02:00
masensio
ca2892bdf1 Remove transparent background in icons 2015-08-28 18:50:43 +02:00
tobiasKaminsky
d1c18cac12 removed commented code 2015-08-25 15:57:10 +02:00
tobiasKaminsky
54a4263eeb fix #1110: accents not sorted 2015-08-25 15:55:45 +02: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
tobiasKaminsky
69e78694cd to be sure ;) 2015-08-25 14:43:36 +02:00
tobiasKaminsky
6df6548ee7 try fix #1113 2015-08-25 14:40:16 +02:00
masensio
8c9270e114 Merge pull request #1082 from owncloud/ignoreHiddenFiles 
ignore hidden files also if they are images for counting
 2015-08-24 13:06:36 +02:00
masensio
e836fd66e4 Merge pull request #1078 from gstraube/develop 
Check if ETag for remote folder is null, i.e. it was not received from the server
 2015-08-24 12:59:43 +02:00
tobiasKaminsky
84f9169e7a Thumbnails add checkerboard to png 2015-08-22 07:49:35 +02: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
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
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
8db8b07be0 NullCheck for drawer 2015-08-20 12:47:31 +02:00
Andy Scherzinger
6219397371 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-20 11:39:25 +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
d83ca06e51 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-19 19:18:00 +02:00
Andy Scherzinger
2ce3e2707a NPE Fix for setting the color on the IndeterminateProgressDialog 2015-08-19 19:17:09 +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
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
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
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
Andy Scherzinger
e79f92f566 Conflict Dialog Fix 2015-08-18 13:57:09 +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
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
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
172767d391 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-14 19:34:08 +02:00
Andy Scherzinger
66bae3914c read cover art for audio file (works for mp3) and displays it in the media player, sets the default logo (as before) in case it couldn't read and convert a cover art. 2015-08-14 19:33:23 +02: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
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
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
tobiasKaminsky
be5dbcbb2e fixed bug caused by rotating the device 2015-08-13 20:11:58 +02:00
Andy Scherzinger
414f43f326 fixed arrow coloring on the pull to refresh on the file list 2015-08-13 19:28:44 +02:00
Andy Scherzinger
1c7de5c7a5 coloring the progress wheel 2015-08-13 19:16:11 +02:00
Andy Scherzinger
455b349c08 moved everything to AppCompatActivity since ActionBarActivity is deprecated 2015-08-13 18:46:19 +02:00
Andy Scherzinger
bbd529289c Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-13 17:58:58 +02:00
Andy Scherzinger
bac0fa5f28 move from deprecated ActionBarActivity to AppCompatActivity 2015-08-13 17:54:33 +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
Andy Scherzinger
05ca0270a8 fixed button style blue/grey 2015-08-12 18:54:27 +02:00
masensio
eda6f71491 Move create folder button to action bar in Uploader 2015-08-11 11:14:26 +02:00
Andy Scherzinger
456647c996 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-10 11:19:23 +02:00
David A. Velasco
64ebb2c1d3 Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view 2015-08-10 11:12:43 +02:00
Andy Scherzinger
0d75348b30 use custom checkbox images (material design) while toggling 2015-08-07 18:20:51 +02: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
David A. Velasco
6a8034ec24 Added username to SAML credentials 2015-08-06 10:23:29 +02:00
purigarcia
91000ba405 change the subject 2015-08-06 10:23:27 +02:00
masensio
d1257b34c0 Fix problems in PreviewTextFragment related with changes in develop 2015-08-05 17:18:17 +02: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
f289998946 removed unused listener (would only be useful in case of using toolbar instead of actionbar) 2015-08-05 13:01:37 +02:00
Andy Scherzinger
3956a50855 fixed deprecated getDrawable call 2015-08-05 12:58:40 +02:00
Andy Scherzinger
7c9c4a4ca6 remove two-times init of the drawer 2015-08-05 12:54:31 +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
3512eae861 Fixed double request for ConflictsResolveActivity 2015-08-04 16:47:46 +02:00
tobiasKaminsky
e1ab4a41aa download file if "use server version" 2015-08-04 12:39:59 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
Andy Scherzinger
a51fcd31a7 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-03 21:39:27 +02: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
8b23c3a7a6 ignore hidden files also if they are images for counting 2015-08-02 08:19:28 +02:00
AndyScherzinger
5b6bde5efc now works for initial opening and browsing down once 2015-07-31 17:22:19 +02:00
gstraube
aec910ff83 Check if ETag for remote folder is null, i.e. it was not received from the server 2015-07-28 22:05:54 +02:00
purigarcia
65fe0be763 merge develop 2015-07-28 10:47:08 +02:00
purigarcia
f068a156c5 merge develop 2015-07-28 10:46:13 +02: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
4b9190baea npe fix for file upload on instance saving since actionbar in list mode doesn't habe a title 2015-07-27 00:25:34 +02:00
AndyScherzinger
77c5ce77b2 removed unused lagacy code 2015-07-26 19:40:53 +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
53bbdfb0e8 in case of open drawer close it onBackPressed 2015-07-26 02:25:25 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02: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
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
David A. Velasco
ff82b51e49 Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList 
ShareWithMe icon in file list
 2015-07-20 12:27:52 +02:00
purigarcia
f7211fe486 remove empty line 2015-07-20 12:20:15 +02:00
purigarcia
5cc79b0919 modify for the review 2015-07-20 12:18:44 +02:00
purigarcia
c7817b9302 modify code to be simpler 2015-07-20 10:57:53 +02:00
masaaki matsuo
a601a0e06e Dispaly thumbnail when file is image 2015-07-17 01:03:49 +09:00
tobiasKaminsky
29156ff73b add checker pattern for FileList 2015-07-11 09:31:35 +02:00
tobiasKaminsky
0527754c50 add checker background pattern for all png images. 2015-07-11 09:18:26 +02:00
purigarcia
6b82b98abf remove a space 2015-07-10 08:49:35 +02:00
purigarcia
066324f60a save the state before rotate 2015-07-09 16:40:29 +02:00
purigarcia
a09e473555 Remove code that should not be in this pr 2015-07-09 09:35:28 +02:00
purigarcia
569625c677 encode the path 2015-07-09 09:30:30 +02:00
purigarcia
a2ac8c19a3 shareByLink in folder in gridview is shown is shown 2015-07-08 18:18:51 +02:00
purigarcia
451513a35d in gridview in the folder, icons are not shown 2015-07-08 18:14:38 +02:00
purigarcia
0e95ee3e67 shareWithMe is shown in the file list 2015-07-08 17:41:41 +02:00
purigarcia
31768aabce update the menu in the preview of the video 2015-07-08 16:54:39 +02:00
purigarcia
c1d4106c71 refresh menu in the preview of an image 2015-07-08 14:40:07 +02:00
purigarcia
782713b391 add action finished in FileActivity 2015-07-08 13:33:14 +02:00
purigarcia
38186052e7 remove a log 2015-07-08 11:15:22 +02:00