22333 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	e391b28590	[tx-robot] updated from transifex	2013-07-07 01:20:10 +02:00
Jenkins for ownCloud	3338f27d2a	[tx-robot] updated from transifex	2013-07-06 01:14:54 +02:00
masensio	11adab0116	OC-523: Remove two log lines in FileDataStorageManager	2013-07-05 15:06:51 +02:00
masensio	a52ff9359f	OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523	2013-07-05 14:54:02 +02:00
David A. Velasco	b708d46def	REALLY added imprint link in settings; imprint and help links protected for bad configuration of preferences.xml	2013-07-05 14:00:41 +02:00
masensio	a7385a7a5a	OC-576: method updateSubtreeSize in FileDataStorageManager. OC-523	2013-07-05 13:00:57 +02:00
David A. Velasco	233533faa3	Merge branch 'develop' into branding_configurable_URL_input_field	2013-07-05 11:52:24 +02:00
David A. Velasco	12bffce50c	Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings	2013-07-05 10:47:34 +02:00
David A. Velasco	04c2311131	Merge branch 'master' into develop	2013-07-05 09:22:52 +02:00
Jenkins for ownCloud	110e7647f8	[tx-robot] updated from transifex	2013-07-05 01:21:39 +02:00
masensio	994e81d7ce	OC-575: Update the size of a folder in DB during the sync. OC-523	2013-07-04 18:47:38 +02:00
masensio	0707f6cf71	OC-574: Show size in list from local database. OC-523	2013-07-04 10:34:57 +02:00
Jenkins for ownCloud	ace5d49f30	[tx-robot] updated from transifex	2013-07-04 09:39:17 +02:00
masensio	50bf276b58	Merge pull request #204 from owncloud/check_account_existance_in_gallery ... Check account existance when entering in the app through an activity showing preview or details of a file.	2013-07-03 03:38:16 -07:00
David A. Velasco	dcbc08cae7	Merge branch 'develop' into check_account_existance_in_gallery	2013-07-03 10:06:37 +02:00
Jenkins for ownCloud	0f76b038ca	[tx-robot] updated from transifex	2013-07-02 15:40:13 +02:00
masensio	af7331d31c	Merge pull request #202 from owncloud/modify_password ... Modify password of an existing account with long press in the list of accounts	2013-07-02 04:37:38 -07:00
David A. Velasco	e8239f434a	Merge branch 'develop' into modify_password	2013-07-02 13:08:27 +02:00
David A. Velasco	82375a917b	FIXED: right screen when the app is left in a video, the account is deleted, the orientation is changed, the app is opened and the account reloged-in	2013-07-02 12:41:10 +02:00
David A. Velasco	fb500a906c	Fixed lost of state of list of files in orientation changes	2013-06-28 13:35:03 +02:00
David A. Velasco	5b792b0440	Merge branch 'develop' into check_account_existance_in_gallery	2013-06-28 11:58:43 +02:00
Jenkins for ownCloud	f9df07c152	[tx-robot] updated from transifex	2013-06-28 01:23:35 +02:00
David A. Velasco	856038af0d	Merge pull request #200 from owncloud/release-JB-workaround-1.0.3 ... Release jb workaround 1.0.3	2013-06-27 07:18:51 -07:00
David A. Velasco	a856e8864a	Merge pull request #199 from owncloud/release-JB-workaround-1.0.3 ... Release jb workaround 1.0.3	2013-06-27 07:17:14 -07:00
David A. Velasco	164bf8cf48	Version number update: 1.0.3	2013-06-27 15:56:52 +02:00
David A. Velasco	416b0adfb4	Dumb update to enforce automatic reinstallations AFTER update to oc-android-1.4.1	2013-06-27 12:27:20 +02:00
Jenkins for ownCloud	e02ad6c038	[tx-robot] updated from transifex	2013-06-27 01:38:29 +02:00
masensio	b52f0484b4	OC-461: Add check server button. OC-394	2013-06-26 18:50:08 +02:00
David A. Velasco	67325ed36c	Merge branch 'master' into develop	2013-06-26 18:13:11 +02:00
David A. Velasco	66a005416c	Merge branch 'release-1.4.1' into develop	2013-06-26 18:13:05 +02:00
David A. Velasco	a957efbd3d	Merge remote-tracking branch 'origin/master'	2013-06-26 18:11:29 +02:00
David A. Velasco	5781090e2b	Merge branch 'release-1.4.1'	2013-06-26 18:10:10 +02:00
David A. Velasco	04803ae879	Fixed false error message and lack of recheck when a server certificate is explicitly accepted by the user in the login view	2013-06-26 12:45:35 +02:00
David A. Velasco	77428a495b	Merge branch 'fixed_update_of_action_bar_in_successful_rename' into release-1.4.1	2013-06-26 12:23:22 +02:00
David A. Velasco	646abfa08d	Fixed update of action bar in successful rename	2013-06-26 11:47:20 +02:00
David A. Velasco	58733dfa12	Generated serialVersionUIDs updated	2013-06-26 09:23:53 +02:00
David A. Velasco	f63c4ad77a	Version bump: 1.4.1	2013-06-26 09:17:53 +02:00
David A. Velasco	0f2a7475b1	Disabled logging options until fixed	2013-06-26 09:13:28 +02:00
David A. Velasco	863f3f68d2	Merge pull request #197 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_already_existing ... Fixed crash due to uploads to accounts not already existing	2013-06-25 23:51:58 -07:00
Jenkins for ownCloud	4d1f8d7dc1	[tx-robot] updated from transifex	2013-06-26 01:18:51 +02:00
masensio	2402e9ed4c	Merge pull request #195 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_already_existing ... Fixed crash due to uploads to accounts not already existing	2013-06-25 06:16:25 -07:00
masensio	2df8f56e5e	OC-460:URL-input GONE. OC-394	2013-06-25 14:13:04 +02:00
masensio	dcc0461a7d	OC-459:new string server_url, new bool show_server_url_input. OC-394	2013-06-25 11:00:19 +02:00
masensio	6436606c1c	OC-458: new branding.xml. OC-394	2013-06-25 10:19:19 +02:00
Jenkins for ownCloud	ef47fcb9cd	[tx-robot] updated from transifex	2013-06-25 01:25:09 +02:00
David A. Velasco	7c1be6db3e	Updated some messages in login activity	2013-06-24 10:59:11 +02:00
David A. Velasco	d51372fb92	Make the 'refresh' button enabled when visible, although the URL-input field is disabled, when the password is being updated	2013-06-24 10:39:52 +02:00
Jenkins for ownCloud	3c00f08041	[tx-robot] updated from transifex	2013-06-24 01:30:18 +02:00
Jenkins for ownCloud	52879c3be8	[tx-robot] updated from transifex	2013-06-22 01:42:24 +02:00
David A. Velasco	af4b0bc90b	Fixed focus in AuthenticarActivity for changing password so that server URL is not editable	2013-06-21 14:29:47 +02:00