mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
3284 commits 227 branches 1574 tags 621 MiB
Commit graph

1243 commits

Author SHA1 Message Date
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
David A. Velasco
802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-04-28 14:20:17 +02:00
Jenkins for ownCloud
3489fa1ccb [tx-robot] updated from transifex 2015-04-25 01:13:48 -04:00
Jenkins for ownCloud
25f488cfe1 [tx-robot] updated from transifex 2015-04-24 01:13:45 -04:00
Jenkins for ownCloud
3dc60cd6f7 [tx-robot] updated from transifex 2015-04-23 01:13:49 -04:00
Jenkins for ownCloud
d5ea104e99 [tx-robot] updated from transifex 2015-04-19 01:13:33 -04:00
Jenkins for ownCloud
2f196c54d6 [tx-robot] updated from transifex 2015-04-18 01:13:48 -04:00
Jenkins for ownCloud
65b2da31cc [tx-robot] updated from transifex 2015-04-17 01:13:50 -04:00
Jenkins for ownCloud
15512f8d63 [tx-robot] updated from transifex 2015-04-15 01:13:36 -04:00
Jenkins for ownCloud
3fa86ebe5b [tx-robot] updated from transifex 2015-04-10 01:13:49 -04:00
masensio
558a3af1eb Merge branch 'master' into develop 2015-04-09 16:57:09 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00
Jenkins for ownCloud
ffa503fa76 [tx-robot] updated from transifex 2015-04-06 01:13:38 -04:00
Jenkins for ownCloud
0ba1d7e65d [tx-robot] updated from transifex 2015-04-05 01:13:38 -04:00
Jenkins for ownCloud
bf6e03b0b6 [tx-robot] updated from transifex 2015-04-04 01:13:38 -04:00
Jenkins for ownCloud
8ebf88a31b [tx-robot] updated from transifex 2015-04-03 01:13:39 -04:00
Jenkins for ownCloud
daed811588 [tx-robot] updated from transifex 2015-04-02 01:13:45 -04:00
Jenkins for ownCloud
fc644a03fd [tx-robot] updated from transifex 2015-04-01 01:13:47 -04:00
Jenkins for ownCloud
b6392f7f90 [tx-robot] updated from transifex 2015-03-31 01:13:37 -04:00
Jenkins for ownCloud
7606afa9d6 [tx-robot] updated from transifex 2015-03-29 01:13:47 -04:00
Jenkins for ownCloud
b727c1ef44 [tx-robot] updated from transifex 2015-03-28 01:13:35 -04:00
Jenkins for ownCloud
66159f83f3 [tx-robot] updated from transifex 2015-03-27 01:13:45 -04:00
David A. Velasco
6bef4abf74 Merge pull request #924 from owncloud/add_user_agent_support 
Updated after adding custom user agent support to library
 2015-03-25 10:57:04 +01:00
David A. Velasco
30b72638a6 Merge pull request #923 from owncloud/create_folder_during_upload_pr_701_with_develop 
Create folder during upload  (PR#701) and bug fixes
 2015-03-25 09:29:13 +01:00
Jenkins for ownCloud
f1884e807d [tx-robot] updated from transifex 2015-03-25 01:13:49 -04:00
masensio
e18de547c8 Update user agent string 2015-03-24 14:53:53 +01:00
masensio
0de25b228c Update uger agent string 2015-03-24 14:44:05 +01:00
masensio
898957f9e7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-24 12:26:24 +01:00
Jenkins for ownCloud
d61c021ba4 [tx-robot] updated from transifex 2015-03-24 01:13:40 -04:00
masensio
ae440a5fa7 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-23 14:29:25 +01:00
Jenkins for ownCloud
360ffadac0 [tx-robot] updated from transifex 2015-03-23 01:13:36 -04:00
Jenkins for ownCloud
556f846e9c [tx-robot] updated from transifex 2015-03-22 01:13:35 -04:00
Jenkins for ownCloud
2b0e8eddda [tx-robot] updated from transifex 2015-03-21 01:13:36 -04:00
masensio
c0da8a93f2 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-20 14:55:48 +01:00
Jenkins for ownCloud
205bd47325 [tx-robot] updated from transifex 2015-03-20 01:13:42 -04:00
David A. Velasco
5ebd90ed2d Merge pull request #914 from owncloud/accessibility 
Added accesibility descriptions as a mean to add automatic tests un UI.
 2015-03-19 12:59:17 +01:00
Jenkins for ownCloud
1a39af3e95 [tx-robot] updated from transifex 2015-03-19 01:13:50 -04:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
masensio
879160bebe Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-18 09:20:02 +01:00
Jenkins for ownCloud
4fedf76cb0 [tx-robot] updated from transifex 2015-03-18 01:13:35 -04:00
Jenkins for ownCloud
b7796c99f6 [tx-robot] updated from transifex 2015-03-17 01:13:40 -04:00
masensio
876204faf0 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-16 11:15:27 +01:00
Jenkins for ownCloud
3c55631bee [tx-robot] updated from transifex 2015-03-15 01:13:34 -04:00
Jenkins for ownCloud
8b900a6410 [tx-robot] updated from transifex 2015-03-14 01:13:43 -04:00
Jenkins for ownCloud
67ecc0f262 [tx-robot] updated from transifex 2015-03-13 01:13:37 -04:00
Jenkins for ownCloud
311f0bd332 [tx-robot] updated from transifex 2015-03-12 01:13:34 -04:00
Jenkins for ownCloud
3826462073 [tx-robot] updated from transifex 2015-03-11 01:13:43 -04:00
masensio
c963eb0fad Merge branch 'develop' into accessibility 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2015-03-10 14:58:21 +01:00
masensio
01483a38bf Merge remote-tracking branch 'origin/develop' into share_password_support 2015-03-10 14:27:35 +01:00
Jenkins for ownCloud
5f3175229a [tx-robot] updated from transifex 2015-03-10 01:13:47 -04:00