Commit graph

1486 commits

Author SHA1 Message Date
David A. Velasco
5034e44599 Merge remote-tracking branch 'origin/develop' into develop 2014-02-04 08:33:23 +01:00
Mr. Jenkins
1b5320094e [tx-robot] updated from transifex 2014-02-04 01:13:58 -05:00
Mr. Jenkins
30663bbc2d [tx-robot] updated from transifex 2014-02-02 01:15:19 -05:00
Mr. Jenkins
f25faf6c50 [tx-robot] updated from transifex 2014-01-30 01:14:45 -05:00
David A. Velasco
f02bfbdd67 Merge pull request #354 from LukeOwncloud/added_more_git_notes_to_setup_md
Added more git notes to setup md
2014-01-29 09:20:35 -08:00
David A. Velasco
d13635fc19 Updating link to ownCloud library 2014-01-29 18:02:57 +01:00
masensio
adb0782aec Merge pull request #366 from owncloud/bug_handling_failure_in_request_for_remote_username
Bug handling failure in request for remote username
2014-01-29 08:52:21 -08:00
David A. Velasco
3a02de8c90 Adapted ownCloud app to changes in ownCloud library interface 2014-01-29 17:36:44 +01:00
David A. Velasco
2bf9af5683 Merge remote-tracking branch 'origin/develop' into bug_handling_failure_in_request_for_remote_username 2014-01-29 12:56:37 +01:00
David A. Velasco
5db7b8e6f6 Report an error to the user in log in view when the access to the user name in the server fails 2014-01-29 12:51:48 +01:00
Mr. Jenkins
edd4d07ac0 [tx-robot] updated from transifex 2014-01-29 01:19:51 -05:00
Mr. Jenkins
b6a500fc68 [tx-robot] updated from transifex 2014-01-28 02:19:06 -05:00
masensio
5ca133c5e4 Submodule Library updated 2014-01-27 12:38:56 +01:00
masensio
af87d2bb52 Merge pull request #360 from owncloud/oc_framework_cleanup_and_documentation
Oc framework cleaned up and moved out
2014-01-27 01:14:01 -08:00
Mr. Jenkins
d5d8f3fb22 [tx-robot] updated from transifex 2014-01-27 02:19:06 -05:00
Luke Owncloud
0a2656b723 correction 2014-01-25 14:50:15 +01:00
Luke Owncloud
31ee75752c added howto use git to issue a second PR 2014-01-25 06:23:46 +01:00
Luke Owncloud
5f34f75324 added howto use git to issue a second PR (when local/develop is "dirty") 2014-01-25 06:20:02 +01:00
David A. Velasco
1136e35dbf Updated owncloud library 2014-01-24 14:40:13 +01:00
David A. Velasco
d3ad9a4482 Fixed bug preventing that right modification time is saved in downloads 2014-01-24 14:22:05 +01:00
David A. Velasco
195256194e Fixed crash in synchronization of kept-in-sync files triggered by browsing 2014-01-23 12:37:01 +01:00
Mr. Jenkins
a09ec0eee9 [tx-robot] updated from transifex 2014-01-23 01:14:28 -05:00
David A. Velasco
1a3f202ac8 Fixed wrong index to substring 2014-01-22 18:39:34 +01:00
David A. Velasco
85809fc2d2 Fixed file name shown in the upload and download notifications (not full path) 2014-01-22 18:36:52 +01:00
David A. Velasco
1dc2118934 Merge branch 'release-1.5.3' into oc_framework_cleanup_and_documentation 2014-01-22 10:29:36 +01:00
David A. Velasco
8592c315eb Merge branch 'develop' into release-1.5.3 2014-01-22 10:26:19 +01:00
David A. Velasco
de367c009a Updated scrips files to setup environment 2014-01-22 10:16:53 +01:00
David A. Velasco
7fdaa2b0cb owncloud-android-library submodule updated 2014-01-22 09:41:31 +01:00
Mr. Jenkins
4f84c74d1f [tx-robot] updated from transifex 2014-01-22 01:14:29 -05:00
David A. Velasco
ff62abf9e9 Removed oc_framework from current project 2014-01-21 15:06:57 +01:00
David A. Velasco
f2d44f42d9 ownCloud app linked to owncloud-android-library in its new location as submodule 2014-01-21 15:03:36 +01:00
David A. Velasco
da0063232a Oc_framework, now owncloud-android-library, included as a submodule 2014-01-21 14:53:00 +01:00
David A. Velasco
8e2c944e4d Version up for JB workaround-app: 1.0.12 2014-01-21 14:44:16 +01:00
David A. Velasco
30198bb105 App version up: 1.5.3 2014-01-21 14:41:46 +01:00
David A. Velasco
6d5949b0a2 Added app icon for xhdpi 2014-01-21 14:30:33 +01:00
David A. Velasco
1e68dccd8b Library updated with final names (project and packages) 2014-01-20 11:59:41 +01:00
David A. Velasco
ea2e3ec92e Fixed sample client to load oc_framework library with no need to include the JAR files manually 2014-01-20 10:53:07 +01:00
David A. Velasco
3f4e615d5e Merge branch 'develop' into oc_framework_cleanup_and_documentation 2014-01-20 09:24:44 +01:00
David A. Velasco
1fd16efe79 Merge remote-tracking branch 'origin/oc_framework_cleanup_and_documentation' into oc_framework_cleanup_and_documentation 2014-01-20 09:24:12 +01:00
David A. Velasco
8cf7a1c3db Merge pull request #347 from owncloud/refactor_remote_saml_authentication
Refactored remote saml authentication
2014-01-20 00:10:54 -08:00
David A. Velasco
f601a31b50 Removed excess comma 2014-01-20 09:09:59 +01:00
Mr. Jenkins
69743392f1 [tx-robot] updated from transifex 2014-01-20 01:14:27 -05:00
Mr. Jenkins
6483c8b913 [tx-robot] updated from transifex 2014-01-19 01:14:31 -05:00
Mr. Jenkins
61f53ad160 [tx-robot] updated from transifex 2014-01-18 01:14:30 -05:00
masensio
1d70ae81ea OC-2640: Fix Bug: Log in screen disappear when trying to log in again with the same user 2014-01-17 15:12:12 +01:00
masensio
b79383d131 OC-2633: Fixes for comments in code. PR #347 2014-01-17 14:25:38 +01:00
masensio
5581bd9c11 Merge branch 'develop' into refactor_remote_saml_authentication 2014-01-17 14:20:14 +01:00
masensio
10dac35232 OC-2633: Fixes for comments in code. PR #347 2014-01-17 14:20:00 +01:00
Mr. Jenkins
2f5806da44 [tx-robot] updated from transifex 2014-01-17 01:14:30 -05:00
masensio
1c6fcdb372 OC-2534: Review library name and copyright 2014-01-16 18:36:35 +01:00