Commit graph

3579 commits

Author SHA1 Message Date
tobiasKaminsky
8c92889fa1 Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging 2015-07-22 20:15:14 +02:00
David A. Velasco
ff82b51e49 Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList
ShareWithMe icon in file list
2015-07-20 12:27:52 +02:00
purigarcia
f7211fe486 remove empty line 2015-07-20 12:20:15 +02:00
purigarcia
5cc79b0919 modify for the review 2015-07-20 12:18:44 +02:00
David A. Velasco
2c3d44f47e Merge pull request #1053 from owncloud/pincode_request_is_not_starting_when_rotating
Fixed: pass code request not restarted anymore when the device is rotated
2015-07-20 11:18:15 +02:00
purigarcia
c7817b9302 modify code to be simpler 2015-07-20 10:57:53 +02:00
Jenkins for ownCloud
1976dfe9a1 [tx-robot] updated from transifex 2015-07-20 01:14:05 -04:00
Jenkins for ownCloud
aab283a15b [tx-robot] updated from transifex 2015-07-18 01:14:06 -04:00
Jenkins for ownCloud
f173670351 [tx-robot] updated from transifex 2015-07-17 01:14:04 -04:00
Jenkins for ownCloud
48cd33ae2d [tx-robot] updated from transifex 2015-07-14 01:14:02 -04:00
Jenkins for ownCloud
05896ff491 [tx-robot] updated from transifex 2015-07-13 01:14:04 -04:00
Jenkins for ownCloud
00e6d45abb [tx-robot] updated from transifex 2015-07-12 01:14:02 -04:00
Jenkins for ownCloud
7bb1307a6b [tx-robot] updated from transifex 2015-07-11 01:14:06 -04:00
purigarcia
66fd64a0fc Merge branch 'develop' into pincode_request_is_not_starting_when_rotating 2015-07-10 08:53:03 +02:00
purigarcia
59a9bc8004 Merge branch 'develop' into shareWithYou_icon_in_fileList 2015-07-10 08:43:23 +02:00
Jenkins for ownCloud
1e08c40f31 [tx-robot] updated from transifex 2015-07-10 01:14:03 -04:00
purigarcia
066324f60a save the state before rotate 2015-07-09 16:40:29 +02:00
Jenkins for ownCloud
d32032fc96 [tx-robot] updated from transifex 2015-07-09 01:14:02 -04:00
purigarcia
a2ac8c19a3 shareByLink in folder in gridview is shown is shown 2015-07-08 18:18:51 +02:00
purigarcia
451513a35d in gridview in the folder, icons are not shown 2015-07-08 18:14:38 +02:00
purigarcia
0e95ee3e67 shareWithMe is shown in the file list 2015-07-08 17:41:41 +02:00
Jenkins for ownCloud
7623a8af61 [tx-robot] updated from transifex 2015-07-08 01:14:04 -04:00
masensio
629cff2d3f Merge branch 'master' into develop 2015-07-07 13:15:35 +02:00
masensio
174fa1f36b delete values-tzl 2015-07-07 10:41:22 +02:00
masensio
21ec36e39f Merge branch 'release-1.7.2' 2015-07-06 13:55:36 +02:00
masensio
b80b1c93b7 Update library reference 2015-07-06 13:53:18 +02:00
masensio
a4144dd462 Update CHANGELOG.MD 2015-07-06 11:48:52 +02:00
Jenkins for ownCloud
cfe5b84573 [tx-robot] updated from transifex 2015-07-05 01:14:02 -04:00
Jenkins for ownCloud
d762a8747b [tx-robot] updated from transifex 2015-07-03 01:15:16 -04:00
David A. Velasco
6c1fba9872 Fixed SAML SSO 2015-07-02 14:03:12 +02:00
David A. Velasco
0f0e210d69 Fixed title in action bar when user clicks on upload notification in progress / failed 2015-07-02 13:03:48 +02:00
David A. Velasco
04d4be82cb Fixed condition to browse up when current file shown is uploading for first time or a failed upload 2015-07-02 12:08:36 +02:00
Jenkins for ownCloud
491e8a0bb3 [tx-robot] updated from transifex 2015-07-01 01:14:53 -04:00
Jenkins for ownCloud
eaf860d7c1 [tx-robot] updated from transifex 2015-06-30 01:13:52 -04:00
Jenkins for ownCloud
9ab961aa88 [tx-robot] updated from transifex 2015-06-29 01:13:34 -04:00
Jenkins for ownCloud
93b6c37400 [tx-robot] updated from transifex 2015-06-28 01:13:41 -04:00
tobiasKaminsky
57991cb8c4 revert previous commit 2015-06-27 21:48:34 +02:00
tobiasKaminsky
ddb1e41753 enabling video thumbnails 2015-06-27 21:16:03 +02:00
Jenkins for ownCloud
24c564ab5f [tx-robot] updated from transifex 2015-06-27 01:13:58 -04:00
David A. Velasco
bded939b5e Fixed bug in access to same folder than last time when a file is shared with OC to upload 2015-06-26 09:07:51 +02:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
masensio
51026a0058 Merge pull request #1027 from owncloud/auto_grid_only_with_all_pictures
Auto grid only in folders with only pictures and server with remote thumbnails support
2015-06-25 13:29:50 +02:00
masensio
2019719108 Update library reference 2015-06-25 12:57:12 +02:00
masensio
a818aaca47 Fixed upload of files into non-root folders
Fixed condition selecting grid or list mode - at least an image!
2015-06-25 09:13:37 +02:00
David A. Velasco
907e63a103 Replaced constructor with parameter in FileDetailsFragment with static method and setArguments 2015-06-25 09:10:49 +02:00
David A. Velasco
51a04aa541 Refactored extractions of server version from AccountManager through
AccountUtils; fixed line lengths and some warnings
2015-06-25 09:10:48 +02:00
David A. Velasco
1a3a150248 Automatic grid view is only enabled if server supports remote thumbnails and ALL the files in a folder are images 2015-06-25 09:10:47 +02:00
Jenkins for ownCloud
b4c217b505 [tx-robot] updated from transifex 2015-06-25 01:13:56 -04:00
Jenkins for ownCloud
4aed07aae1 [tx-robot] updated from transifex 2015-06-24 01:13:55 -04:00
masensio
378b28f346 Update some file icons 2015-06-23 14:50:02 +02:00