2503 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David A. Velasco	ea5c4760c2	Fixed conflict - Merge branch 'develop' into better_loggin_system	2014-09-18 09:31:24 +02:00
Jenkins for ownCloud	9224d35adc	[tx-robot] updated from transifex	2014-09-18 01:13:34 -04:00
David A. Velasco	71e64fdd45	Merge pull request #628 from owncloud/enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh ... Enforce refresh even though ETag didn't changed when user pulls down the list of files (security blanket)	2014-09-17 17:18:09 +02:00
jabarros	6da86f04f6	Update with changes after CR	2014-09-17 17:10:20 +02:00
jabarros	74c29e1ce1	Changes after CR	2014-09-17 16:46:11 +02:00
jabarros	9127ca6906	Merge branch 'develop' into enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh	2014-09-17 12:37:19 +02:00
jabarros	2ef886af31	Merge branch 'develop' into better_loggin_system	2014-09-17 09:47:34 +02:00
jabarros	208d44d616	Update owncloud library reference	2014-09-17 09:39:35 +02:00
Jenkins for ownCloud	c20c9100e5	[tx-robot] updated from transifex	2014-09-17 01:13:45 -04:00
jabarros	31bd59d681	Fix bug. App crashes when installing it	2014-09-16 13:48:17 +02:00
jabarros	6a297ebe91	Fix bug. Etag is been ignored when navigating through folders	2014-09-16 12:48:24 +02:00
jabarros	f029363e47	Fixed bug related with app crashes when opening the logs and rotate the device	2014-09-16 09:19:30 +02:00
Jenkins for ownCloud	2878d39b05	[tx-robot] updated from transifex	2014-09-16 01:13:34 -04:00
jabarros	e549254059	Add boolean parameter 'ignoreTag' to SyncronizeFolderOperation constructor and pass ignoreTag = true in calls to #startSyncFolderOperation at FileDisplayActivity and MoveActivity in #onRefresh()	2014-09-15 13:14:32 +02:00
David A. Velasco	aae90eb1aa	Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_for_downloaded_images	2014-09-15 09:41:25 +02:00
Jenkins for ownCloud	041bc26842	[tx-robot] updated from transifex	2014-09-15 01:13:31 -04:00
Jenkins for ownCloud	e630b8a342	[tx-robot] updated from transifex	2014-09-14 01:13:32 -04:00
Jenkins for ownCloud	98a9442219	[tx-robot] updated from transifex	2014-09-13 05:15:57 -04:00
tobiasKaminsky	3ace32e9ae	Removed accidently added remote thumbnail generation.	2014-09-13 10:15:00 +02:00
tobiasKaminsky	2e5d99463d	Re-added thumbnail generation for files that are not images.	2014-09-13 10:10:57 +02:00
jabarros	a720d1a049	Merge pull request #619 from owncloud/fix_crash_when_connecting_to_wifi ... FileUploader service checks existance of account before accepting an upload	2014-09-12 13:55:03 +02:00
David A. Velasco	cbdb5d3ff0	Fixed mess created with b9eaffd	2014-09-12 13:49:37 +02:00
David A. Velasco	a36d9f9845	Fixed reference to library after recovering move_operation changes :S	2014-09-12 13:47:20 +02:00
jabarros	167848e38c	Update owncloud library reference	2014-09-12 13:34:17 +02:00
David A. Velasco	009058b112	Fixed reference to android-library for mvn update	2014-09-12 13:08:56 +02:00
David A. Velasco	340bbd0d87	Merge pull request #620 from LukeOwncloud/develop ... Fix mvn build	2014-09-12 13:01:27 +02:00
jabarros	971745e0b5	Update owncloud library reference	2014-09-12 12:16:29 +02:00
Luke Owncloud	28550f5c68	fix mvn build. needs to go together with update of pom.xml of ... owncloud-android-library.	2014-09-12 11:55:14 +02:00
jabarros	87de2db17d	Set the log folder path before starting logging	2014-09-12 11:24:12 +02:00
Jenkins for ownCloud	1d292aa224	[tx-robot] updated from transifex	2014-09-12 03:28:56 -04:00
jabarros	4599553545	Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity	2014-09-11 18:26:52 +02:00
David A. Velasco	b9eaffdecd	Fixed typo in strings.xml	2014-09-11 17:18:54 +02:00
jabarros	c8fe95b914	Set maximum file size for logs and format logs info	2014-09-11 12:39:24 +02:00
jabarros	c281aaeb01	Add delete history login and chang the date format in logs	2014-09-11 11:00:40 +02:00
jabarros	c7263a2cb4	Visualize both older and current log files info in the log history view and send both attached in the mail	2014-09-11 09:33:40 +02:00
Jenkins for ownCloud	bb1177074c	[tx-robot] updated from transifex	2014-09-11 01:13:35 -04:00
jabarros	9c65f99338	Manage size of log file automatically, handling two log files with a maximun size	2014-09-10 18:17:49 +02:00
jabarros	650ffdd13f	Remove unused code for accesing to log file from Preferences class	2014-09-10 08:59:52 +02:00
jabarros	57d4ac96d9	Change log messages for using our logger in all logs	2014-09-10 08:49:41 +02:00
jabarros	30c00ae9e5	Done some changes for storing the log messages on log file and grant that logs are added to the same log file when the app is killed, then reopened	2014-09-10 08:46:38 +02:00
jabarros	7dd567050a	Merge pull request #615 from owncloud/fast_account_selection ... When an account is clicked, the app immediately shows its contents	2014-09-09 15:06:09 +02:00
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