Commit graph

1186 commits

Author SHA1 Message Date
masensio
01483a38bf Merge remote-tracking branch 'origin/develop' into share_password_support 2015-03-10 14:27:35 +01:00
Jenkins for ownCloud
5f3175229a [tx-robot] updated from transifex 2015-03-10 01:13:47 -04:00
masensio
03b5cb9dd6 When no enter a password, message should be 'You must enter a password' 2015-03-09 11:38:36 +01:00
purigarcia
151c70c443 Merge branch 'develop' into share_password_support 2015-03-09 09:21:38 +01:00
Jenkins for ownCloud
eac3e1ddf1 [tx-robot] updated from transifex 2015-03-09 01:13:33 -04:00
Jenkins for ownCloud
c404060351 [tx-robot] updated from transifex 2015-03-08 01:13:33 -05:00
masensio
82fa95fe43 Merge branch 'develop' into share_password_support 2015-03-06 10:19:06 +01:00
David A. Velasco
eafaf80dd4 Merge pull request #912 from owncloud/review_license
Reviewed license text in source files.
2015-03-06 09:45:56 +01:00
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
690341af68 Create layout for password 2015-03-05 17:02:40 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
Jenkins for ownCloud
664ee08a3c [tx-robot] updated from transifex 2015-03-05 01:13:45 -05:00
Jenkins for ownCloud
a349906e77 [tx-robot] updated from transifex 2015-03-04 01:13:41 -05:00
Jenkins for ownCloud
3cab8a4986 [tx-robot] updated from transifex 2015-03-03 01:13:33 -05:00
Jenkins for ownCloud
3d66b4ccc0 [tx-robot] updated from transifex 2015-03-01 01:13:35 -05:00
Jenkins for ownCloud
0f3af9c0ef [tx-robot] updated from transifex 2015-02-28 01:13:44 -05:00
Jenkins for ownCloud
c1efe4304b [tx-robot] updated from transifex 2015-02-27 01:13:37 -05:00
Jenkins for ownCloud
62bbe70290 [tx-robot] updated from transifex 2015-02-26 01:13:46 -05:00
Jenkins for ownCloud
72bd1c17a5 [tx-robot] updated from transifex 2015-02-25 01:13:42 -05:00
masensio
759b5e3e72 Merge pull request #888 from owncloud/enable_cookies
Enable cookies
2015-02-24 14:05:54 +01:00
Jenkins for ownCloud
4c964b7dcb [tx-robot] updated from transifex 2015-02-24 01:13:38 -05:00
Jenkins for ownCloud
6a88d7a9f4 [tx-robot] updated from transifex 2015-02-22 01:13:32 -05:00
Jenkins for ownCloud
099b32fc42 [tx-robot] updated from transifex 2015-02-21 01:13:31 -05:00
Jenkins for ownCloud
fd8e590ea0 [tx-robot] updated from transifex 2015-02-20 01:13:38 -05:00
masensio
0a03b6d3d4 Merge branch 'develop' into enable_cookies
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
2015-02-19 13:02:53 +01:00
David A. Velasco
ec6b9d7c70 Merge branch 'master' into develop 2015-02-19 11:01:00 +01:00
Jenkins for ownCloud
ae1bd1b6a1 [tx-robot] updated from transifex 2015-02-18 01:13:36 -05:00
David A. Velasco
2cfed6eaa7 Recovered ExtendedListView; ExtendedListFragment updated to handle to possible layouts 2015-02-17 14:00:18 +01:00
Jenkins for ownCloud
7fa529d328 [tx-robot] updated from transifex 2015-02-17 01:13:43 -05:00
Jenkins for ownCloud
effee70675 [tx-robot] updated from transifex 2015-02-15 01:13:29 -05:00
Jenkins for ownCloud
5e1048b343 [tx-robot] updated from transifex 2015-02-14 01:13:32 -05:00
Jenkins for ownCloud
754c277fdd [tx-robot] updated from transifex 2015-02-13 01:13:30 -05:00
Jenkins for ownCloud
f149a9cf77 [tx-robot] updated from transifex 2015-02-12 01:13:31 -05:00
Jenkins for ownCloud
c4110d4be7 [tx-robot] updated from transifex 2015-02-11 01:13:30 -05:00
David A. Velasco
b5d70ad8e7 App updated to OwnCloudAccount with deferred load of credentials 2015-02-10 10:29:51 +01:00
Jenkins for ownCloud
6162271dff [tx-robot] updated from transifex 2015-02-10 01:13:32 -05:00
Jenkins for ownCloud
62c54ac2ad [tx-robot] updated from transifex 2015-02-09 01:13:30 -05:00
Jenkins for ownCloud
7d8cbde64f [tx-robot] updated from transifex 2015-02-08 01:13:31 -05:00
Jenkins for ownCloud
fa0b91d7fb [tx-robot] updated from transifex 2015-02-07 01:13:34 -05:00
Jenkins for ownCloud
b047882001 [tx-robot] updated from transifex 2015-02-06 01:13:31 -05:00
Jenkins for ownCloud
f8c91b0458 [tx-robot] updated from transifex 2015-02-05 01:13:34 -05:00
Jenkins for ownCloud
8bc75d54b4 [tx-robot] updated from transifex 2015-02-04 01:14:14 -05:00
David A. Velasco
936d8466c6 Updated with fixes in Spanish translation 2015-02-03 14:01:59 +01:00
David A. Velasco
1726a9352a Updated translations after new format string for subject in sharing e-mail 2015-02-03 13:37:22 +01:00
David A. Velasco
28e4b35595 Quotes updated in subject message for shared link, better format string 2015-02-03 13:17:14 +01:00
David A. Velasco
e4e50d44c4 Corrections from my own comments 2015-02-03 09:52:22 +01:00
David A. Velasco
4af15f7b4e Merge branch 'develop' into imageGrid 2015-02-02 13:48:30 +01:00
Jenkins for ownCloud
8bf624ff8f [tx-robot] updated from transifex 2015-02-01 01:13:30 -05:00
Jenkins for ownCloud
2210ce961a [tx-robot] updated from transifex 2015-01-31 01:13:34 -05:00