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
..
account_setup.xml	Fixed style in log-in activity; should be Light, as before	2015-05-29 13:30:02 +02:00
action_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
activity_row.xml	Update year in license	2015-03-05 13:27:45 +01:00
drawer.xml	Disable 'Accounts' in Navigation Drawer	2015-05-29 11:32:36 +02:00
drawer_account_group.xml	update	2015-01-05 19:53:40 +01:00
drawer_list_item.xml	Add content_description to Navigation Drawer options	2015-05-26 11:46:15 +02:00
drawer_radiobutton.xml	Add license in some files	2015-05-28 11:30:02 +02:00
edit_box_dialog.xml	Update year in license	2015-03-05 13:27:45 +01:00
errorhandling_showerror.xml	added first draft of uploadListActivity	2014-11-07 15:26:21 +01:00
file_details_empty.xml	add id and contentdescription to a layout	2015-03-25 18:54:10 +01:00
file_details_fragment.xml	change the name of the method from keepInSync to favorite. Other changes commented in the review	2015-07-22 18:13:45 +02:00
file_download_fragment.xml	Update year in license	2015-03-05 13:27:45 +01:00
file_preview.xml	Update year in license	2015-03-05 13:27:45 +01:00
files.xml	Merge branch 'develop' into navigationDrawer_basic	2015-06-15 13:43:17 +02:00
files_folder_picker.xml	Update year in license	2015-03-05 13:27:45 +01:00
generic_explanation.xml	Update year in license	2015-03-05 13:27:45 +01:00
grid_image.xml	Update year in license	2015-03-05 13:27:45 +01:00
grid_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
list_footer.xml	- minor design changes	2014-10-19 08:56:57 +02:00
list_fragment.xml	Update year in license	2015-03-05 13:27:45 +01:00
list_fragment_expandable.xml	add ExpandableListFragment which is inherits from ExtendedListFragment	2014-11-27 11:56:24 +01:00
list_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
listrow_details.xml	Add license in some files	2015-05-28 11:30:02 +02:00
listrow_group.xml	Add license in some files	2015-05-28 11:30:02 +02:00
loading_dialog.xml	Update year in license	2015-03-05 13:27:45 +01:00
log_item.xml	Update year in license	2015-03-05 13:27:45 +01:00
log_send_file.xml	Update year in license	2015-03-05 13:27:45 +01:00
media_control.xml	Update year in license	2015-03-05 13:27:45 +01:00
notification_with_progress_bar.xml	Update year in license	2015-03-05 13:27:45 +01:00
passcodelock.xml	Prevent that input fields are maximized in landscape	2015-05-05 12:27:57 +02:00
password_dialog.xml	Create layout for password	2015-03-05 17:02:40 +01:00
popup.xml	Update year in license	2015-03-05 13:27:45 +01:00
preference_widget_radiobutton.xml	- Account list is now a radiobutton list	2014-11-25 17:42:41 +01:00
preview_image_activity.xml	Add NavigationDrawer to image preview	2015-05-28 11:07:14 +02:00
preview_image_fragment.xml	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
ssl_untrusted_cert_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00
ssl_validator_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00
sso_dialog.xml	Update year in license	2015-03-05 13:27:45 +01:00
upload_files_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00
upload_list_group.xml	tried to add clear button for upload groups. would be too much.	2014-12-12 12:01:04 +01:00
upload_list_item.xml	added progressbar for current item in upload list	2014-12-15 08:46:04 +01:00
upload_list_layout.xml	use settings layout for upload list (remove group header background, add underline, remove group icons)	2014-12-10 13:44:20 +01:00
uploader_layout.xml	Fix: Import file from other app shows all folders as TextView	2015-06-22 12:58:41 +02:00
uploader_list_item_layout.xml	Fix: Import file from other app shows all folders as TextView	2015-06-22 12:58:41 +02:00
video_layout.xml	Update year in license	2015-03-05 13:27:45 +01:00