mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
4361 commits 223 branches 1586 tags 638 MiB
Commit graph

4361 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bartosz Przybylski
35c0d318c2 Force ant and android studio to use Java7 2015-12-22 11:40:07 +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
Maria Asensio
896e4859c0 Merge pull request #1168 from owncloud/avoidDuplicateFiles 
Avoid duplicate files
 2015-12-09 09:27:54 +01:00
Jenkins for ownCloud
2f7690879a [tx-robot] updated from transifex 2015-12-08 01:13:37 -05:00
Carla Schroder
09ee01c787 Merge branch 'master' of https://github.com/owncloud/android 2015-12-07 16:48:55 -08:00
Carla Schroder
1fea82efde update submodule & integrate new theme changes 2015-12-07 16:48:21 -08:00
Jenkins for ownCloud
d696f10e06 [tx-robot] updated from transifex 2015-12-07 01:13:29 -05:00
Jenkins for ownCloud
106a2324e1 [tx-robot] updated from transifex 2015-12-06 01:13:29 -05:00
Jenkins for ownCloud
2e9c4ed217 [tx-robot] updated from transifex 2015-12-05 01:13:42 -05:00
Carla Schroder
4349ad325e Merge pull request #1329 from owncloud/confpy 
update version number in conf.py
 2015-12-04 14:40:54 -08:00
Carla Schroder
2d8b063595 update version number in conf.py 2015-12-04 14:37:20 -08:00
Carla Schroder
1918516b5b Merge pull request #1328 from owncloud/19droid 
update for 1.9 release w expanded sharing
 2015-12-04 14:31:00 -08:00
Carla Schroder
df56333624 update for 1.9 release w expanded sharing 2015-12-04 14:27:19 -08:00
Jenkins for ownCloud
d44f2a3a10 [tx-robot] updated from transifex 2015-12-04 01:13:39 -05:00
masensio
59442c80ea Update string 2015-12-03 12:58:22 +01:00
masensio
d0b5d397c4 Merge branch 'stable' 2015-12-03 12:50:01 +01:00
masensio
210298befa Update library reference 2015-12-03 12:47:55 +01:00
masensio
0794871f88 Merge branch 'release-1.9' into stable 2015-12-03 09:25:06 +01:00
masensio
4bd4cd24b4 Update library reference, oc-android-library-0.9.9 2015-12-03 09:24:01 +01:00
Jenkins for ownCloud
db2256765d [tx-robot] updated from transifex 2015-12-03 01:13:40 -05:00
Bartosz Przybylski
149289b5dc Force ant and android studio to use Java7 2015-12-02 21:18:58 +01:00
tobiasKaminsky
9e678fc697 changed according to latest comments 2015-12-02 19:55:41 +01:00
Jenkins for ownCloud
872e32475b [tx-robot] updated from transifex 2015-12-02 01:13:53 -05:00
tobiasKaminsky
04fc2e3cc2 changed according to latest discussion 2015-12-01 22:00:53 +01:00