Commit graph

3935 commits

Author SHA1 Message Date
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
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
masensio
419dbeabec Merge pull request #1052 from owncloud/change_subject_when_sharing_in_saml
change the subject when sharing in saml
2015-08-06 11:00:59 +02:00
masensio
1ae203760e Update library reference with fix for saml username 2015-08-06 10:53:35 +02:00
masensio
0110601cb2 Update library reference 2015-08-06 10:44:55 +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
Jenkins for ownCloud
e0594d4005 [tx-robot] updated from transifex 2015-08-06 01:14:11 -04:00
masensio
fafc422ca4 Fix Java version to 1.7 2015-08-05 17:40:20 +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
270fea6a33 fix for the grid footer 2015-08-05 15:21:05 +02:00
Andy Scherzinger
b276b623a9 added bottom padding to logo, logo slightly bigger 2015-08-05 14:48:04 +02:00
Andy Scherzinger
5ded9e818b aligned account name with menu items 2015-08-05 14:07:00 +02:00
Andy Scherzinger
c2418d24d5 added missing progressbar 2015-08-05 13:43:23 +02:00
Andy Scherzinger
97b9932d81 changed color for hint text on login screens to 777 2015-08-05 13:36: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
masensio
9a0361945c Merge pull request #1068 from owncloud/conflictDialog_newWording
Conflict dialog: new wording
2015-08-05 12:53:03 +02:00
Andy Scherzinger
b5f8c0b087 changed alignment of drawer's content according to jan's suggestions 2015-08-04 19:02:36 +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
156cb5e81b Updated conflict message (same as in web app) 2015-08-04 17:29:42 +02:00
Andy Scherzinger
f7f468b578 extracted color values for download fragment, see comments 172c3f56a3 2015-08-04 17:06:27 +02:00
Andy Scherzinger
a329d49ddf Fix for color reference in portrait 8f401a38d8 (comments) 2015-08-04 16:49:20 +02:00
David A. Velasco
3512eae861 Fixed double request for ConflictsResolveActivity 2015-08-04 16:47:46 +02:00
Andy Scherzinger
2636e07289 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-04 16:42:17 +02:00
Andy Scherzinger
10c5498879 extracted text colors for account setup to color.xml, see e72caebbce comments 2015-08-04 16:41:53 +02:00
Andy Scherzinger
f9a370e7e6 extracted text colors for account setup to color.xml, see e72caebbce comments 2015-08-04 16:04:28 +02:00
Andy Scherzinger
3e87ca193d Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
Conflicts:
	build.gradle
2015-08-04 12:49:28 +02:00
tobiasKaminsky
e1ab4a41aa download file if "use server version" 2015-08-04 12:39:59 +02:00
tobiasKaminsky
d2df3f9b33 re-added values-tzl 2015-08-04 12:39:58 +02:00
tobiasKaminsky
c907f6a742 Partially revert 50819ce 2015-08-04 12:39:57 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
David A. Velasco
6698b2d5f1 Merge pull request #1086 from owncloud/update_buildTools_to_22_0_1
Update buildTools version to 22.0.1
2015-08-04 12:36:24 +02:00
David A. Velasco
2470ee9af2 Updated reference to library 2015-08-04 12:28:57 +02:00
Andy Scherzinger
3c78d4fcfb Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 2015-08-04 11:47:44 +02:00
masensio
9d815b0187 Update buildTools version to 22.0.1 2015-08-04 11:14:51 +02:00
David A. Velasco
04f70fa8c9 Merge pull request #1083 from owncloud/update_jackrabbit_library
Update JackRabbit library
2015-08-04 10:38:15 +02:00
Jenkins for ownCloud
74d5911e56 [tx-robot] updated from transifex 2015-08-04 01:14:04 -04: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
masensio
d77f1d7ec0 Update build.gradle to 1.2.3 2015-08-03 15:07:20 +02:00
tobiasKaminsky
8b23c3a7a6 ignore hidden files also if they are images for counting 2015-08-02 08:19:28 +02:00