jabarros [Fri, 26 Dec 2014 08:04:02 +0000 (09:04 +0100)]
Merge pull request #784 from ekeitho/develop
subject mail populated when user shares >>file/folder<<
Jenkins for ownCloud [Fri, 26 Dec 2014 06:13:28 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 25 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 Dec 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Tue, 23 Dec 2014 17:38:38 +0000 (09:38 -0800)]
fix tab indent
Keith Abdulla [Tue, 23 Dec 2014 17:31:59 +0000 (09:31 -0800)]
create an extra string resource
Jenkins for ownCloud [Tue, 23 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 22 Dec 2014 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 20 Dec 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Sat, 20 Dec 2014 04:11:25 +0000 (20:11 -0800)]
fix string format and context method
David A. Velasco [Fri, 19 Dec 2014 11:56:14 +0000 (12:56 +0100)]
Merge pull request #718 from owncloudChalmers/multi2
Multiselect functionalty targeting https://github.com/owncloud/android/issues/596
Jenkins for ownCloud [Fri, 19 Dec 2014 06:13:38 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 18 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 17 Dec 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 16 Dec 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Mon, 15 Dec 2014 09:22:10 +0000 (10:22 +0100)]
Merge pull request #801 from owncloud/community_image-preview-save-position
Restore the current image when the preview activity is hidden
Jenkins for ownCloud [Mon, 15 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 14 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 13 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Fri, 12 Dec 2014 09:05:49 +0000 (10:05 +0100)]
Merge pull request #766 from owncloud/feedbackWithVersionNumber
Email from feedback contains version number
Jenkins for ownCloud [Fri, 12 Dec 2014 06:13:36 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Thu, 11 Dec 2014 09:23:03 +0000 (10:23 +0100)]
Merge branch 'develop' into community_image-preview-save-position
David A. Velasco [Thu, 11 Dec 2014 09:21:41 +0000 (10:21 +0100)]
Merge pull request #781 from owncloud/fix_logs_change_orientation
User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)
David A. Velasco [Thu, 11 Dec 2014 08:16:00 +0000 (09:16 +0100)]
Merge pull request #799 from owncloud/community_rotateImage
Rotate image according to EXIF attributes.
jabarros [Thu, 11 Dec 2014 07:51:31 +0000 (08:51 +0100)]
Merge branch 'develop' into community_rotateImage
jabarros [Wed, 10 Dec 2014 13:13:32 +0000 (14:13 +0100)]
Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
David A. Velasco [Wed, 10 Dec 2014 11:48:31 +0000 (12:48 +0100)]
Hurry up release of source bitmap in rotations
David A. Velasco [Wed, 10 Dec 2014 11:46:34 +0000 (12:46 +0100)]
Cancel load task when fragment becomes invisible (fixes crash in rotations)
jabarros [Wed, 10 Dec 2014 07:45:12 +0000 (08:45 +0100)]
Merge pull request #754 from owncloud/RadioListOnAccounts
Account list is now a radiobutton list
Keith Abdulla [Wed, 10 Dec 2014 07:01:48 +0000 (23:01 -0800)]
fix tab
Jenkins for ownCloud [Wed, 10 Dec 2014 06:13:40 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Wed, 10 Dec 2014 01:51:10 +0000 (17:51 -0800)]
move subject message strings into strings.xml
Jenkins for ownCloud [Mon, 8 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 7 Dec 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Keith Abdulla [Sat, 6 Dec 2014 10:07:35 +0000 (02:07 -0800)]
subject mail populated when user shares file/folder
Jenkins for ownCloud [Sat, 6 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
jabarros [Fri, 5 Dec 2014 13:33:04 +0000 (14:33 +0100)]
Fix. Avoid load logs again when changing device orientation
jabarros [Fri, 5 Dec 2014 09:12:57 +0000 (10:12 +0100)]
Remove unused imports and split long lines modified
Sam [Fri, 5 Dec 2014 09:07:48 +0000 (10:07 +0100)]
Merge branch 'develop' of https://github.com/owncloud/android into multi2
jabarros [Fri, 5 Dec 2014 08:33:34 +0000 (09:33 +0100)]
Fixed. App crashes when previewing an image
Jenkins for ownCloud [Fri, 5 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 4 Dec 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
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
Sam [Wed, 3 Dec 2014 09:04:39 +0000 (10:04 +0100)]
Merged with owncloud develop
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
Magnus Sjoqvist [Tue, 2 Dec 2014 10:11:34 +0000 (11:11 +0100)]
Removes build version magic numbers
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
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
tobiasKaminsky [Thu, 27 Nov 2014 07:25:57 +0000 (08:25 +0100)]
Email from feedback contains version number
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: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
tobiasKaminsky [Tue, 25 Nov 2014 16:42:41 +0000 (17:42 +0100)]
- Account list is now a radiobutton list
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: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"
projects / pub / Android / ownCloud.git / log