2234 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
jabarros	0ed5d39993	Update version number and name	2014-07-07 14:38:19 +02:00
jabarros	0bca42bcd8	Remove unused class FailedUploadActivity and related resources	2014-07-07 13:52:13 +02:00
jabarros	df8e9fa2c3	Merge pull request #541 from owncloud/fix_issue_540 ... Fix issue 540	2014-07-07 13:02:42 +02:00
jabarros	ed909e45f3	Remove duplicate ic_action_create_dir and ic_action_upload icons	2014-07-07 12:27:09 +02:00
Jenkins for ownCloud	90e8f0670b	[tx-robot] updated from transifex	2014-07-07 01:13:33 -04:00
Jenkins for ownCloud	8c68242a07	[tx-robot] updated from transifex	2014-07-05 01:13:32 -04:00
Jenkins for ownCloud	8b0640ccaf	[tx-robot] updated from transifex	2014-07-04 01:13:34 -04:00
Jenkins for ownCloud	21cd516854	[tx-robot] updated from transifex	2014-07-03 01:13:40 -04:00
rperezb	0238522c54	Merge pull request #551 from owncloud/add_cookie_based_session_support ... Added cookie based session support	2014-07-02 10:14:03 +02:00
Jenkins for ownCloud	8209626380	[tx-robot] updated from transifex	2014-07-02 01:13:37 -04:00
David A. Velasco	a41785ab9f	Updated library reference	2014-07-01 14:36:41 +02:00
David A. Velasco	dacc14a882	Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support	2014-07-01 14:21:26 +02:00
David A. Velasco	f773d58d86	Merge pull request #550 from owncloud/fixed_server_date_parsing ... Updated library reference to version with fixed parsing for dates from server	2014-07-01 11:05:46 +02:00
David A. Velasco	32ce26b353	Updated library reference	2014-07-01 11:00:53 +02:00
David A. Velasco	21071c6994	Merge pull request #549 from owncloud/see_files_shared_with_me ... New icons for files shared with me out of Shared/ folder, for new sharing policy in OC 7	2014-07-01 10:05:25 +02:00
David A. Velasco	fe4fc7a612	Fixed typos from 'shareWhatever' to 'sharedWhatever', and updated reference to library	2014-07-01 09:59:38 +02:00
jabarros	f5a4c6bc9f	Fixed bug. In the uploads view, folders and files are shown as shared	2014-07-01 09:59:37 +02:00
jabarros	5dcc9f8de4	Change order of showing 'shared link' and 'shared with me' icons when both visibles	2014-07-01 09:59:36 +02:00
jabarros	bb2830fd73	Fixed bug. Regular files are showing folder icon	2014-07-01 09:59:35 +02:00
David A. Velasco	947063c193	Fixed typo breaking upgrade of database version to add remote_id column	2014-07-01 09:59:34 +02:00
jabarros	440c703752	Increase db version number	2014-07-01 09:59:33 +02:00
jabarros	f73c44f785	Android-library reference	2014-07-01 09:59:32 +02:00
jabarros	be0990baac	Hide 'shared with me' icon when file does not have 'S' permission	2014-07-01 09:59:31 +02:00
jabarros	1e8337fbce	Update class FileListAdapter to show new icon for a file and folder that includes 'S' in the permission property. Changed list item layout for showing 'sharedlink' and 'shared with me' icons.	2014-07-01 09:59:30 +02:00
jabarros	fc579b9221	Replace old sharelink icon for new one. Add 'shared with me' new icons	2014-07-01 09:59:29 +02:00
jabarros	8a1e3f743e	Add column 'Remote_Id' to the local files db. Create upgrade for 'Permissions' and 'Remote_id' db changes.	2014-07-01 09:59:28 +02:00
jabarros	80f6250604	Update class OCFile to include value of permissions column into db as a field. Modify SyncronizeFolderOperation and FileStorageUtils for setting permissions value	2014-07-01 09:59:28 +02:00
jabarros	ba4386008a	Modify FileDataStorageManager for adding permission value to ContentValue	2014-07-01 09:59:27 +02:00
jabarros	0544e3a18d	Add column 'Permissions' to the local files db	2014-07-01 09:59:26 +02:00
Jenkins for ownCloud	2e6605be8b	[tx-robot] updated from transifex	2014-06-30 01:13:36 -04:00
Jenkins for ownCloud	984cc1e31b	[tx-robot] updated from transifex	2014-06-29 01:13:33 -04:00
Jenkins for ownCloud	a9ef6b0350	[tx-robot] updated from transifex	2014-06-28 01:13:35 -04:00
jabarros	85876a9e61	Merge pull request #547 from owncloud/fix_Android_SDK_license_agreement_in_Travis_build ... Agreed new Android SDK license for updated platform tools	2014-06-27 15:13:14 +02:00
David A. Velasco	c49a949951	Updated version of build-tools to 20 to satisfy new minimum requirement of platform-tools	2014-06-27 14:50:08 +02:00
David A. Velasco	c62c0e6c25	'set' is not enough, no matter the examples... using 'export'	2014-06-27 14:25:47 +02:00
David A. Velasco	8bdf932ee0	Added new Android licenses to accept through parameter in version 2 of android-sdk-installer	2014-06-27 14:15:04 +02:00
David A. Velasco	3b0cf59ea3	Added 'expect' to fix fulfill dependency on verion-2 of android-sdk-installer	2014-06-27 14:05:02 +02:00
David A. Velasco	330f930b20	Update version of android-skd-installer user	2014-06-27 12:31:54 +02:00
Jenkins for ownCloud	3128e5f504	[tx-robot] updated from transifex	2014-06-27 01:13:35 -04:00
David A. Velasco	1958964f56	Added lost string for previous commit	2014-06-26 11:33:51 +02:00
David A. Velasco	41705bd284	Updated ticker and title messages for notification of failed synchronization due to expired credentials	2014-06-26 11:21:30 +02:00
David A. Velasco	4f0dd59921	Fixed bug in update of SAML2 token after expiration	2014-06-26 10:26:05 +02:00
Jenkins for ownCloud	6ac17711c5	[tx-robot] updated from transifex	2014-06-26 01:13:35 -04:00
David A. Velasco	bbfef4ff45	Updated reference to library to fix problems in login view when fixing typos in URL path	2014-06-25 18:16:06 +02:00
David A. Velasco	78a2ba5868	Fixed redirection to login view from failed notifications when click on	2014-06-25 17:04:02 +02:00
Jenkins for ownCloud	00937b388d	[tx-robot] updated from transifex	2014-06-25 06:30:41 -04:00
David A. Velasco	5c6e309c64	Updated library reference	2014-06-25 09:09:28 +02:00
David A. Velasco	c266cccb23	Fixed lost pronoun	2014-06-24 14:51:39 +02:00
Jenkins for ownCloud	1e0df5838f	[tx-robot] updated from transifex	2014-06-24 01:13:38 -04:00
David A. Velasco	bcfd1f63bd	Merge remote-tracking branch 'origin/develop' into develop	2014-06-23 08:49:06 +02:00