Commit graph

4282 commits

Author SHA1 Message Date
Jenkins for ownCloud
13f8ed9d39 [tx-robot] updated from transifex 2016-01-14 01:13:41 -05:00
Jenkins for ownCloud
6165134f60 [tx-robot] updated from transifex 2016-01-13 01:13:43 -05: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
David A. Velasco
ffbd118e8d Removed calls to ApplicationContext and minor refactoring 2016-01-05 12:03:02 +01:00
David A. Velasco
4ec4b66921 Fix update of text in menu after removal of static methods 2016-01-05 12:03:00 +01:00
tobiasKaminsky
337191ff1a minor code optimizations 2016-01-05 12:02:59 +01:00
tobiasKaminsky
45c82e4fed removed static functions (according to CR) 2016-01-05 12:02:57 +01:00
tobiasKaminsky
9bcef74f6d changes according to CR 2016-01-05 11:54:55 +01:00
tobiasKaminsky
cd04b0d389 do not show "switch" menu item on file details/preview text/video/audio 2016-01-05 11:50:03 +01:00
tobiasKaminsky
6920a7495e do not show "switch" menu item on file details/preview text/video/audio 2016-01-05 11:50:02 +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
db46b19824 decision grid vs. list view remembered per folder, inherited by parents 2016-01-05 11:20:08 +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
Maria Asensio
7c58039412 Merge pull request #1209 from owncloud/material_buttons
Material buttons - before in #1090
2015-12-29 12:31:39 +01: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
Andy Scherzinger
cc2ba716fb Merge branch 'material_buttons' of https://github.com/owncloud/android into material_buttons 2015-12-28 19:22:40 +01:00
Andy Scherzinger
dd8c65dcd9 fix for #1381 2015-12-28 19:21:05 +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
David A. Velasco
c6bebdc6b3 Merge pull request #1359 from owncloud/bug_1338
Fix use of delayUntil property to grant automatic synchronization is not triggered before 3h
2015-12-22 11:51:29 +01:00
David A. Velasco
e8d7651c0c Merge pull request #1377 from owncloud/revert-1321-updateToJava7
Revert "Force ant and android studio to use Java7"
2015-12-22 11:12:55 +01:00
David A. Velasco
0c48a4686d Revert "Force ant and android studio to use Java7" 2015-12-22 11:09:16 +01:00
Bartosz Przybylski
d3afbb2972 Merge pull request #1321 from owncloud/updateToJava7
Force ant and android studio to use Java7
2015-12-21 21:05:13 +01:00
Jenkins for ownCloud
3182a9e00f [tx-robot] updated from transifex 2015-12-19 01:13:41 -05:00
Bartosz Przybylski
3f61dc5a8a #1338: Correctly use delayUntil property of SyncResult 2015-12-18 15:55:05 +01: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
David A. Velasco
d5c4d7ab92 Changes from code review 2015-12-17 15:49:55 +01:00
Jenkins for ownCloud
669ebe083c [tx-robot] updated from transifex 2015-12-17 01:13:44 -05:00
David A. Velasco
147e6989c8 Added colors for header of navigation drawer and login button to the list of brandable colors 2015-12-14 12:50:52 +01:00
Jenkins for ownCloud
dadf31f522 [tx-robot] updated from transifex 2015-12-13 01:13:30 -05:00
Jenkins for ownCloud
27bc03b6de [tx-robot] updated from transifex 2015-12-12 01:13:40 -05:00
David A. Velasco
f35a349119 Merge pull request #1340 from owncloud/stable
Update Changelog for 1.9 version
2015-12-11 09:33:25 +01:00
masensio
9e5a49a6ac Update Changelog for 1.9 version 2015-12-11 09:24:54 +01:00
Jenkins for ownCloud
8855855a52 [tx-robot] updated from transifex 2015-12-11 01:13:40 -05:00
Jenkins for ownCloud
3e25c84863 [tx-robot] updated from transifex 2015-12-10 01:13:44 -05:00
Andy Scherzinger
71e87d98a8 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-12-09 15:14:22 +01:00