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
3886 commits 225 branches 1574 tags 621 MiB
Commit graph

1525 commits

Author SHA1 Message Date
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
6d670fb678 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-07 11:16:29 +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
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
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
Andy Scherzinger
e7674368e2 fix duplicate 2015-09-04 13:24:12 +02:00
Andy Scherzinger
7ac2a0d297 fix layout/uploader_layout.xml 2015-09-04 13:20:41 +02:00
Andy Scherzinger
32145d57db Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/uploader_layout.xml
 2015-09-04 13:16:11 +02:00
masensio
f787213cd1 Merge pull request #1102 from owncloud/copy 
Copy files
 2015-09-04 11:14:42 +02:00
Jenkins for ownCloud
f70de1736e [tx-robot] updated from transifex 2015-09-04 01:13:40 -04:00
masensio
a0707428ff Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop 
Conflicts:
	res/layout/file_preview.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2015-09-02 13:23:42 +02:00
Jenkins for ownCloud
2b001a8bf2 [tx-robot] updated from transifex 2015-09-02 07:06:14 -04:00
Jenkins for ownCloud
f70817f5fb [tx-robot] updated from transifex 2015-09-01 13:02:18 -04:00
David A. Velasco
e6be60679f Merge branch 'master' into copy 
Conflicts FIXED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/FileDownloadFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
	src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
 2015-09-01 18:35:51 +02:00
Marc Plano-Lesay
502ff0a216 Use new filetype icons 2015-08-31 19:17:05 +02:00
David A. Velasco
136db6a765 Merge pull request #1122 from owncloud/create_folder_button_on_action_bar_for_uploader 
'Create folder' button moved to action bar in Uploader activity
 2015-08-31 17:48:12 +02:00
Jenkins for ownCloud
ef7cf6edb0 [tx-robot] updated from transifex 2015-08-31 01:13:46 -04:00
Jenkins for ownCloud
11fa921860 [tx-robot] updated from transifex 2015-08-28 01:13:40 -04:00
Jenkins for ownCloud
6b8a052a5e [tx-robot] updated from transifex 2015-08-27 01:13:43 -04:00
Jenkins for ownCloud
8ecfdfe614 [tx-robot] updated from transifex 2015-08-26 01:13:41 -04:00
masensio
b81de1d547 Merge branch 'master' into create_folder_button_on_action_bar_for_uploader 
Conflicts:
	res/layout/uploader_layout.xml
 2015-08-25 14:53:42 +02:00
Jenkins for ownCloud
8f0a83a495 [tx-robot] updated from transifex 2015-08-25 01:13:43 -04:00
Jenkins for ownCloud
573b9d1727 [tx-robot] updated from transifex 2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
806f258bbd [tx-robot] updated from transifex 2015-08-24 12:38:30 +02:00
Jenkins for ownCloud
763ecd2d84 [tx-robot] updated from transifex 2015-08-24 12:38:29 +02:00
Jenkins for ownCloud
9448a809b1 [tx-robot] updated from transifex 2015-08-24 12:38:28 +02:00
tobiasKaminsky
8e3787909f Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground 2015-08-21 17:48:58 +02:00
Andy Scherzinger
d24b396d54 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-20 13:50:44 +02:00
Andy Scherzinger
a544a0cfb6 correct copyright info 2015-08-20 13:08:28 +02:00
Andy Scherzinger
7f13b98cc0 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
 2015-08-18 23:20:01 +02:00
Andy Scherzinger
cbb0f8743f Fix for long click menue for account management in preferences screen 2015-08-18 23:13:10 +02:00
Andy Scherzinger
dbed65610b fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle 2015-08-18 22:09:53 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76 Added error messages for copy action. English only. 2015-08-18 17:04:47 +02:00
Andy Scherzinger
e79f92f566 Conflict Dialog Fix 2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
7c19fcdc94 Added error messages for copy action. English only. 2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8 Added copy action 2015-08-18 13:35:28 +02:00
Andy Scherzinger
a393531774 visual fix for Progress DialogFragment(s) 2015-08-18 13:08:58 +02:00
Jorge Antonio Diaz-Benito Soriano
f4432afdeb Added 'Copy' action 2015-08-18 10:58:37 +02:00
Andy Scherzinger
c13741ba20 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-17 16:14:12 +02:00
Andy Scherzinger
3a82db451c Merge branch 'master' of https://github.com/owncloud/android into material_toolbar 2015-08-17 16:13:30 +02:00
Andy Scherzinger
b669bd7737 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-17 16:04:17 +02:00