mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 08:44:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
3240 commits 221 branches 1589 tags 640 MiB
Commit graph

3240 commits

This branch
This branch
All branches
Author SHA1 Message Date
tobiasKaminsky
9fcba0b801 cleanup 2014-11-29 11:23:16 +01:00
tobiasKaminsky
95967c2151 - trigger mediaScan when files are deleted remote 2014-11-29 11:12:03 +01:00
tobiasKaminsky
cb9927fb00 - trigger works when moving files 2014-11-29 10:37:13 +01:00
jabarros
b2af9efa78 Merge pull request #768 from owncloudChalmers/owncloud_submodule 
Change submodule from owncloudChalmers/android-library to owncloud/android-library
 2014-11-28 14:25:32 +01:00
Jorge Antonio Diaz-Benito Soriano
37a374df58 Change submodule from owncloudChalmers/android-library to ownCloud/android-library 2014-11-28 12:16:34 +01:00
jabarros
b80060f941 Update owncloud library reference 2014-11-28 10:55:39 +01:00
jabarros
9990eb9495 Merge pull request #661 from owncloudChalmers/gradleWithInternalDependency 
Gradle support (squashed history)
 2014-11-28 09:10:45 +01:00
Jenkins for ownCloud
37713d798b [tx-robot] updated from transifex 2014-11-28 01:13:32 -05:00
tobiasKaminsky
178c94e6e2 Email from feedback contains version number 2014-11-27 08:25:57 +01:00
David A. Velasco
44c0d86ede Merge pull request #752 from owncloud/instant_uploads_set_path 
Better UI for settings path of instant uploads
 2014-11-26 13:10:04 +01:00
jabarros
849dde6703 Changed var to parcelable in FolderPickerActivity 2014-11-26 13:06:00 +01:00
jabarros
48b3852f7b Refactor after CR 2014-11-26 12:51:16 +01:00
jabarros
5c0e9ca5f2 Changes after CR 2014-11-26 09:05:23 +01:00
Jorge Antonio Diaz-Benito Soriano
9764f939f5 Update the submodule version to the restored .gitignore 2014-11-25 21:34:20 +01:00
Jorge Antonio Diaz-Benito Soriano
69013b0e8d Restore .gitignore and SETUP.md, remove files that were added 2014-11-25 20:46:44 +01:00
tobiasKaminsky
ddb38db935 "open with" in ContextMenu of downloaded files 2014-11-25 18:01:20 +01:00
tobiasKaminsky
611905a5d0 - Account list is now a radiobutton list 2014-11-25 17:42:41 +01:00
tobiasKaminsky
a710797262 - bugfix 2014-11-25 16:59:21 +01:00
jabarros
8005f8c6fe Update owncloud library reference 2014-11-25 14:23:17 +01:00
tobiasKaminsky
f98665bc2d bugfix 2014-11-24 20:15:57 +01:00
David A. Velasco
09a56d3c60 Update reference to library 2014-11-24 14:15:38 +01:00
Jorge Antonio Diaz-Benito Soriano
cb37a11b44 Update submodule to version with updated .gitignore 2014-11-24 12:37:12 +01:00
Jorge Antonio Diaz-Benito Soriano
79b38463b2 Updated instructions to the continuous presence of the *.iml files 2014-11-24 12:17:01 +01:00
Jorge Antonio Diaz-Benito Soriano
65aeb8728b Update .gitignore and re-add missing files 2014-11-24 11:57:01 +01:00
tobiasKaminsky
21a505cc33 changed order to: file(s), folder(s) 2014-11-24 10:59:31 +01:00
jabarros
5a8ebc132c Update owncloud library reference 2014-11-24 10:54:13 +01:00
Jenkins for ownCloud
137105a38a [tx-robot] updated from transifex 2014-11-24 01:13:31 -05:00
tobiasKaminsky
8364865ca6 restore file 2014-11-23 13:37:10 +01:00
tobiasKaminsky
d05d7361ff - thumbnails on browsing local files during upload 2014-11-23 13:34:24 +01:00
Jenkins for ownCloud
2d66aa1dd7 [tx-robot] updated from transifex 2014-11-22 01:13:44 -05:00
tobiasKaminsky
df1ab9cfaa - removed Log 2014-11-21 18:12:48 +01:00
tobiasKaminsky
580c1f008e fix bug #742 2014-11-21 18:08:44 +01:00
tobiasKaminsky
ae6b686775 Merge remote-tracking branch 'upstream/develop' into fileCount 2014-11-21 17:59:51 +01:00
tobiasKaminsky
e9ba0ebbfa Merge remote-tracking branch 'upstream/develop' into triggerMediaScan 2014-11-21 17:58:32 +01:00
tobiasKaminsky
b2158a8673 Merge branch 'develop' of git@github.com:owncloud/android.git into 
developNew

Conflicts:
	res/values-fr/strings.xml
 2014-11-21 17:58:01 +01:00
tobiasKaminsky
5d49850c25 Merge remote-tracking branch 'upstream/develop' into triggerMediaScan 2014-11-21 17:54:47 +01:00
Jorge Antonio Diaz-Benito Soriano
3ac5d01164 Update submodule with the rebased version 2014-11-21 16:16:37 +01:00
Jorge Antonio Diaz-Benito Soriano
c63f7fbfaf Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency 2014-11-21 15:31:14 +01:00
Jorge Antonio Diaz-Benito Soriano
057cfc2e07 Update submodule 2014-11-21 15:31:04 +01:00
Jos Poortvliet
96a256aec7 Update README.md 
Linking not to raw MD file but to the nicely formatted one in github :D
 2014-11-21 14:52:15 +01:00
David A. Velasco
ca1c8b1f5e Merge branch 'develop' into release-1.6.2 2014-11-21 12:40:05 +01:00
David A. Velasco
e901b609ba Merge pull request #740 from owncloud/revert-669-master 
Revert "Add "select all" option to photo (or other) upload screen"
 2014-11-21 12:23:27 +01:00
jabarros
803ed34874 Merge branch 'develop' into release-1.6.2 2014-11-21 10:57:38 +01:00
jabarros
85d5035cbd Merge pull request #722 from ogasser/idn_share_fix 
Convert IDN from ASCII to Unicode in Upload Dialog
 2014-11-21 10:56:08 +01:00
jabarros
094fa09e9e Update version number and name in oc_jb_workaround subproject 2014-11-20 18:03:33 +01:00
jabarros
8d505deed1 Update version number and name 2014-11-20 18:01:05 +01:00
Luke Owncloud
8de07698d9 integrating @davivels remarks 2014-11-20 13:46:54 +01:00
jabarros
aa16b13ab9 Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder 2014-11-20 09:39:10 +01:00
Jenkins for ownCloud
ddfe992cbf [tx-robot] updated from transifex 2014-11-20 01:13:29 -05:00
jabarros
1435e8c406 Merge branch 'develop' into instant_uploads_set_path 2014-11-19 18:40:06 +01:00