mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-11 17:06:29 +03:00
Code Issues Projects Releases Packages Wiki Activity
2066 commits 223 branches 1583 tags 623 MiB
Commit graph

2066 commits

This branch
This branch
All branches
Author SHA1 Message Date
masensio
063ec9eff5 Merge remote-tracking branch 'origin/develop' into share_link_show_shared_files 2014-01-29 11:06:48 +01:00
masensio
5562c96268 OC-2750: Fix Bug. Loading shouldn't disappear until the shared files are shown 2014-01-29 10:31:41 +01:00
masensio
6361dd0a26 OC-2746: Changes from comments in PR#1 in android-library repo 2014-01-29 10:18:35 +01:00
masensio
7310bbc781 OC-2746: New methods in FileStorageManager for saving shares 2014-01-29 09:04:33 +01:00
Mr. Jenkins
edd4d07ac0 [tx-robot] updated from transifex 2014-01-29 01:19:51 -05:00
masensio
d963d702fb OC-2746: Changes from comments: new method to construct base url server 2014-01-28 14:41:38 +01:00
masensio
36d4f3d465 OC-2746: Changes from comments in PR#361 2014-01-28 13:39:49 +01:00
masensio
8c6e069293 OC-2746: Changes from improvements in library 2014-01-28 13:13:26 +01:00
David A. Velasco
c86d4d63cc Merge branch 'share_link_show_shared_files' into share_link__new_share 2014-01-28 10:15:23 +01:00
masensio
0fe14f7457 OC-2490: Update sharelink icon. 2014-01-28 08:55:54 +01:00
Mr. Jenkins
b6a500fc68 [tx-robot] updated from transifex 2014-01-28 02:19:06 -05:00
masensio
dec501facb Update submodule reference in oc project 2014-01-27 15:04:32 +01:00
masensio
388fdd2265 Merge branch 'develop' into share_link_show_shared_files 2014-01-27 14:00:07 +01:00
masensio
5ca133c5e4 Submodule Library updated 2014-01-27 12:38:56 +01:00
masensio
af87d2bb52 Merge pull request #360 from owncloud/oc_framework_cleanup_and_documentation 
Oc framework cleaned up and moved out
 2014-01-27 01:14:01 -08:00
masensio
81b3597853 OC-2585: Refreshthe share items. 2014-01-27 09:40:07 +01:00
Mr. Jenkins
d5d8f3fb22 [tx-robot] updated from transifex 2014-01-27 02:19:06 -05:00
Luke Owncloud
0a2656b723 correction 2014-01-25 14:50:15 +01:00
Luke Owncloud
31ee75752c added howto use git to issue a second PR 2014-01-25 06:23:46 +01:00
Luke Owncloud
5f34f75324 added howto use git to issue a second PR (when local/develop is "dirty") 2014-01-25 06:20:02 +01:00
masensio
9d65b66999 OC-2585: Refresh the share items 2014-01-24 15:04:32 +01:00
David A. Velasco
1136e35dbf Updated owncloud library 2014-01-24 14:40:13 +01:00
David A. Velasco
d3ad9a4482 Fixed bug preventing that right modification time is saved in downloads 2014-01-24 14:22:05 +01:00
masensio
b73b968f60 OC-2490: Show image for shared file in the filelist 2014-01-24 12:22:11 +01:00
masensio
a60643a0d0 OC-2700: Modify the layout list_item to show the share icon 2014-01-23 18:33:38 +01:00
David A. Velasco
0e4c56f316 Fixed crash in first installation 
Conflicts:
	src/com/owncloud/android/ui/activity/FileActivity.java
 2014-01-23 17:48:00 +01:00
masensio
9243d216fc OC-2697: Save data from the Share API response in oc database 2014-01-23 17:24:06 +01:00
David A. Velasco
92650603b3 Fixed crash in first installation 2014-01-23 13:59:29 +01:00
David A. Velasco
195256194e Fixed crash in synchronization of kept-in-sync files triggered by browsing 2014-01-23 12:37:01 +01:00
masensio
e2f7394557 OC-2586: Parse the xml Share response from the server 2014-01-23 12:03:36 +01:00
Mr. Jenkins
a09ec0eee9 [tx-robot] updated from transifex 2014-01-23 01:14:28 -05:00
David A. Velasco
1a3f202ac8 Fixed wrong index to substring 2014-01-22 18:39:34 +01:00
David A. Velasco
85809fc2d2 Fixed file name shown in the upload and download notifications (not full path) 2014-01-22 18:36:52 +01:00
David A. Velasco
ef0df64070 Added entry menu to share files, whereever actions on files can be triggered 2014-01-22 13:31:52 +01:00
David A. Velasco
66f775f0f7 Merge branch 'share_link_show_shared_files' into share_link__new_share 2014-01-22 13:25:22 +01:00
David A. Velasco
b8898a8864 Merge remote-tracking branch 'origin/develop' into share_link__new_share 2014-01-22 13:24:40 +01:00
masensio
576de8a8bc OC-2586: Fix problem in mFileProjectionMap 2014-01-22 13:02:27 +01:00
David A. Velasco
1dc2118934 Merge branch 'release-1.5.3' into oc_framework_cleanup_and_documentation 2014-01-22 10:29:36 +01:00
David A. Velasco
8592c315eb Merge branch 'develop' into release-1.5.3 2014-01-22 10:26:19 +01:00
David A. Velasco
de367c009a Updated scrips files to setup environment 2014-01-22 10:16:53 +01:00
David A. Velasco
7fdaa2b0cb owncloud-android-library submodule updated 2014-01-22 09:41:31 +01:00
Mr. Jenkins
4f84c74d1f [tx-robot] updated from transifex 2014-01-22 01:14:29 -05:00
Thomas Müller
0a0cd045a1 Try to fix travis build 2014-01-21 19:32:18 +01:00
Thomas Müller
e18815cc31 use ant to build 2014-01-21 18:07:53 +01:00
Thomas Müller
df218f99b8 Starting off with travis-ci integration based on https://github.com/embarkmobile/android-maven-example/blob/master/.travis.yml 2014-01-21 17:16:57 +01:00
David A. Velasco
ff62abf9e9 Removed oc_framework from current project 2014-01-21 15:06:57 +01:00
David A. Velasco
f2d44f42d9 ownCloud app linked to owncloud-android-library in its new location as submodule 2014-01-21 15:03:36 +01:00
David A. Velasco
da0063232a Oc_framework, now owncloud-android-library, included as a submodule 2014-01-21 14:53:00 +01:00
David A. Velasco
8e2c944e4d Version up for JB workaround-app: 1.0.12 2014-01-21 14:44:16 +01:00
David A. Velasco
30198bb105 App version up: 1.5.3 2014-01-21 14:41:46 +01:00