2452 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	f1fdfecb82	Changed title of settings activity to 'Settings'	2014-09-09 14:50:53 +02:00
David A. Velasco	4afd9dde49	Merge pull request #614 from owncloud/ADFS_auth_support ... ADFS IdPs support added to SAML authentication	2014-09-09 13:52:06 +02:00
jabarros	62fc78754e	Changes after CR	2014-09-09 13:42:01 +02:00
jabarros	ba6c6375cf	Merge branch 'develop' into ADFS_auth_support ... Conflicts: res/values/strings.xml	2014-09-09 13:17:41 +02:00
David A. Velasco	3fac2e01a1	FileUploader service checks existance of account when receives an upload request	2014-09-09 13:03:00 +02:00
David A. Velasco	a34a2cac8a	When an account is clicked, the app immediately shows its contents	2014-09-09 12:23:09 +02:00
Jenkins for ownCloud	84d640e0c9	[tx-robot] updated from transifex	2014-09-09 01:13:38 -04:00
Jenkins for ownCloud	40f331dbd1	[tx-robot] updated from transifex	2014-09-07 01:13:35 -04:00
Jenkins for ownCloud	bf003e6c44	[tx-robot] updated from transifex	2014-09-06 01:13:43 -04:00
jabarros	12d64c769f	Merge pull request #608 from owncloud/move_files_and_folders ... Added capability to move files (and folders)	2014-09-05 14:20:54 +02:00
jabarros	3e196f1f7d	First changes for saving logs	2014-09-05 12:08:37 +02:00
Jenkins for ownCloud	85eb7dd8b9	[tx-robot] updated from transifex	2014-09-05 01:13:41 -04:00
jabarros	499c691707	Changes after CR	2014-09-04 18:23:39 +02:00
jabarros	a0442b48b1	Fixed bug. Copy link when sharing a file has dissapear	2014-09-04 18:04:55 +02:00
David A. Velasco	657acefd76	Updated reference to android-library with improved tests	2014-09-04 14:05:14 +02:00
jabarros	d3a99fff00	Fixed bug it is not possible to login using two accounts in saml server. Clear webview cache.	2014-09-04 13:13:07 +02:00
jabarros	2ada53c99b	Enable log into text file automatically when BuildConfig.DEBUG is true. Open log activity when user clicks on action bar menu option. Add button to send email with log file attached.	2014-09-04 09:06:14 +02:00
Jenkins for ownCloud	2e9a926626	[tx-robot] updated from transifex	2014-09-04 01:13:34 -04:00
David A. Velasco	8614cd5982	Update reference to android-library in order to fix move and rename operations through redirected servers	2014-09-03 11:44:13 +02:00
Jenkins for ownCloud	e073ef1489	[tx-robot] updated from transifex	2014-09-03 01:13:33 -04:00
jabarros	f94781b459	Fixed message when trying to move to a folder which does not exist anymore	2014-09-02 14:30:28 +02:00
jabarros	85f63a0ff4	Create dialog fragment for showing authentication dialog	2014-09-02 14:03:56 +02:00
David A. Velasco	1dbba08c7b	Improved messages for operations on files not existing anymore in the server	2014-09-02 10:13:14 +02:00
Jenkins for ownCloud	01599dde3d	[tx-robot] updated from transifex	2014-09-02 01:13:29 -04:00
David A. Velasco	263d847ee1	Updated reference to android-library	2014-09-01 15:19:19 +02:00
David A. Velasco	679c7ed157	Fixed lost local copy of file when moved into a folder that is not created in the local file system yet	2014-09-01 10:35:47 +02:00
jabarros	baf4d6a627	Add menu restrictions for not showing move option on the Preview and details fragments	2014-09-01 09:03:15 +02:00
Jenkins for ownCloud	0f47ef4605	[tx-robot] updated from transifex	2014-08-31 13:01:27 -04:00
Jenkins for ownCloud	328969aba4	[tx-robot] updated from transifex	2014-08-30 01:13:34 -04:00
Jenkins for ownCloud	3535c8c577	[tx-robot] updated from transifex	2014-08-29 01:13:35 -04:00
David A. Velasco	24ffdc2c2f	Fixed crash when selecting a folder to move file into after rotating the device in the selection view	2014-08-28 18:44:15 +02:00
jabarros	622523b3e3	Show alert message when user or password in authentication is not correct	2014-08-28 16:03:03 +02:00
jabarros	28614af18d	Merge branch 'develop' into move_files_and_folders	2014-08-28 12:32:39 +02:00
jabarros	d3d0816ed7	Show a dialog to request username and password to the user on authentication request	2014-08-28 12:30:32 +02:00
Jenkins for ownCloud	06fc13164e	[tx-robot] updated from transifex	2014-08-28 01:13:39 -04:00
jabarros	118134fbd2	Update the reference of the library	2014-08-27 17:23:33 +02:00
jabarros	8188d4fa92	Update messages for moving files operation results	2014-08-27 10:01:28 +02:00
Jenkins for ownCloud	ffa670564e	[tx-robot] updated from transifex	2014-08-27 01:13:36 -04:00
David A. Velasco	c928626bfa	Merge remote-tracking branch 'origin/move_files_and_folders' into move_files_and_folders	2014-08-26 19:32:41 +02:00
David A. Velasco	8cfafef514	Completed update of local database and storage after a successful remote move	2014-08-26 19:31:50 +02:00
jabarros	622d78906b	Show an alert message when user tries to move a file or folder to a location where its name is used by other file or folder and when it is forbidden to move it	2014-08-26 18:44:14 +02:00
jabarros	872bdc822b	Pass info of target file that is going to be moved	2014-08-26 18:03:38 +02:00
jabarros	a6afe6efd2	Add gestion for errors when moving files	2014-08-26 17:44:18 +02:00
David A. Velasco	5480c0b52f	Refactored MoveFileOperation to handle local update after remote move (WIP)	2014-08-26 16:11:52 +02:00
jabarros	59c0d67e68	Trigger MoveFileOperation when 'Choose' button is clicked	2014-08-26 16:00:42 +02:00
David A. Velasco	7d0e39f730	Start MoveFileOperation when 'Choose' button is clicked [Work In ... Progress!]	2014-08-26 10:58:47 +02:00
David A. Velasco	e050da1009	Added MoveFileOperation to move OCFiles	2014-08-26 10:57:25 +02:00
Jenkins for ownCloud	8eb5694779	[tx-robot] updated from transifex	2014-08-26 01:13:33 -04:00
Jenkins for ownCloud	42368f2cef	[tx-robot] updated from transifex	2014-08-25 01:13:29 -04:00
Jenkins for ownCloud	260b8ea7d6	[tx-robot] updated from transifex	2014-08-24 01:13:27 -04:00