mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 16:54:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
3806 commits 221 branches 1589 tags 640 MiB
Commit graph

2142 commits

Author SHA1 Message Date
masensio
5fb74888c8 Disable some parts in code for testing actions in uploads view 2015-08-21 14:04:31 +02: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
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
8b55e8b35c prefixed variables with 'm' 2015-08-20 11:35:40 +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
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +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
Andy Scherzinger
a393531774 visual fix for Progress DialogFragment(s) 2015-08-18 13:08:58 +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
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
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
bac0fa5f28 move from deprecated ActionBarActivity to AppCompatActivity 2015-08-13 17:54:33 +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
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
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
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
AndyScherzinger
5b6bde5efc now works for initial opening and browsing down once 2015-07-31 17:22:19 +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