mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
6346 commits 221 branches 1589 tags 640 MiB
Commit graph

2528 commits

Author SHA1 Message Date
AndyScherzinger
9efa7de760
fix synced folder settings dialog theming + code cleanup 2016-10-24 15:52:16 +02:00
AndyScherzinger
85b2223d09
fix copyright note 2016-10-24 15:24:00 +02:00
AndyScherzinger
faea2f01fb
dynamic media grid width sizing and revampedd instant upload icon 2016-10-24 15:21:00 +02:00
tobiasKaminsky
95fb6c451a enlarged icon 2016-10-20 22:01:33 +02:00
AndyScherzinger
e053caf4ff
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-19 18:23:57 +02:00
Andy Scherzinger
8ace0d0d11 Merge pull request #328 from apicellaj/master 
add preference to show hidden files
 2016-10-19 17:17:06 +02:00
Nextcloud bot
28299dfd4c
[tx-robot] updated from transifex 2016-10-18 00:32:50 +00:00
Nextcloud bot
41934d6e6c
[tx-robot] updated from transifex 2016-10-17 00:32:49 +00:00
Nextcloud bot
feacbaf69b
[tx-robot] updated from transifex 2016-10-15 00:32:52 +00:00
Nextcloud bot
e3a3f26e6b
[tx-robot] updated from transifex 2016-10-14 00:32:49 +00:00
Joe Apicella
41d1aff589 add preference to show hidden files 2016-10-12 17:35:47 -07:00
AndyScherzinger
0889f8a69e
grid spacing added + negative/shortened margins for containers for nice image grids 2016-10-13 02:00:49 +02:00
Nextcloud bot
ae397fd94d
[tx-robot] updated from transifex 2016-10-12 00:32:53 +00:00
AndyScherzinger
52fdc316d6
better empty message 2016-10-10 22:02:54 +02:00
Nextcloud bot
a26b46bb45
[tx-robot] updated from transifex 2016-10-10 00:32:52 +00:00
AndyScherzinger
e1273ee86d
ellipsizing 2016-10-09 23:30:23 +02:00
AndyScherzinger
b557b0762c
remote folder can now be changed, all config changes for a synced folder are now saved 2016-10-09 23:27:30 +02:00
AndyScherzinger
5214659b05
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-09 18:42:15 +02:00
Andy Scherzinger
d1e1884366 Merge pull request #319 from divayprakash/divayprakash/fix 
Move magic numbers in layout files to @dims
 2016-10-09 17:49:53 +02:00
Nextcloud bot
03ce54d757
[tx-robot] updated from transifex 2016-10-09 00:32:46 +00:00
Nextcloud bot
8a88801848
[tx-robot] updated from transifex 2016-10-08 00:32:46 +00:00
Divay Prakash
2135b13b97
Fix error in share_file_layout_text_size value #12 2016-10-07 22:01:28 +05:30
Divay Prakash
cbbea085cb
Fix errors with float values #12 2016-10-07 21:57:08 +05:30
Divay Prakash
344980a1f0
Clean up dims.xml 2016-10-07 07:33:20 +05:30
Divay Prakash
f48b0b074d
Fix magic numbers in uploader_list_item_layout.xml #12 2016-10-07 07:32:11 +05:30
Divay Prakash
db3f069d1e
Fix magic numbers in upload_list_layout.xml #12 2016-10-07 07:29:48 +05:30
Divay Prakash
d736536547
Fix magic numbers in upload_list_item.xml #12 2016-10-07 07:29:16 +05:30
Divay Prakash
a3ddb28692
Fix magic numbers in upload_list_group.xml #12 2016-10-07 07:23:32 +05:30
Divay Prakash
918bdd53e7
Fix magic numbers in upload_files_layout.xml #12 2016-10-07 07:22:48 +05:30
Divay Prakash
c02383bfed
Fix magic numbers in toolbar_standard.xml #12 2016-10-07 07:21:54 +05:30
Divay Prakash
0564e69836
Fix magic numbers in ssl_validator_layout.xml #12 2016-10-07 07:20:52 +05:30
Divay Prakash
544aa3997a
Fix magic numbers in ssl_untrusted_cert_layout.xml #12 2016-10-07 07:17:29 +05:30
Divay Prakash
2a782e7b2e
Fix magic numbers in simple_dialog_list_item.xml #12 2016-10-07 07:11:20 +05:30
Divay Prakash
2347018221
Fix magic numbers in share_user_item.xml #12 2016-10-07 07:09:27 +05:30
Divay Prakash
df77b299ee
Fix magic numbers in share_file_layout.xml #12 2016-10-07 07:07:40 +05:30
Divay Prakash
c8989afb66
Fix magic numbers in search_users_groups_layout.xml #12 2016-10-07 07:04:17 +05:30
Divay Prakash
b7e6c287c9
Fix magic numbers in preview_image_fragment.xml #12 2016-10-07 07:01:13 +05:30
Divay Prakash
7fe5e744eb
Fix magic numbers in preview_image_activity.xml #12 2016-10-07 06:59:22 +05:30
Divay Prakash
ce9df17acc
Fix magic numbers in popup.xml #12 2016-10-07 06:58:41 +05:30
Divay Prakash
7d7b9cfbc6
Fix magic numbers in passcodelock.xml #12 2016-10-07 06:55:10 +05:30
Divay Prakash
41fab305bd
Fix magic numbers in participate_layout.xml #12 2016-10-07 06:54:12 +05:30
Divay Prakash
3c698a7b39
Fix magic numbers in notification_with_progress_bar.xml #12 2016-10-07 06:50:46 +05:30
Divay Prakash
8dcbd21473
Fix magic numbers in media_control.xml #12 2016-10-07 06:45:34 +05:30
Divay Prakash
213574f805
Fix magic numbers in log_send_file.xml #12 2016-10-07 06:42:32 +05:30
Divay Prakash
1e95835491
Fix magic numbers in log_item.xml #12 2016-10-07 06:41:46 +05:30
Divay Prakash
f2b0fb91c0
Fix magic numbers in listrow_group.xml #12 2016-10-07 06:40:35 +05:30
Divay Prakash
f425d294c3
Fix magic numbers in listrow_details.xml #12 2016-10-07 06:39:21 +05:30
Divay Prakash
75a2cc8e43
Fix magic numbers in list_item.xml #12 2016-10-07 06:38:34 +05:30
Divay Prakash
ff83ba0f4d
Fix magic numbers in list_fragment_expandable.xml #12 2016-10-07 06:33:57 +05:30
Divay Prakash
4f04626359
Fix magic numbers in list_fragment.xml #12 2016-10-07 06:32:45 +05:30
Divay Prakash
eb7b8e4a85
Fix magic numbers in grid_item.xml #12 2016-10-07 06:29:07 +05:30
Divay Prakash
b269c80210
Fix magic numbers in grid_image.xml #12 2016-10-07 06:22:23 +05:30
Divay Prakash
335d140b58
Fix magic numbers in generic_explanation.xml #12 2016-10-07 06:17:46 +05:30
Divay Prakash
4e83a10911
Fix magic numbers in files_folder_picker.xml #12 2016-10-07 06:16:04 +05:30
Divay Prakash
ac953734ca
Fix magic numbers in files.xml #12 2016-10-07 06:15:01 +05:30
Divay Prakash
8ada1d18b7
Fix magic numbers in file_preview.xml #12 2016-10-07 06:13:03 +05:30
Divay Prakash
028b934c0b
Fix magic numbers in file_download_fragment.xml #12 2016-10-07 06:11:34 +05:30
Divay Prakash
26163aac78
Fix magic numbers in file_details_fragment.xml #12 2016-10-07 06:06:54 +05:30
Divay Prakash
ec2bfa556e
Fix magic numbers in file_actions.xml #12 2016-10-07 06:02:52 +05:30
Nextcloud bot
3fef03f078
[tx-robot] updated from transifex 2016-10-07 00:32:49 +00:00
Divay Prakash
c232e0580e
Fix magic numbers in edit_share_layout.xml #12 2016-10-07 06:01:17 +05:30
Divay Prakash
6e9c541680
Fix magic numbers in drawer_header.xml #12 2016-10-07 05:56:12 +05:30
Divay Prakash
457a9f8327 Fix magic numbers in drawer_header.xml #12 2016-10-07 05:43:20 +05:30
Divay Prakash
5902dd12d4 Fix magic numbers in activity_row.xml #12 2016-10-07 05:42:15 +05:30
Divay Prakash
cce9a9c542 Update dimen in action_item.xml #12 2016-10-07 05:42:03 +05:30
Divay Prakash
adf1def920
Fix magic numbers in action_item.xml #12 2016-10-07 05:11:39 +05:30
Divay Prakash
824bf88768
Fix magic numbers in account_layout.xml #12 2016-10-07 05:09:51 +05:30
Divay Prakash
faca8ff819
Fix magic numbers in land/account_setup.xml #12 2016-10-07 05:04:36 +05:30
Divay Prakash
4bd89dc626
Fix magic numbers in account_setup.xml #12 2016-10-07 04:58:38 +05:30
Divay Prakash
e7114a2c35
Fix magic numbers in account_item.xml #12 2016-10-07 04:42:22 +05:30
Divay Prakash
1da94ff82a
Fix magic numbers in account_action.xml #12 2016-10-07 04:33:53 +05:30
AndyScherzinger
ccb16b7cc4
initial wip implementation of config element click listeners 2016-10-06 23:22:56 +02:00
AndyScherzinger
4796633bcd
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-06 22:47:02 +02:00
Tobias Kaminsky
7525088db2 Merge pull request #301 from apicellaj/master 
add grid view option when choosing a file from within the app
 2016-10-06 20:29:21 +02:00
AndyScherzinger
c4c1b6b450
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-06 20:02:49 +02:00
AndyScherzinger
b607a770f2
minor layout optimization 2016-10-06 18:25:23 +02:00
AndyScherzinger
d7f461a0f0
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders 2016-10-06 10:17:50 +02:00
Andy Scherzinger
25a7b6ed48
downgrade to only support cloud://login 2016-10-06 09:08:11 +02:00
Andy Scherzinger
5977fed28d
MagicUrls for Login + Unit tests for the parser 2016-10-06 09:08:10 +02:00
Nextcloud bot
ab6e0019e7
[tx-robot] updated from transifex 2016-10-06 00:32:49 +00:00
Tobias Kaminsky
8bd58a24ea Merge pull request #293 from nextcloud/wordingDavdroid 
change wordings for davdroid integration
 2016-10-05 19:24:33 +02:00
Nextcloud bot
05a2583259
[tx-robot] updated from transifex 2016-10-05 00:32:48 +00:00
tobiasKaminsky
28053a4612
change wordings for davdroid integration 2016-10-04 14:00:42 +02:00
Nextcloud bot
e8f5c57329
[tx-robot] updated from transifex 2016-10-03 00:33:13 +00:00
Nextcloud bot
953c0dd5c5
[tx-robot] updated from transifex 2016-10-02 00:33:02 +00:00
Joe Apicella
2b2916a49a add grid view option when choosing a file from within the app 2016-10-01 16:03:59 -07:00
Nextcloud bot
1f7b8418e3
[tx-robot] updated from transifex 2016-10-01 00:32:53 +00:00
Nextcloud bot
b71243ea8f
[tx-robot] updated from transifex 2016-09-30 00:32:45 +00:00
Andy Scherzinger
17b9eaed96 initial code to read (yet empty DB) and display settings screen (non-functional yet) 2016-09-30 01:27:50 +02:00
Andy Scherzinger
a1931ed9a5 layout tweaking, better listener support, loading visualization 2016-09-29 10:54:32 +02:00
Andy Scherzinger
6369364fa9 initial link of menu buttons 2016-09-29 10:54:32 +02:00
Andy Scherzinger
ef53c97bda proper thumbnails, image counter, darkening etc. 2016-09-29 10:54:32 +02:00
Andy Scherzinger
0e6d3951fb initial v1 for grid view 2016-09-29 10:54:32 +02:00
Andy Scherzinger
20dbdb872f initial add for recycler view implementation with headers (WIP) 2016-09-29 10:54:32 +02:00
Andy Scherzinger
2334e066ef sync config icons 2016-09-29 10:54:32 +02:00
Andy Scherzinger
61244d0d8e header fix 2016-09-29 10:54:32 +02:00
Andy Scherzinger
cf4498d17c initial navigation setup for menu and activity 2016-09-29 10:54:32 +02:00
Nextcloud bot
3f51da330d
[tx-robot] updated from transifex 2016-09-28 00:33:42 +00:00
Nextcloud bot
5192b0fd94
[tx-robot] updated from transifex 2016-09-27 00:33:47 +00:00
Nextcloud bot
61f0ca910d
[tx-robot] updated from transifex 2016-09-26 00:33:49 +00:00
Nextcloud bot
20af74b586
[tx-robot] updated from transifex 2016-09-24 00:33:47 +00:00
Nextcloud bot
cc16a0904a
[tx-robot] updated from transifex 2016-09-23 00:33:51 +00:00
Nextcloud bot
aa2b597eda
[tx-robot] updated from transifex 2016-09-22 00:33:50 +00:00
Morris Jobke
aba0071b1a Merge pull request #278 from nextcloud/noUploadFailureNotificationForDeletedFiles 
Don't show upload failed notification for already deleted files
 2016-09-20 18:18:19 +02:00
Andy Scherzinger
4819ba6174 remove un used string 2016-09-20 17:15:45 +02:00
Nextcloud bot
4c91eac465
[tx-robot] updated from transifex 2016-09-20 15:02:41 +00:00
Andy Scherzinger
f4036c52b4 fix CR 2016-09-18 16:11:01 +02:00
Andy Scherzinger
193f9a19c4 hide menu items in overflow menu in CAB 2016-09-18 16:00:29 +02:00
tobiasKaminsky
9d10864a87 change caption for move and copy action 2016-09-17 18:10:33 +02:00
Nextcloud bot
493e96a80a
[tx-robot] updated from transifex 2016-09-14 14:23:52 +00:00
Nextcloud bot
b895e8e84e
[tx-robot] updated from transifex 2016-09-14 00:33:57 +00:00
Nextcloud bot
4fa9820274
[tx-robot] updated from transifex 2016-09-13 00:33:46 +00:00
Nextcloud bot
7dfc7d0cd3
[tx-robot] updated from transifex 2016-09-12 00:33:46 +00:00
Nextcloud bot
4a2915eeaa
[tx-robot] updated from transifex 2016-09-11 00:33:45 +00:00
Andy Scherzinger
fa23f001d9 fix strings.xml 2016-09-10 13:57:22 +02:00
Andy Scherzinger
be08193007 show toast if davdroid sync has been setup successfully 2016-09-10 13:53:49 +02:00
Andy Scherzinger
4533d5f47f move setup call to settings screen 2016-09-10 13:53:49 +02:00
Andy Scherzinger
2845cf521a wip davdroid login launch 2016-09-10 13:53:49 +02:00
Nextcloud bot
3a86b88eb1
[tx-robot] updated from transifex 2016-09-10 00:33:50 +00:00
Tobias Kaminsky
71f6cf0001 Merge pull request #246 from nextcloud/130rcBugfix 
1.3.0 RC Bugfixes
 2016-09-09 17:58:12 +02:00
Andy Scherzinger
1ad35b92fa linebreak 2016-09-09 12:24:50 +02:00
Andy Scherzinger
67386e3afc added line break 2016-09-09 12:16:19 +02:00
Nextcloud bot
7bfe31eabf
[tx-robot] updated from transifex 2016-09-09 00:33:48 +00:00
Andy Scherzinger
166081ed9e shorten translate text 2016-09-08 13:38:20 +02:00
Andy Scherzinger
34c186bd8c added transifex hint for translations 2016-09-08 13:34:54 +02:00
Andy Scherzinger
d1fdbe44b0 fixed layouting for participate text 2016-09-08 10:29:59 +02:00
Andy Scherzinger
1b3bdc3eb8 consistent wording for upload options --> folder 2016-09-08 10:29:59 +02:00
Andy Scherzinger
db291cdf87 improve layouting and texts for upload behavior #26 2016-09-08 10:29:59 +02:00
Andy Scherzinger
9a36b3508f bugfix layouting and issue reporting button click 2016-09-08 10:29:59 +02:00
Andy Scherzinger
f8108b2162 Bugfix report GH issue button click 2016-09-08 10:29:59 +02:00
Nextcloud bot
3f469c6b45
[tx-robot] updated from transifex 2016-09-08 00:33:53 +00:00
Nextcloud bot
7af508a4e4
[tx-robot] updated from transifex 2016-09-07 00:33:40 +00:00
Andy Scherzinger
07f5d9546e revamped participation activity content based on the feedback 2016-09-06 19:36:02 +02:00
Andy Scherzinger
660e5a8923 fix for triggering the main drawer menu items from "participate", changed participate icon and checkable behavior, don't show settings etc when showing accounts 2016-09-06 17:25:57 +02:00
Andy Scherzinger
7f200c5f1a participate icon 2016-09-06 17:25:57 +02:00
Andy Scherzinger
aac14ed031 slight whitespace optimizations in accordance with material design guidelines 2016-09-06 17:25:57 +02:00
tobiasKaminsky
f75f8e5ca3 fix wrong new line 2016-09-06 17:25:57 +02:00
tobiasKaminsky
c206c944bc links are now extracted to setup.xml 2016-09-06 17:25:57 +02:00
tobiasKaminsky
a24f89be16 wip 2016-09-06 17:25:57 +02:00
Andy Scherzinger
fe357bb35b small layout optimizations 2016-09-06 16:58:41 +02:00
Andy Scherzinger
e45816a5ed fix string arrays, so n.o. elements doesn't depend on translation status, make upload spinner translatable 2016-09-06 16:17:14 +02:00
tobiasKaminsky
1ad97d9ff7 move / copy updated 2016-09-06 14:46:03 +02:00
Andy Scherzinger
b8905bdb32 minor code reformattings and cleanup 2016-09-06 14:04:28 +02:00
tobiasKaminsky
90f582105f show compatibility warning 2016-09-06 10:36:07 +02:00
tobiasKaminsky
1ace509e4f wip 2016-09-06 10:36:07 +02:00
Nextcloud bot
69c801206c
[tx-robot] updated from transifex 2016-09-06 00:33:48 +00:00
Nextcloud bot
bb62f9d404
[tx-robot] updated from transifex 2016-09-05 00:33:50 +00:00
Andy Scherzinger
32be5dfeb3 Merge pull request #171 from nextcloud/uploadWhenCharging 
Upload when charging
 2016-09-04 19:12:44 +02:00
Nextcloud bot
c1f6eb082a
[tx-robot] updated from transifex 2016-09-04 00:33:48 +00:00
Tobias Kaminsky
be6f189f30 Merge pull request #235 from nextcloud/fixRemoteFolderSize 
Restore display of remote folder size
 2016-09-03 20:26:08 +02:00
tobiasKaminsky
77f9902f17 Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-09-03 20:10:51 +02:00
Nextcloud bot
d75f5e7bfc
[tx-robot] updated from transifex 2016-09-03 00:33:49 +00:00
Nextcloud bot
14846586b8
[tx-robot] updated from transifex 2016-09-02 00:33:53 +00:00
Andy Scherzinger
70e8f62581 Added 'Pending' placeholder for still-unknown size of incoming federated folders 2016-09-01 14:42:55 +02:00
Andy Scherzinger
303b05a3a6 Merge pull request #204 from nextcloud/quotaDisplay 
Display quota if configured/available in navigation drawer
 2016-09-01 11:03:14 +02:00
Nextcloud bot
2326d4b32a
[tx-robot] updated from transifex 2016-09-01 00:34:00 +00:00
Andy Scherzinger
457027a196 fixed the background color 2016-08-18 15:55:11 +02:00
Andy Scherzinger
0f80bdc894 CR changes 2016-08-18 15:55:11 +02:00
Andy Scherzinger
5280d66139 colorize quota progress bar depending on thresholds met, reformattings 2016-08-18 15:55:11 +02:00
Andy Scherzinger
f8e0ee9ce1 initial quota display implementation 2016-08-18 15:55:11 +02:00
Andy Scherzinger
e790d4a520 initial layout changes for in drawer quota display 2016-08-18 15:55:11 +02:00
Nextcloud bot
c2f3519648
[tx-robot] updated from transifex 2016-08-17 00:33:47 +00:00
Andy Scherzinger
aa98938a55 textfile --> text file 2016-08-16 11:58:42 +02:00
tobiasKaminsky
993264c8b1 wip 2016-08-16 11:58:42 +02:00
Andy Scherzinger
1c874aafec add background image to drawer header 2016-08-14 22:32:41 +02:00
Nextcloud bot
53c360e149
[tx-robot] updated from transifex 2016-08-12 00:33:49 +00:00
Nextcloud bot
283b5cb77b
[tx-robot] updated from transifex 2016-08-09 00:33:50 +00:00
Nextcloud bot
ffd198dc79
[tx-robot] updated from transifex 2016-08-06 00:33:48 +00:00
Nextcloud bot
f0e1f77fc0
[tx-robot] updated from transifex 2016-08-05 00:33:49 +00:00
Nextcloud bot
6e78cc7e33
[tx-robot] updated from transifex 2016-08-04 00:33:48 +00:00
Andy Scherzinger
5518e8257e hide non-primary action menu items in overflow menu 2016-08-03 19:20:44 +02:00
Andy Scherzinger
b869538846 added description and went for ifRoom 2016-08-03 19:20:44 +02:00
Andy Scherzinger
14be68d4b1 fix UI behavior for filtering in upload view 2016-08-03 19:20:44 +02:00
Andy Scherzinger
4c6f1c0faa correct search view UI-behavior 2016-08-03 19:20:44 +02:00
tobiasKaminsky
a3a6420ead filter for oc file list and local file list 2016-08-03 19:20:44 +02:00
Nextcloud bot
a05957125c
[tx-robot] updated from transifex 2016-08-03 00:33:53 +00:00
Nextcloud bot
9bdf13e801
[tx-robot] updated from transifex 2016-08-02 00:33:56 +00:00
Andy Scherzinger
9ce3297f65 Merge pull request #162 from nextcloud/renameInstantUploadPath 
rename instant upload path
 2016-08-01 14:47:07 +02:00
Nextcloud bot
b5cf7ab074
[tx-robot] updated from transifex 2016-08-01 00:33:52 +00:00
Nextcloud bot
7c2c537bad
[tx-robot] updated from transifex 2016-07-31 00:33:50 +00:00
tobiasKaminsky
ac695b7444 fix sharing for beta 2016-07-30 18:38:21 +02:00
tobiasKaminsky
9587af3e9d Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-07-30 16:56:44 +02:00
Nextcloud bot
6bf6981a41
[tx-robot] updated from transifex 2016-07-30 00:33:42 +00:00
Nextcloud bot
9e406be4ff
[tx-robot] updated from transifex 2016-07-29 00:33:48 +00:00
tobiasKaminsky
eff2aa1971 rename instant upload path 2016-07-28 19:09:46 +02:00
Nextcloud bot
0626040e7b
[tx-robot] updated from transifex 2016-07-27 00:33:55 +00:00
Nextcloud bot
6c887b41b4
[tx-robot] updated from transifex 2016-07-26 00:33:52 +00:00
Nextcloud bot
5cfaa5ec02
[tx-robot] updated from transifex 2016-07-25 00:33:45 +00:00
Nextcloud bot
8876f52c4d
[tx-robot] updated from transifex 2016-07-24 00:33:49 +00:00
Nextcloud bot
ca0e550059
[tx-robot] updated from transifex 2016-07-23 00:33:47 +00:00
Nextcloud bot
00d4403326
[tx-robot] updated from transifex 2016-07-22 00:33:50 +00:00
Andy Scherzinger
e865658f62 corrected paddings/margin to material design 16/8 dp 2016-07-21 13:45:43 +02:00
Andy Scherzinger
55c0dcc3b0 Merge pull request #61 from nextcloud/multiSelectNew 
Multi Select
 2016-07-21 13:02:27 +02:00
Nextcloud bot
9ef0c18e81
[tx-robot] updated from transifex 2016-07-21 00:33:56 +00:00
Andy Scherzinger
62c918f59a Merge 'master' including conflict fixing 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2016-07-20 15:26:59 +02:00
Andy Scherzinger
1876746481 Merge pull request #36 from nextcloud/video_thumbnail 
Video thumbnail
 2016-07-20 15:20:26 +02:00
Andy Scherzinger
2af26edb0b Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew 
Conflicts:
	res/values-ca/strings.xml
	res/values-he/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-ko/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
 2016-07-20 13:19:41 +02:00
Andy Scherzinger
ecf1f9e3da proper status bar coloring for multi select mode, cleanup logging 2016-07-20 13:09:56 +02:00
Nextcloud bot
22b9ad807c
[tx-robot] updated from transifex 2016-07-20 00:33:48 +00:00
Nextcloud bot
7f9cf817a7
[tx-robot] updated from transifex 2016-07-19 00:33:47 +00:00