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

3661 commits

This branch
This branch
All branches
Author SHA1 Message Date
masensio
b694fee63d Merge commit 'refs/pr/707' into text_file_preview_pr_707_with 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-08-05 16:48:12 +02:00
masensio
9a0361945c Merge pull request #1068 from owncloud/conflictDialog_newWording 
Conflict dialog: new wording
 2015-08-05 12:53:03 +02:00
David A. Velasco
156cb5e81b Updated conflict message (same as in web app) 2015-08-04 17:29:42 +02:00
David A. Velasco
3512eae861 Fixed double request for ConflictsResolveActivity 2015-08-04 16:47:46 +02:00
tobiasKaminsky
e1ab4a41aa download file if "use server version" 2015-08-04 12:39:59 +02:00
tobiasKaminsky
d2df3f9b33 re-added values-tzl 2015-08-04 12:39:58 +02:00
tobiasKaminsky
c907f6a742 Partially revert 50819ce 2015-08-04 12:39:57 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
David A. Velasco
6698b2d5f1 Merge pull request #1086 from owncloud/update_buildTools_to_22_0_1 
Update buildTools version to 22.0.1
 2015-08-04 12:36:24 +02:00
David A. Velasco
2470ee9af2 Updated reference to library 2015-08-04 12:28:57 +02:00
masensio
9d815b0187 Update buildTools version to 22.0.1 2015-08-04 11:14:51 +02:00
David A. Velasco
04f70fa8c9 Merge pull request #1083 from owncloud/update_jackrabbit_library 
Update JackRabbit library
 2015-08-04 10:38:15 +02:00
Jenkins for ownCloud
74d5911e56 [tx-robot] updated from transifex 2015-08-04 01:14:04 -04:00
masensio
d77f1d7ec0 Update build.gradle to 1.2.3 2015-08-03 15:07:20 +02:00
masensio
1aa1a1fd50 Update library reference 2015-07-31 15:21:18 +02:00
masensio
4384d755a4 Update library refernce: Upgrade jackrabbit to 2.10.1 2015-07-31 12:36:42 +02:00
Jenkins for ownCloud
519ba0393c [tx-robot] updated from transifex 2015-07-31 01:14:01 -04:00
Jenkins for ownCloud
bacebffeb7 [tx-robot] updated from transifex 2015-07-30 01:14:02 -04:00
David A. Velasco
5d421b61e3 Merge pull request #1051 from owncloud/fix_send 
Fix sending of files to external apps when their pathname includes charactes requireing URL encoding.
 2015-07-29 08:47:14 +02:00
Jenkins for ownCloud
28284da055 [tx-robot] updated from transifex 2015-07-29 01:14:04 -04:00
purigarcia
65fe0be763 merge develop 2015-07-28 10:47:08 +02:00
purigarcia
f068a156c5 merge develop 2015-07-28 10:46:13 +02:00
Jenkins for ownCloud
2ac67e5e06 [tx-robot] updated from transifex 2015-07-28 01:14:02 -04:00
AndyScherzinger
fcf4f1238d Merge branch 'master' of https://github.com/owncloud/android into develop 2015-07-26 22:34:13 +02:00
Andy Scherzinger
c9c0684cbc Update README.md 
Added more information for contributing code, development setup and build status
 2015-07-26 22:16:06 +02:00
Jenkins for ownCloud
82f4123260 [tx-robot] updated from transifex 2015-07-25 01:13:46 -04:00
Jenkins for ownCloud
3d18b6b207 [tx-robot] updated from transifex 2015-07-24 01:14:12 -04:00
David A. Velasco
c21fa6c6e5 Merge pull request #1050 from owncloud/favourites_context_menu 
'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
 2015-07-23 09:37:13 +02:00
Jenkins for ownCloud
650c4fd290 [tx-robot] updated from transifex 2015-07-23 01:13:51 -04:00
purigarcia
61e6191342 change the name of the method from keepInSync to favorite. Other changes commented in the review 2015-07-22 18:13:45 +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
6b82b98abf remove a space 2015-07-10 08:49:35 +02:00
purigarcia
4d9146fa2a Merge branch 'develop' into fix_send 2015-07-10 08:46:48 +02:00
purigarcia
a3bfcdcd85 Merge branch 'develop' into favourites_context_menu 2015-07-10 08:44:56 +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
purigarcia
a09e473555 Remove code that should not be in this pr 2015-07-09 09:35:28 +02:00