Commit graph

832 commits

Author SHA1 Message Date
David A. Velasco
5781090e2b Merge branch 'release-1.4.1' 2013-06-26 18:10:10 +02:00
David A. Velasco
04803ae879 Fixed false error message and lack of recheck when a server certificate is explicitly accepted by the user in the login view 2013-06-26 12:45:35 +02:00
David A. Velasco
77428a495b Merge branch 'fixed_update_of_action_bar_in_successful_rename' into release-1.4.1 2013-06-26 12:23:22 +02:00
David A. Velasco
646abfa08d Fixed update of action bar in successful rename 2013-06-26 11:47:20 +02:00
David A. Velasco
58733dfa12 Generated serialVersionUIDs updated 2013-06-26 09:23:53 +02:00
David A. Velasco
f63c4ad77a Version bump: 1.4.1 2013-06-26 09:17:53 +02:00
David A. Velasco
0f2a7475b1 Disabled logging options until fixed 2013-06-26 09:13:28 +02:00
David A. Velasco
863f3f68d2 Merge pull request #197 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_already_existing
Fixed crash due to uploads to accounts not already existing
2013-06-25 23:51:58 -07:00
Jenkins for ownCloud
3c00f08041 [tx-robot] updated from transifex 2013-06-24 01:30:18 +02:00
Jenkins for ownCloud
52879c3be8 [tx-robot] updated from transifex 2013-06-22 01:42:24 +02:00
Jenkins for ownCloud
8f2c041687 [tx-robot] updated from transifex 2013-06-21 08:37:31 +02:00
Jenkins for ownCloud
b7d491ef97 [tx-robot] updated from transifex 2013-06-20 01:20:28 +02:00
David A. Velasco
63a3522ab7 Merge branch 'develop'after SPRINT-002
Conflicts:
	.classpath
2013-06-19 17:56:46 +02:00
David A. Velasco
5e49cadb2a Merge remote-tracking branch 'origin/develop' into develop 2013-06-19 17:03:13 +02:00
David A. Velasco
5dc43aab3c Merge pull request #186 from owncloud/fixed_contradicted_messages_in_login_view
Fixed contradicted messages in login view
2013-06-19 08:02:50 -07:00
David A. Velasco
0c7f1af8d0 Merge branch 'fixed_contradicted_messages_in_login_view' into develop 2013-06-19 12:17:16 +02:00
David A. Velasco
d612f37de4 'Refresh' options in menus differentiated: 'refresh file' and 'refresh account' 2013-06-18 15:04:45 +02:00
David A. Velasco
19bcc99538 Fixed: details about progress are shown when the notification of an upload is clicked 2013-06-18 14:59:36 +02:00
David A. Velasco
6ca1e170f7 Fixed crash, error notified instead 2013-06-18 14:04:51 +02:00
David A. Velasco
c4ac05dee2 REFACTORING: moved AccountUtils to .authentication package 2013-06-18 11:34:08 +02:00
Jenkins for ownCloud
9d24b7ca53 [tx-robot] updated from transifex 2013-06-18 01:38:06 +02:00
masensio
0fac67fcd0 Merge pull request #140 from owncloud/folderSizeInfo
Issue #28 folders don't show date and size info
2013-06-17 04:34:59 -07:00
masensio
90428ec4c7 Merge remote-tracking branch 'origin/develop' into folderSizeInfo
Conflicts:
	.classpath
	tests/.classpath
2013-06-17 13:32:40 +02:00
David A. Velasco
a65b73a972 Merge pull request #178 from owncloud/login_smart_clip_of_URL_suffix
OC-208: suffix remote.php/webdav. OC-34
2013-06-17 03:07:32 -07:00
Jenkins for ownCloud
23ddf7aec2 [tx-robot] updated from transifex 2013-06-16 01:35:15 +02:00
Jenkins for ownCloud
a3bcaeb3b5 [tx-robot] updated from transifex 2013-06-15 01:35:24 +02:00
Jenkins for ownCloud
5882a655c6 [tx-robot] updated from transifex 2013-06-14 02:17:56 +02:00
Jenkins for ownCloud
6d2deaa2dc [tx-robot] updated from transifex 2013-06-13 01:37:58 +02:00
Jenkins for ownCloud
95575d0a14 [tx-robot] updated from transifex 2013-06-12 18:02:10 +02:00
masensio
cf0c96b200 Merge pull request #180 from owncloud/direct_download_with_click_at_list
Direct download with click at list
2013-06-12 02:48:29 -07:00
David A. Velasco
02d08d0f81 Merge branch 'develop' into direct_download_with_click_at_list 2013-06-12 11:47:18 +02:00
David A. Velasco
9aa69ac474 Merge pull request #177 from owncloud/login_view_layout_improvements
Login view layout improvements
2013-06-12 02:16:08 -07:00
David A. Velasco
8dfd6955a4 Merge remote-tracking branch 'origin/master' 2013-06-12 09:40:06 +02:00
David A. Velasco
0ab729b8c1 Fixed Eclipse classpath file for ADT r22 2013-06-12 09:38:00 +02:00
David A. Velasco
2a96c27e3a Fixed bad replace tokens 2013-06-12 09:37:08 +02:00
David A. Velasco
5bd3fd6273 Fixed bad replace tokens and removed unnecessary quote 2013-06-12 09:36:38 +02:00
Jenkins for ownCloud
3791d39ab2 [tx-robot] updated from transifex 2013-06-12 02:15:52 +02:00
masensio
8f64354d72 OC-208: Changes from comments 2013-06-11 10:46:21 +02:00
Jenkins for ownCloud
b8497334fa [tx-robot] updated from transifex 2013-06-11 01:38:57 +02:00
David A. Velasco
782186f5b1 Removed 'download' and 'open with' options from contextual menu in list of files 2013-06-10 14:21:24 +02:00
David A. Velasco
64bbf07d97 OC-299 fixed restart of finished downloads on orientation changes 2013-06-10 13:52:24 +02:00
masensio
472b6b48bf Merge OC-297 2013-06-10 13:19:11 +02:00
masensio
9f20cc45cc OC-297: Refresh button in changing orientation. OC-65 2013-06-10 13:06:46 +02:00
David A. Velasco
30ab377413 Server or connection errors in authorization require handled as in server check 2013-06-10 12:51:48 +02:00
masensio
883e1b1674 OC-208: suffix remote.php/webdav. OC-34 2013-06-10 09:01:39 +02:00
Jenkins for ownCloud
cb9d10d24b [tx-robot] updated from transifex 2013-06-10 01:33:05 +02:00
Jenkins for ownCloud
0cb5c5df78 [tx-robot] updated from transifex 2013-06-08 01:29:21 +02:00
Jenkins for ownCloud
c372145296 [tx-robot] updated from transifex 2013-06-07 13:23:32 +02:00
David A. Velasco
3f209d42fb Merge branch 'login_view_layout_improvements' into fixed_contradicted_messages_in_login_view 2013-06-07 12:22:31 +02:00
Jenkins for ownCloud
2f27206360 [tx-robot] updated from transifex 2013-06-07 01:36:11 +02:00