MMMarcy [Fri, 17 Oct 2014 12:58:27 +0000 (14:58 +0200)]
Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency
Conflicts:
owncloud-android-library
pom.xml
MMMarcy [Fri, 3 Oct 2014 10:33:41 +0000 (12:33 +0200)]
Commit for the PR
The pull request targets:
1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module
Remainders:
1) Change the sub-module back to the owncloud android library
once the PR will be merge
Jenkins for ownCloud [Fri, 17 Oct 2014 05:13:52 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 16 Oct 2014 05:14:37 +0000 (01:14 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 15 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 14 Oct 2014 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 12 Oct 2014 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 11 Oct 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Fri, 10 Oct 2014 08:36:43 +0000 (10:36 +0200)]
Merge pull request #651 from owncloud/load_proxy_settings_from_system
Update reference to ownCloud Android library to use proxy settings from device
Jenkins for ownCloud [Fri, 10 Oct 2014 08:18:14 +0000 (04:18 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Fri, 10 Oct 2014 07:27:49 +0000 (09:27 +0200)]
Update reference to ownCloud Android library
Jenkins for ownCloud [Fri, 10 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 9 Oct 2014 15:07:50 +0000 (17:07 +0200)]
Fix. Remove incorrect 'values-tl_PH' folder for allowing project compilation
Jenkins for ownCloud [Wed, 8 Oct 2014 05:13:40 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 7 Oct 2014 05:13:42 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 6 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 5 Oct 2014 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 Oct 2014 05:13:31 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 3 Oct 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 2 Oct 2014 07:00:21 +0000 (09:00 +0200)]
Update Log_OC import reference
Jenkins for ownCloud [Wed, 1 Oct 2014 23:22:04 +0000 (19:22 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 1 Oct 2014 10:54:48 +0000 (06:54 -0400)]
[tx-robot] updated from transifex
jabarros [Wed, 1 Oct 2014 09:40:16 +0000 (11:40 +0200)]
Merge pull request #632 from wakeup/patch-1
fix owncloud capitalization
Javier Gonzalez [Wed, 1 Oct 2014 09:35:50 +0000 (11:35 +0200)]
Merge pull request #641 from owncloud/thumbnails_for_downloaded_images
Thumbnails for downloaded images
jabarros [Wed, 1 Oct 2014 07:03:15 +0000 (09:03 +0200)]
Changes after CR
Javier Gonzalez [Tue, 30 Sep 2014 12:15:31 +0000 (14:15 +0200)]
Merge pull request #642 from owncloud/remove_values_fil_folder
Fix. Remove 'values-fil' folder for allowing the project compilation
jabarros [Tue, 30 Sep 2014 12:04:52 +0000 (14:04 +0200)]
Fix. Remove 'values-fil' for allow the project compilation
Jenkins for ownCloud [Tue, 30 Sep 2014 05:13:36 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Mon, 29 Sep 2014 11:55:28 +0000 (13:55 +0200)]
Add column 'update_thumbnail' to the local files db for controlling the update of the thumbnails when images are updated on the server
Jenkins for ownCloud [Mon, 29 Sep 2014 05:13:33 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Sep 2014 05:13:32 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 27 Sep 2014 05:13:32 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 25 Sep 2014 05:13:37 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 Sep 2014 05:13:39 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Tue, 23 Sep 2014 12:28:23 +0000 (14:28 +0200)]
Protect the app against crashes when opening the thumbnails cache
David A. Velasco [Tue, 23 Sep 2014 11:43:30 +0000 (13:43 +0200)]
Protect the app against crashes due to fails in creation of thumbnails
David A. Velasco [Tue, 23 Sep 2014 11:34:25 +0000 (13:34 +0200)]
Minimized memory use in load of bitmaps for thumbnails generated from local files
Jenkins for ownCloud [Tue, 23 Sep 2014 05:48:41 +0000 (01:48 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 Sep 2014 05:13:31 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 20 Sep 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Volkan Gezer [Fri, 19 Sep 2014 16:10:20 +0000 (18:10 +0200)]
fix owncloud capitalization
David A. Velasco [Fri, 19 Sep 2014 12:14:30 +0000 (14:14 +0200)]
Work around constaint in valid key for DiskLruCache (capital letters are not allowed)
Jenkins for ownCloud [Fri, 19 Sep 2014 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Thu, 18 Sep 2014 11:23:50 +0000 (13:23 +0200)]
Hotfix for setups without new mail_logger string
jabarros [Thu, 18 Sep 2014 10:44:42 +0000 (12:44 +0200)]
Fixed bug. When there is a downloaded file which is not support as tiff, app crashes
David A. Velasco [Thu, 18 Sep 2014 07:38:27 +0000 (09:38 +0200)]
Merge pull request #627 from owncloud/better_loggin_system
Improved logging system
David A. Velasco [Thu, 18 Sep 2014 07:31:24 +0000 (09:31 +0200)]
Fixed conflict - Merge branch 'develop' into better_loggin_system
Jenkins for ownCloud [Thu, 18 Sep 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 17 Sep 2014 15:18:09 +0000 (17:18 +0200)]
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)
jabarros [Wed, 17 Sep 2014 15:10:20 +0000 (17:10 +0200)]
Update with changes after CR
jabarros [Wed, 17 Sep 2014 14:46:11 +0000 (16:46 +0200)]
Changes after CR
jabarros [Wed, 17 Sep 2014 10:37:19 +0000 (12:37 +0200)]
Merge branch 'develop' into enforce_folder_refresh_even_though_etag_is_not_updated_in_pull_to_refresh
jabarros [Wed, 17 Sep 2014 07:47:34 +0000 (09:47 +0200)]
Merge branch 'develop' into better_loggin_system
jabarros [Wed, 17 Sep 2014 07:39:35 +0000 (09:39 +0200)]
Update owncloud library reference
Jenkins for ownCloud [Wed, 17 Sep 2014 05:13:45 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Tue, 16 Sep 2014 11:48:17 +0000 (13:48 +0200)]
Fix bug. App crashes when installing it
jabarros [Tue, 16 Sep 2014 10:48:24 +0000 (12:48 +0200)]
Fix bug. Etag is been ignored when navigating through folders
jabarros [Tue, 16 Sep 2014 07:19:30 +0000 (09:19 +0200)]
Fixed bug related with app crashes when opening the logs and rotate the device
Jenkins for ownCloud [Tue, 16 Sep 2014 05:13:34 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Mon, 15 Sep 2014 11:14:32 +0000 (13:14 +0200)]
Add boolean parameter 'ignoreTag' to SyncronizeFolderOperation constructor and pass ignoreTag = true in calls to #startSyncFolderOperation at FileDisplayActivity and MoveActivity in #onRefresh()
David A. Velasco [Mon, 15 Sep 2014 07:41:25 +0000 (09:41 +0200)]
Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_for_downloaded_images
Jenkins for ownCloud [Mon, 15 Sep 2014 05:13:31 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 14 Sep 2014 05:13:32 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 13 Sep 2014 09:15:57 +0000 (05:15 -0400)]
[tx-robot] updated from transifex
tobiasKaminsky [Sat, 13 Sep 2014 08:15:00 +0000 (10:15 +0200)]
Removed accidently added remote thumbnail generation.
tobiasKaminsky [Sat, 13 Sep 2014 08:10:57 +0000 (10:10 +0200)]
Re-added thumbnail generation for files that are not images.
jabarros [Fri, 12 Sep 2014 11:55:03 +0000 (13:55 +0200)]
Merge pull request #619 from owncloud/fix_crash_when_connecting_to_wifi
FileUploader service checks existance of account before accepting an upload
David A. Velasco [Fri, 12 Sep 2014 11:49:37 +0000 (13:49 +0200)]
Fixed mess created with
b9eaffd
David A. Velasco [Fri, 12 Sep 2014 11:47:20 +0000 (13:47 +0200)]
Fixed reference to library after recovering move_operation changes :S
jabarros [Fri, 12 Sep 2014 11:34:17 +0000 (13:34 +0200)]
Update owncloud library reference
David A. Velasco [Fri, 12 Sep 2014 11:08:56 +0000 (13:08 +0200)]
Fixed reference to android-library for mvn update
David A. Velasco [Fri, 12 Sep 2014 11:01:27 +0000 (13:01 +0200)]
Merge pull request #620 from LukeOwncloud/develop
Fix mvn build
jabarros [Fri, 12 Sep 2014 10:16:29 +0000 (12:16 +0200)]
Update owncloud library reference
Luke Owncloud [Fri, 12 Sep 2014 09:55:14 +0000 (11:55 +0200)]
fix mvn build. needs to go together with update of pom.xml of
owncloud-android-library.
jabarros [Fri, 12 Sep 2014 09:24:12 +0000 (11:24 +0200)]
Set the log folder path before starting logging
Jenkins for ownCloud [Fri, 12 Sep 2014 07:28:56 +0000 (03:28 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 11 Sep 2014 16:26:52 +0000 (18:26 +0200)]
Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity
David A. Velasco [Thu, 11 Sep 2014 15:18:54 +0000 (17:18 +0200)]
Fixed typo in strings.xml
jabarros [Thu, 11 Sep 2014 10:39:24 +0000 (12:39 +0200)]
Set maximum file size for logs and format logs info
jabarros [Thu, 11 Sep 2014 09:00:40 +0000 (11:00 +0200)]
Add delete history login and chang the date format in logs
jabarros [Thu, 11 Sep 2014 07:33:40 +0000 (09:33 +0200)]
Visualize both older and current log files info in the log history view and send both attached in the mail
Jenkins for ownCloud [Thu, 11 Sep 2014 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Wed, 10 Sep 2014 16:17:49 +0000 (18:17 +0200)]
Manage size of log file automatically, handling two log files with a maximun size
jabarros [Wed, 10 Sep 2014 06:59:52 +0000 (08:59 +0200)]
Remove unused code for accesing to log file from Preferences class
jabarros [Wed, 10 Sep 2014 06:49:41 +0000 (08:49 +0200)]
Change log messages for using our logger in all logs
jabarros [Wed, 10 Sep 2014 06:46:38 +0000 (08:46 +0200)]
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
jabarros [Tue, 9 Sep 2014 13:06:09 +0000 (15:06 +0200)]
Merge pull request #615 from owncloud/fast_account_selection
When an account is clicked, the app immediately shows its contents
David A. Velasco [Tue, 9 Sep 2014 12:50:53 +0000 (14:50 +0200)]
Changed title of settings activity to 'Settings'
David A. Velasco [Tue, 9 Sep 2014 11:52:06 +0000 (13:52 +0200)]
Merge pull request #614 from owncloud/ADFS_auth_support
ADFS IdPs support added to SAML authentication
jabarros [Tue, 9 Sep 2014 11:42:01 +0000 (13:42 +0200)]
Changes after CR
jabarros [Tue, 9 Sep 2014 11:17:41 +0000 (13:17 +0200)]
Merge branch 'develop' into ADFS_auth_support
Conflicts:
res/values/strings.xml
David A. Velasco [Tue, 9 Sep 2014 11:03:00 +0000 (13:03 +0200)]
FileUploader service checks existance of account when receives an upload request
David A. Velasco [Tue, 9 Sep 2014 10:23:09 +0000 (12:23 +0200)]
When an account is clicked, the app immediately shows its contents
Jenkins for ownCloud [Tue, 9 Sep 2014 05:13:38 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 7 Sep 2014 05:13:35 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 6 Sep 2014 05:13:43 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Fri, 5 Sep 2014 12:20:54 +0000 (14:20 +0200)]
Merge pull request #608 from owncloud/move_files_and_folders
Added capability to move files (and folders)
jabarros [Fri, 5 Sep 2014 10:08:37 +0000 (12:08 +0200)]
First changes for saving logs
Jenkins for ownCloud [Fri, 5 Sep 2014 05:13:41 +0000 (01:13 -0400)]
[tx-robot] updated from transifex
jabarros [Thu, 4 Sep 2014 16:23:39 +0000 (18:23 +0200)]
Changes after CR
projects / pub / Android / ownCloud.git / log