mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity
3920 commits 225 branches 1574 tags 621 MiB
Commit graph

3920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Scherzinger
044c597e2b fix for refresh bug 2015-09-16 17:21:53 +02:00
Andy Scherzinger
94bc0699ac Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
fixed realignment item badges
Conflicts:
	res/layout/list_item.xml
 2015-09-16 16:27:47 +02:00
masensio
459bd1e9d0 Merge pull request #1157 from owncloud/fix_file_list_icon_alignment 
center aligned the folder icon with the drawer icon
 2015-09-16 12:34:30 +02:00
masensio
0083936d40 Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_file_list_icon_alignment 2015-09-16 11:44:51 +02:00
Andy Scherzinger
4c0371f82b center aligned the folder icon with the drawer icon 2015-09-16 11:41:37 +02:00
masensio
359ede5fdd Merge pull request #1149 from owncloud/new_filetype_icons 
New icon detection in general + support for additional mimetype icons
 2015-09-16 11:39:26 +02:00
Andy Scherzinger
9e15d2459d Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons 2015-09-15 18:44:49 +02:00
Andy Scherzinger
6f5cb9aaca Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-15 18:43:48 +02:00
David A. Velasco
eaf249803c Removed unneeded LDPI drawables 2015-09-15 18:08:00 +02:00
David A. Velasco
0290523c03 Added icons for file type TEXT 2015-09-15 18:07:59 +02:00
Andy Scherzinger
3ff4d6df0f adapting web's way of choosing icons 2015-09-15 18:02:34 +02:00
David A. Velasco
803f672663 Merge pull request #1155 from owncloud/update_setup_guide 
Update setup, changes from the issue #1154
 2015-09-15 13:55:57 +02:00
Andy Scherzinger
c6bc82d4fe center aligned the folder icon with the drawer icon 2015-09-14 21:49:45 +02:00
David A. Velasco
2132d8a7c7 Merge pull request #1154 from owncloud/update_share_link_for_OC_8.2 
Update share link for oc 8.2
 2015-09-14 14:58:28 +02:00
masensio
8ed97d7433 Update setup, changes from the issue #1154 2015-09-14 14:07:05 +02:00
masensio
69e931f0f6 Merge branch 'update_share_link_for_OC_8.2' of github.com:owncloud/android into update_share_link_for_OC_8.2 2015-09-14 13:23:29 +02:00
masensio
a52c4ea968 Update library reference 2015-09-14 13:21:48 +02:00
masensio
26f3917848 Update library reference: get share link 2015-09-14 10:30:54 +02:00
Jenkins for ownCloud
9b8b29d98b [tx-robot] updated from transifex 2015-09-14 01:13:43 -04:00
Jenkins for ownCloud
83eed1a8d8 [tx-robot] updated from transifex 2015-09-12 01:13:45 -04:00
masensio
b256291d4b Update library reference: get share link 2015-09-11 15:05:41 +02:00
Andy Scherzinger
6eccdc25b3 Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
 2015-09-11 13:06:14 +02:00
Andy Scherzinger
13a73dd568 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-11 12:47:01 +02:00
David A. Velasco
7182b1d2b1 Merge pull request #1141 from owncloud/559_longpress_filename 
Show file name in the contextual menu, see #559
 2015-09-11 12:37:04 +02:00
Andy Scherzinger
b1aff42715 further cleanup, moving folder icon determination into util class 2015-09-11 11:15:55 +02:00
Andy Scherzinger
ed094a7df6 Add further javadoc descsribing how to maintain further mappings in the future 2015-09-11 10:57:11 +02:00
Jenkins for ownCloud
7ae7cef2b3 [tx-robot] updated from transifex 2015-09-11 01:13:42 -04:00
Andy Scherzinger
1a26995be2 remove commented out test code 2015-09-10 18:20:26 +02:00
Andy Scherzinger
97fc896fd4 added mapping for bin to be iconized with "application" 2015-09-10 18:16:35 +02:00
Andy Scherzinger
fa12c619b0 rewrite for icon determination with refactoring into its own class + fixed a typo 2015-09-10 17:55:26 +02:00
Andy Scherzinger
8c19d0fa50 shortened this prediction, since it will always be image... 2015-09-10 17:54:05 +02:00
Andy Scherzinger
3ad6531ed6 Merge pull request #1147 from Kernald/additional-filetype-icons 
Add additional filetype icons
 2015-09-10 09:18:12 +02:00
Marc Plano-Lesay
b4875c69cc Add additional filetype icons 2015-09-09 23:30:09 +02:00
Andy Scherzinger
0234ca22ea Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-09 11:42:11 +02:00
masensio
84a4a086d6 Merge pull request #1124 from Kernald/new-filetype-icons 
New filetype icons
 2015-09-09 08:50:50 +02:00
Jenkins for ownCloud
fbe533c974 [tx-robot] updated from transifex 2015-09-09 01:13:45 -04:00
Andy Scherzinger
ed86a0560a Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-08 13:50:02 +02:00
Jenkins for ownCloud
1d4b191fb3 [tx-robot] updated from transifex 2015-09-08 01:13:44 -04:00
Andy Scherzinger
e9f793755e showing the filename in the long press menu on file list, see #559 2015-09-07 12:24:01 +02:00
Andy Scherzinger
6d670fb678 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-07 11:16:29 +02:00
masensio
22f0f59991 Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop 
Text file preview pr 707 with develop
 2015-09-07 10:47:05 +02:00
masensio
1586eea7cb Merge branch 'master' into text_file_preview_pr_707_with_develop 2015-09-07 10:42:09 +02:00
David A. Velasco
1ff57e0665 HOT FIX: recovered lost strings 2015-09-07 10:07:54 +02:00
David A. Velasco
3f40da0ac9 Fixed text preview filter to take into account local knowledge about MIME types 2015-09-07 09:14:00 +02:00
Jenkins for ownCloud
244f3bd4e4 [tx-robot] updated from transifex 2015-09-07 01:13:41 -04:00
Andy Scherzinger
c1e73ec56f Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-06 20:49:49 +02:00
Jenkins for ownCloud
5ceecb4a82 [tx-robot] updated from transifex 2015-09-06 01:13:44 -04:00
Jenkins for ownCloud
11c0d77648 [tx-robot] updated from transifex 2015-09-05 01:13:44 -04:00
David A. Velasco
68ce6e62bf Reverse filter for preview of text files: all text/ but those in black list 2015-09-04 15:01:25 +02:00
masensio
fc5c4d899c Merge branch 'master' into text_file_preview_pr_707_with_develop 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-09-04 14:31:10 +02:00