Jorge Antonio Diaz-Benito Soriano [Wed, 24 Jun 2015 20:38:39 +0000 (22:38 +0200)]
Implementation of the requested changes to the asynctask that loads the text
Jorge Antonio Diaz-Benito Soriano [Wed, 24 Jun 2015 20:24:39 +0000 (22:24 +0200)]
Added exception logging
Jorge Antonio Diaz-Benito Soriano [Wed, 24 Jun 2015 20:14:58 +0000 (22:14 +0200)]
Added braces to single-line if statements
Jorge Antonio Diaz-Benito Soriano [Wed, 24 Jun 2015 20:12:36 +0000 (22:12 +0200)]
Support margins for API levels pre-17
Jorge Antonio Diaz-Benito Soriano [Wed, 3 Dec 2014 14:11:59 +0000 (15:11 +0100)]
Update submodule
Jorge Antonio Diaz-Benito Soriano [Wed, 3 Dec 2014 14:08:45 +0000 (15:08 +0100)]
Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
David A. Velasco [Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)]
Merge branch 'master' into develop
jabarros [Wed, 3 Dec 2014 09:10:26 +0000 (10:10 +0100)]
Merge pull request #773 from owncloud/triggerMediaScan
Trigger media scan
David A. Velasco [Wed, 3 Dec 2014 08:41:49 +0000 (09:41 +0100)]
Removed empty method, and some unused imports
jabarros [Wed, 3 Dec 2014 08:33:07 +0000 (09:33 +0100)]
Merge branch 'release-1.6.2'
jabarros [Wed, 3 Dec 2014 08:31:41 +0000 (09:31 +0100)]
Update owncloud library reference to 0.9.4
David A. Velasco [Tue, 2 Dec 2014 13:23:49 +0000 (14:23 +0100)]
Trigger MediaScan for every downloaded file in a renamed or moved folder
David A. Velasco [Tue, 2 Dec 2014 12:33:57 +0000 (13:33 +0100)]
Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile
David A. Velasco [Tue, 2 Dec 2014 10:17:47 +0000 (11:17 +0100)]
Bug fixed (and some refactoring): crash on local removal of a folder
David A. Velasco [Tue, 2 Dec 2014 08:47:02 +0000 (09:47 +0100)]
Let Gradle out of Travis for the moment - needs additional review
David A. Velasco [Tue, 2 Dec 2014 08:29:26 +0000 (09:29 +0100)]
Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment
David A. Velasco [Tue, 2 Dec 2014 08:21:35 +0000 (09:21 +0100)]
Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager
David A. Velasco [Tue, 2 Dec 2014 08:16:56 +0000 (09:16 +0100)]
Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method
David A. Velasco [Tue, 2 Dec 2014 08:08:48 +0000 (09:08 +0100)]
Refactoring: get MediaScan trigger out of OCFile for renaming
jabarros [Tue, 2 Dec 2014 07:31:54 +0000 (08:31 +0100)]
Merge pull request #662 from tobiasKaminsky/fileCount
File count
Jorge Antonio Diaz-Benito Soriano [Sat, 29 Nov 2014 20:12:51 +0000 (21:12 +0100)]
Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
tobiasKaminsky [Sat, 29 Nov 2014 11:18:02 +0000 (12:18 +0100)]
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
-fr/strings.xml
Conflicts:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
tobiasKaminsky [Sat, 29 Nov 2014 11:13:46 +0000 (12:13 +0100)]
- test fix for android 4
tobiasKaminsky [Sat, 29 Nov 2014 10:32:00 +0000 (11:32 +0100)]
- restore some files :/
tobiasKaminsky [Tue, 18 Nov 2014 16:30:27 +0000 (17:30 +0100)]
Temporary fix of missing escape for apostrophe
tobiasKaminsky [Sat, 29 Nov 2014 10:23:16 +0000 (11:23 +0100)]
cleanup
tobiasKaminsky [Sat, 29 Nov 2014 10:12:03 +0000 (11:12 +0100)]
- trigger mediaScan when files are deleted remote
tobiasKaminsky [Sat, 29 Nov 2014 09:37:13 +0000 (10:37 +0100)]
- trigger works when moving files
jabarros [Fri, 28 Nov 2014 13:25:32 +0000 (14:25 +0100)]
Merge pull request #768 from owncloudChalmers/owncloud_submodule
Change submodule from owncloudChalmers/android-library to owncloud/android-library
Jorge Antonio Diaz-Benito Soriano [Fri, 28 Nov 2014 11:16:34 +0000 (12:16 +0100)]
Change submodule from owncloudChalmers/android-library to ownCloud/android-library
jabarros [Fri, 28 Nov 2014 09:55:39 +0000 (10:55 +0100)]
Update owncloud library reference
jabarros [Fri, 28 Nov 2014 08:10:45 +0000 (09:10 +0100)]
Merge pull request #661 from owncloudChalmers/gradleWithInternalDependency
Gradle support (squashed history)
Jenkins for ownCloud [Fri, 28 Nov 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 26 Nov 2014 12:10:04 +0000 (13:10 +0100)]
Merge pull request #752 from owncloud/instant_uploads_set_path
Better UI for settings path of instant uploads
jabarros [Wed, 26 Nov 2014 12:06:00 +0000 (13:06 +0100)]
Changed var to parcelable in FolderPickerActivity
jabarros [Wed, 26 Nov 2014 11:51:16 +0000 (12:51 +0100)]
Refactor after CR
jabarros [Wed, 26 Nov 2014 08:05:23 +0000 (09:05 +0100)]
Changes after CR
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 20:51:26 +0000 (21:51 +0100)]
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files
Conflicts:
.idea/misc.xml
.idea/modules.xml
android.iml
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 20:34:20 +0000 (21:34 +0100)]
Update the submodule version to the restored .gitignore
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 19:46:44 +0000 (20:46 +0100)]
Restore .gitignore and SETUP.md, remove files that were added
jabarros [Tue, 25 Nov 2014 13:23:17 +0000 (14:23 +0100)]
Update owncloud library reference
tobiasKaminsky [Mon, 24 Nov 2014 19:15:57 +0000 (20:15 +0100)]
bugfix
David A. Velasco [Mon, 24 Nov 2014 13:15:38 +0000 (14:15 +0100)]
Update reference to library
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:57:02 +0000 (12:57 +0100)]
Merge branch 'gradleWithInternalDependency' into us4_view_text_files
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:37:12 +0000 (12:37 +0100)]
Update submodule to version with updated .gitignore
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:17:01 +0000 (12:17 +0100)]
Updated instructions to the continuous presence of the *.iml files
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 10:57:01 +0000 (11:57 +0100)]
Update .gitignore and re-add missing files
tobiasKaminsky [Mon, 24 Nov 2014 09:59:31 +0000 (10:59 +0100)]
changed order to: file(s), folder(s)
jabarros [Mon, 24 Nov 2014 09:54:13 +0000 (10:54 +0100)]
Update owncloud library reference
Jenkins for ownCloud [Mon, 24 Nov 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Nov 2014 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Fri, 21 Nov 2014 17:12:48 +0000 (18:12 +0100)]
- removed Log
tobiasKaminsky [Fri, 21 Nov 2014 17:08:44 +0000 (18:08 +0100)]
fix bug #742
tobiasKaminsky [Fri, 21 Nov 2014 16:59:51 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into fileCount
tobiasKaminsky [Fri, 21 Nov 2014 16:58:32 +0000 (17:58 +0100)]
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
tobiasKaminsky [Fri, 21 Nov 2014 16:54:47 +0000 (17:54 +0100)]
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 15:16:37 +0000 (16:16 +0100)]
Update submodule with the rebased version
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 14:31:14 +0000 (15:31 +0100)]
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 14:31:04 +0000 (15:31 +0100)]
Update submodule
Jos Poortvliet [Fri, 21 Nov 2014 13:52:15 +0000 (14:52 +0100)]
Update README.md
Linking not to raw MD file but to the nicely formatted one in github :D
David A. Velasco [Fri, 21 Nov 2014 11:40:05 +0000 (12:40 +0100)]
Merge branch 'develop' into release-1.6.2
David A. Velasco [Fri, 21 Nov 2014 11:23:27 +0000 (12:23 +0100)]
Merge pull request #740 from owncloud/revert-669-master
Revert "Add "select all" option to photo (or other) upload screen"
jabarros [Fri, 21 Nov 2014 09:57:38 +0000 (10:57 +0100)]
Merge branch 'develop' into release-1.6.2
jabarros [Fri, 21 Nov 2014 09:56:08 +0000 (10:56 +0100)]
Merge pull request #722 from ogasser/idn_share_fix
Convert IDN from ASCII to Unicode in Upload Dialog
jabarros [Thu, 20 Nov 2014 17:03:33 +0000 (18:03 +0100)]
Update version number and name in oc_jb_workaround subproject
jabarros [Thu, 20 Nov 2014 17:01:05 +0000 (18:01 +0100)]
Update version number and name
jabarros [Thu, 20 Nov 2014 08:39:10 +0000 (09:39 +0100)]
Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder
Jenkins for ownCloud [Thu, 20 Nov 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Wed, 19 Nov 2014 17:40:06 +0000 (18:40 +0100)]
Merge branch 'develop' into instant_uploads_set_path
David A. Velasco [Wed, 19 Nov 2014 10:26:27 +0000 (11:26 +0100)]
Merge pull request #721 from owncloud/nea_upload_files
Fix upload of files from DocumentsProvider in Android > 4.4
David A. Velasco [Wed, 19 Nov 2014 10:11:15 +0000 (11:11 +0100)]
Merge branch 'develop' into nea_upload_files
David A. Velasco [Wed, 19 Nov 2014 10:05:32 +0000 (11:05 +0100)]
Fix failed uploads when display name of file brough from external apps includes separator or path-separator characters
David A. Velasco [Wed, 19 Nov 2014 09:50:36 +0000 (10:50 +0100)]
Merge pull request #736 from owncloud/fix_refresh_account_lollipop
Fix 'refresh account' action in Lollipop
jabarros [Wed, 19 Nov 2014 09:14:27 +0000 (10:14 +0100)]
Add new preference on settings for setting the upload video path
Raquel [Wed, 19 Nov 2014 08:31:19 +0000 (09:31 +0100)]
Merge branch 'develop' into fix_refresh_account_lollipop
jabarros [Wed, 19 Nov 2014 08:22:12 +0000 (09:22 +0100)]
Remove 'sort' and 'logs' options from action bar menu when showing the selecting upload path folder view
Jenkins for ownCloud [Wed, 19 Nov 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Tue, 18 Nov 2014 14:09:39 +0000 (15:09 +0100)]
When user goes to set the upload path, the folder list view is shown in the current path set
jabarros [Tue, 18 Nov 2014 13:57:19 +0000 (14:57 +0100)]
Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long
jabarros [Tue, 18 Nov 2014 13:53:41 +0000 (14:53 +0100)]
Remove files_move layout after creating files_folder_picker one
jabarros [Tue, 18 Nov 2014 13:51:49 +0000 (14:51 +0100)]
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
jabarros [Tue, 18 Nov 2014 10:01:55 +0000 (11:01 +0100)]
Add view for selecting upload path folder browsing through local file list in preferences view
jabarros [Tue, 18 Nov 2014 09:35:52 +0000 (10:35 +0100)]
Fix errors in Frechn translations and reaname var in FileDisplayActivity
jabarros [Tue, 18 Nov 2014 09:22:04 +0000 (10:22 +0100)]
Merge branch 'develop' into nea_upload_files
Jenkins for ownCloud [Tue, 18 Nov 2014 06:13:34 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Mon, 17 Nov 2014 14:26:08 +0000 (15:26 +0100)]
Merge pull request #729 from owncloud/tls_v1.1_and_v1.2_support
Update reference to library after upgrading TLS support
David A. Velasco [Mon, 17 Nov 2014 14:18:22 +0000 (15:18 +0100)]
Update reference to library after upgrading TLS support
Jorge Antonio Diaz-Benito Soriano [Mon, 17 Nov 2014 13:10:55 +0000 (14:10 +0100)]
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files
jabarros [Mon, 17 Nov 2014 13:07:48 +0000 (14:07 +0100)]
Fix crash in Android Lollipop when cliking on refresh the whole account
Luke Owncloud [Sun, 12 Oct 2014 18:36:34 +0000 (20:36 +0200)]
small changes for building on Linux
Conflicts:
SETUP.md
setup_env.sh
jabarros [Mon, 17 Nov 2014 12:51:04 +0000 (13:51 +0100)]
Update library reference
jabarros [Mon, 17 Nov 2014 12:49:17 +0000 (13:49 +0100)]
Merge branch 'develop' into nea_upload_files
Jorge Antonio Diaz-Benito Soriano [Mon, 17 Nov 2014 12:36:26 +0000 (13:36 +0100)]
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
jabarros [Mon, 17 Nov 2014 10:32:46 +0000 (11:32 +0100)]
Refactoring to avoid maintenance after CR
Jenkins for ownCloud [Mon, 17 Nov 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 15 Nov 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Oliver Gasser [Thu, 13 Nov 2014 23:55:53 +0000 (00:55 +0100)]
Convert IDN from ASCII to Unicode in Upload Dialog
Display IDN host names as Unicode in the FileUpload Dialog. This dialog
is shown when multiple ownCloud accounts are setup and a file is shared
with ownCloud.
Fixes #708.
David A. Velasco [Thu, 13 Nov 2014 11:21:49 +0000 (12:21 +0100)]
Merge pull request #685 from tobiasKaminsky/beautifyTimestamps
Relative time stamps in the list of files.
tobiasKaminsky [Thu, 13 Nov 2014 09:10:57 +0000 (10:10 +0100)]
- reference bug 716
Jenkins for ownCloud [Thu, 13 Nov 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
projects / pub / Android / ownCloud.git / log