Commit graph

3806 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
3c2da890ce Merge branch 'master' into reliable_uploads 2015-08-21 13:09:54 +02:00
Jenkins for ownCloud
632f3d23e0 [tx-robot] updated from transifex 2015-08-21 01:13:44 -04: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
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
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
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
Jenkins for ownCloud
ba4b258697 [tx-robot] updated from transifex 2015-08-17 01:13:37 -04:00
Jenkins for ownCloud
d09baff068 [tx-robot] updated from transifex 2015-08-15 01:13:39 -04: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
Jenkins for ownCloud
a244bdf1ca [tx-robot] updated from transifex 2015-08-13 01:13:38 -04:00
Andy Scherzinger
c4d8c423b0 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-12 18:49:33 +02:00
Andy Scherzinger
5257af90bc fixed username to be single line and ellipsized in case of lang names 2015-08-12 18:48:33 +02:00
Jenkins for ownCloud
c4b639e964 [tx-robot] updated from transifex 2015-08-12 01:13:37 -04:00
Andy Scherzinger
066190f977 Update SETUP.md
updated documentation due to move to android-22 for actual AppCompat lib and ownCloud app compile Target
2015-08-11 15:40:27 +02:00
Jenkins for ownCloud
c19bb85a24 [tx-robot] updated from transifex 2015-08-11 01:13:39 -04:00
Andy Scherzinger
dde5e5575c Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-10 13:02:16 +02:00
Andy Scherzinger
275028a5e3 Merge branch 'master' of https://github.com/owncloud/android into material_toolbar 2015-08-10 13:01:40 +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
Jenkins for ownCloud
2b79f3292f [tx-robot] updated from transifex 2015-08-10 01:13:35 -04:00
Jenkins for ownCloud
2206585f52 [tx-robot] updated from transifex 2015-08-09 01:13:36 -04:00
Jenkins for ownCloud
5258172ffd [tx-robot] updated from transifex 2015-08-08 01:13:38 -04:00
Andy Scherzinger
4a4296a07e Material Buttons (draft) 2015-08-07 17:09:47 +02:00
Jenkins for ownCloud
8d4d1bfffb [tx-robot] updated from transifex 2015-08-07 04:57:36 -04:00
Jenkins for ownCloud
80c112ad1a [tx-robot] updated from transifex 2015-08-07 04:44:18 -04:00
David A. Velasco
537e075fca Merge branch 'develop'
Conflicts FIXED:
	owncloud-android-library
2015-08-07 10:17:03 +02:00
David A. Velasco
00482b6dcb Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs
Updated documents and .gitmodules with new policy: PRs should go to m…
2015-08-07 10:10:57 +02:00
David A. Velasco
3141659306 Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop 2015-08-07 09:15:14 +02:00
Jenkins for ownCloud
e935e9239d [tx-robot] updated from transifex 2015-08-07 01:13:50 -04: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