Commit graph

1749 commits

Author SHA1 Message Date
tobiasKaminsky
5b7f44e0f7 renamed security category to details for further use
moved position
2016-02-02 17:45:01 +01:00
David A. Velasco
9761b34c76 Merge pull request #1439 from owncloud/wording-fixes
Wording fixes, simplify some strings and fix capitalization
2016-02-02 17:33:25 +01:00
Jenkins for ownCloud
9c18126bf0 [tx-robot] updated from transifex 2016-02-02 01:13:41 -05:00
Jenkins for ownCloud
3951b2db95 [tx-robot] updated from transifex 2016-02-01 01:13:31 -05:00
Jenkins for ownCloud
73d327a407 [tx-robot] updated from transifex 2016-01-31 01:13:30 -05:00
Jenkins for ownCloud
52d043be21 [tx-robot] updated from transifex 2016-01-30 01:13:40 -05:00
Jenkins for ownCloud
2795750c55 [tx-robot] updated from transifex 2016-01-29 01:13:33 -05:00
Jenkins for ownCloud
8bf14931b0 [tx-robot] updated from transifex 2016-01-28 01:13:39 -05:00
Maria Asensio
2e074864a2 Merge pull request #1451 from owncloud/share__edit_privileges
Share  edit privileges
2016-01-27 11:28:16 +01:00
Jenkins for ownCloud
f1fcab8e18 [tx-robot] updated from transifex 2016-01-24 01:13:30 -05:00
Jenkins for ownCloud
2818c41641 [tx-robot] updated from transifex 2016-01-23 01:13:36 -05:00
Jenkins for ownCloud
6a72d01d0e [tx-robot] updated from transifex 2016-01-22 01:13:32 -05:00
Jenkins for ownCloud
e909f8b625 [tx-robot] updated from transifex 2016-01-21 01:13:38 -05:00
David A. Velasco
628e713268 Update model changed: permission updates are requested to the server as soon as the user changes any value 2016-01-20 18:18:14 +01:00
David A. Velasco
0d4c9b9961 Show error message from server when update of permissions fail 2016-01-20 12:22:24 +01:00
Jenkins for ownCloud
e3d882b386 [tx-robot] updated from transifex 2016-01-20 01:13:33 -05:00
Jenkins for ownCloud
9c59c5fb4c [tx-robot] updated from transifex 2016-01-19 01:13:40 -05:00
Jan-Christoph Borchardt
61a1d97abc wording fixes, simplify some strings and fix capitalization 2016-01-18 15:10:50 +01:00
Jenkins for ownCloud
98229db831 [tx-robot] updated from transifex 2016-01-18 01:13:31 -05:00
Jenkins for ownCloud
a5aa573594 [tx-robot] updated from transifex 2016-01-17 01:13:33 -05:00
Jenkins for ownCloud
81494e6246 [tx-robot] updated from transifex 2016-01-15 01:13:37 -05:00
Jenkins for ownCloud
13f8ed9d39 [tx-robot] updated from transifex 2016-01-14 01:13:41 -05:00
David A. Velasco
81b8918939 Fixed color of 'stop sharing' button in Android 4.x 2016-01-13 14:23:50 +01:00
David A. Velasco
e4078a5734 Added scroll to permissions editor to grant usability in landscape 2016-01-13 13:43:07 +01:00
Jenkins for ownCloud
6165134f60 [tx-robot] updated from transifex 2016-01-13 01:13:43 -05:00
David A. Velasco
e7901656a1 Polish UI to edit permissions 2016-01-11 15:34:41 +01:00
David A. Velasco
d826451e2d Added buttons to unshare (working) and finish (not working) in EditShareFragment layout 2016-01-11 12:17:11 +01:00
David A. Velasco
5fcb70beee Added fragment to edit share permissions with basic layout 2016-01-11 12:17:08 +01:00
Jenkins for ownCloud
d8dca7243d [tx-robot] updated from transifex 2016-01-11 01:13:42 -05:00
Jenkins for ownCloud
233a881765 [tx-robot] updated from transifex 2016-01-10 01:13:46 -05:00
Jenkins for ownCloud
c371aa5b00 [tx-robot] updated from transifex 2016-01-09 01:13:44 -05:00
Maria Asensio
ab7b3c09c3 Merge pull request #1099 from owncloud/switchListVsGrid
Switch list vs grid
2016-01-08 10:18:00 +01:00
Jenkins for ownCloud
f97d57283b [tx-robot] updated from transifex 2016-01-08 01:13:42 -05:00
Jenkins for ownCloud
73b58324a8 [tx-robot] updated from transifex 2016-01-07 01:13:44 -05:00
Jenkins for ownCloud
804be08c1b [tx-robot] updated from transifex 2016-01-06 01:13:42 -05:00
David A. Velasco
d26da3cbc2 Recovered changes lost in complex rebase 2016-01-05 12:12:18 +01:00
tobiasKaminsky
d7e9ef92b8 fixed according to review 2016-01-05 11:50:00 +01:00
tobiasKaminsky
2586298380 moved switch menu item to three dots menu 2016-01-05 11:21:37 +01:00
tobiasKaminsky
6bd7065c73 wip 2016-01-05 11:16:00 +01:00
Jenkins for ownCloud
1fbcd81bd4 [tx-robot] updated from transifex 2016-01-05 01:13:48 -05:00
Jenkins for ownCloud
bc9a890b6f [tx-robot] updated from transifex 2016-01-04 01:13:42 -05:00
Jenkins for ownCloud
d75f615031 [tx-robot] updated from transifex 2016-01-01 01:13:43 -05:00
Andy Scherzinger
a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts (resolved):
	res/layout/drawer.xml
	res/values/colors.xml
	res/values/setup.xml
2015-12-28 20:03:25 +01:00
Maria Asensio
9954f71408 Merge pull request #1351 from owncloud/Update_of_brandable_colors
Added colors for header of navigation drawer and login button to the …
2015-12-28 14:17:05 +01:00
Jenkins for ownCloud
ca03f14752 [tx-robot] updated from transifex 2015-12-28 01:13:40 -05:00
Jenkins for ownCloud
f137759e6b [tx-robot] updated from transifex 2015-12-25 01:13:46 -05:00
Jenkins for ownCloud
30a4201b33 [tx-robot] updated from transifex 2015-12-23 01:45:19 -05:00
David A. Velasco
bd1f6452ac Make button colours easy to brand 2015-12-22 17:22:24 +01:00
Jenkins for ownCloud
3182a9e00f [tx-robot] updated from transifex 2015-12-19 01:13:41 -05:00
David A. Velasco
dee7c33235 Added style to buttons in share_file_layout and centered refresh button in account_setup 2015-12-17 16:58:47 +01:00