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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Jenkins for ownCloud
|
db2256765d
|
[tx-robot] updated from transifex
|
2015-12-03 01:13:40 -05: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 |
|
Jenkins for ownCloud
|
eb5a24d25c
|
[tx-robot] updated from transifex
|
2015-12-01 01:13:42 -05:00 |
|
Jenkins for ownCloud
|
6f04c58f59
|
[tx-robot] updated from transifex
|
2015-11-30 01:13:52 -05:00 |
|
Jenkins for ownCloud
|
82fd5e47e2
|
[tx-robot] updated from transifex
|
2015-11-29 01:13:42 -05:00 |
|
Jenkins for ownCloud
|
248aaf4bf0
|
[tx-robot] updated from transifex
|
2015-11-28 01:13:42 -05:00 |
|
Jenkins for ownCloud
|
c173743870
|
[tx-robot] updated from transifex
|
2015-11-27 01:13:44 -05:00 |
|
Jenkins for ownCloud
|
70f59f6ad9
|
[tx-robot] updated from transifex
|
2015-11-26 01:13:44 -05:00 |
|
David A. Velasco
|
f5369ac4b2
|
Hide UI elements about public share when this is disabled in the server
|
2015-11-25 09:32:31 +01:00 |
|
masensio
|
3087a3af3e
|
Review padding values for expiration date and password rows in share view
|
2015-11-25 09:32:28 +01:00 |
|
masensio
|
030eaffcfc
|
List view is shown completelly on the ShareFileFragment
|
2015-11-25 09:32:27 +01:00 |
|
masensio
|
e08513a762
|
Delete any rest of old public share/unshare flow
|
2015-11-25 09:32:26 +01:00 |
|
David A. Velasco
|
729a9b7c77
|
Set or clear password to protect public link in ShareFileFragment
|
2015-11-25 09:32:19 +01:00 |
|
David A. Velasco
|
f1b3208f1a
|
Updated ShareFileFragment layout with extra section for public shares
|
2015-11-25 09:32:15 +01:00 |
|
David A. Velasco
|
a39c857680
|
Removed unneeded FrameLayout
|
2015-11-25 09:32:14 +01:00 |
|
Jenkins for ownCloud
|
d60023867c
|
[tx-robot] updated from transifex
|
2015-11-25 01:13:40 -05:00 |
|
Jenkins for ownCloud
|
83e2bd588d
|
[tx-robot] updated from transifex
|
2015-11-24 01:13:40 -05:00 |
|
Jenkins for ownCloud
|
d244d558e3
|
[tx-robot] updated from transifex
|
2015-11-23 01:13:32 -05:00 |
|
Andy Scherzinger
|
ecdb95fa0c
|
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
|
2015-11-22 17:10:37 +01:00 |
|
Jenkins for ownCloud
|
bbfa65cba6
|
[tx-robot] updated from transifex
|
2015-11-22 01:13:39 -05:00 |
|
tobiasKaminsky
|
2aac1e5270
|
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
|
2015-11-21 08:48:40 +01:00 |
|
Jenkins for ownCloud
|
f8f99af255
|
[tx-robot] updated from transifex
|
2015-11-21 01:13:37 -05:00 |
|