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

2874 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
78c1a484e7 [tx-robot] updated from transifex 2014-12-19 01:13:38 -05:00
tobiasKaminsky
e23fa3acaa renamed sortDirectory to sortFolder 2014-12-18 21:19:39 +01:00
Jenkins for ownCloud
f8acc67eb7 [tx-robot] updated from transifex 2014-12-18 01:13:30 -05:00
jabarros
ec820a29ac Removed specific check for character '%' when renaming a folder 2014-12-17 13:36:38 +01:00
Jenkins for ownCloud
b23d33b737 [tx-robot] updated from transifex 2014-12-17 01:13:32 -05:00
Jenkins for ownCloud
2c48adc760 [tx-robot] updated from transifex 2014-12-16 01:13:32 -05:00
David A. Velasco
46b5e21ef5 Merge pull request #801 from owncloud/community_image-preview-save-position 
Restore the current image when the preview activity is hidden
 2014-12-15 10:22:10 +01:00
Jenkins for ownCloud
3772a9d78e [tx-robot] updated from transifex 2014-12-15 01:13:29 -05:00
Jenkins for ownCloud
c6ce747d8a [tx-robot] updated from transifex 2014-12-14 01:13:29 -05:00
Jenkins for ownCloud
885e76abb1 [tx-robot] updated from transifex 2014-12-13 01:13:30 -05:00
jabarros
4e2f886b44 Merge pull request #766 from owncloud/feedbackWithVersionNumber 
Email from feedback contains version number
 2014-12-12 10:05:49 +01:00
Jenkins for ownCloud
9cdcea64ee [tx-robot] updated from transifex 2014-12-12 01:13:36 -05:00
jabarros
8fc865ea76 Merge branch 'develop' into community_image-preview-save-position 2014-12-11 10:23:03 +01:00
David A. Velasco
1f796350b0 Merge pull request #781 from owncloud/fix_logs_change_orientation 
User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)
 2014-12-11 10:21:41 +01:00
David A. Velasco
6a25e0eb11 Merge pull request #799 from owncloud/community_rotateImage 
Rotate image according to EXIF attributes.
 2014-12-11 09:16:00 +01:00
jabarros
92e8194f18 Merge branch 'develop' into community_rotateImage 2014-12-11 08:51:31 +01:00
jabarros
c34646aed3 Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation 2014-12-10 14:13:32 +01:00
David A. Velasco
154188c38f Hurry up release of source bitmap in rotations 2014-12-10 12:48:31 +01:00
David A. Velasco
77554b2b51 Cancel load task when fragment becomes invisible (fixes crash in rotations) 2014-12-10 12:46:34 +01:00
jabarros
0df8f178de Merge pull request #754 from owncloud/RadioListOnAccounts 
Account list is now a radiobutton list
 2014-12-10 08:45:12 +01:00
Keith Abdulla
3d8174a73e fix tab 2014-12-09 23:01:48 -08:00
Jenkins for ownCloud
d0ec8b4ea3 [tx-robot] updated from transifex 2014-12-10 01:13:40 -05:00
Keith Abdulla
1704c4f788 move subject message strings into strings.xml 2014-12-09 17:51:10 -08:00
Jenkins for ownCloud
cd883c67f7 [tx-robot] updated from transifex 2014-12-08 01:13:29 -05:00
Jenkins for ownCloud
dac3ced86d [tx-robot] updated from transifex 2014-12-07 01:13:35 -05:00
Keith Abdulla
4957791128 subject mail populated when user shares file/folder 2014-12-06 02:07:35 -08:00
Jenkins for ownCloud
940f0cc89c [tx-robot] updated from transifex 2014-12-06 01:13:30 -05:00
jabarros
700d444977 Fix. Avoid load logs again when changing device orientation 2014-12-05 14:33:04 +01:00
jabarros
766b51f497 Remove unused imports and split long lines modified 2014-12-05 10:12:57 +01:00
Sam
c8af196f2a Merge branch 'develop' of https://github.com/owncloud/android into multi2 2014-12-05 10:07:48 +01:00
jabarros
7d0723261a Fixed. App crashes when previewing an image 2014-12-05 09:33:34 +01:00
Jenkins for ownCloud
c7c53c93ba [tx-robot] updated from transifex 2014-12-05 01:13:30 -05:00
Jenkins for ownCloud
da691e0bfd [tx-robot] updated from transifex 2014-12-04 01:13:37 -05:00
David A. Velasco
50e39f044f Merge branch 'master' into develop 2014-12-03 11:31:49 +01:00
jabarros
d58d6ca4d0 Merge pull request #773 from owncloud/triggerMediaScan 
Trigger media scan
 2014-12-03 10:10:26 +01:00
Sam
382191d1f9 Merged with owncloud develop 2014-12-03 10:04:39 +01:00
David A. Velasco
f139a7204d Removed empty method, and some unused imports 2014-12-03 09:41:49 +01:00
jabarros
bad9f30115 Merge branch 'release-1.6.2' 2014-12-03 09:33:07 +01:00
jabarros
dfb2dc0a32 Update owncloud library reference to 0.9.4 2014-12-03 09:31:41 +01:00
David A. Velasco
1e9ff8c5fa Trigger MediaScan for every downloaded file in a renamed or moved folder 2014-12-02 14:23:49 +01:00
David A. Velasco
5167e646ad Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile 2014-12-02 13:33:57 +01:00
David A. Velasco
0f39ff841a Bug fixed (and some refactoring): crash on local removal of a folder 2014-12-02 11:17:47 +01:00
Magnus Sjoqvist
1a6319eba4 Removes build version magic numbers 2014-12-02 11:11:34 +01:00
David A. Velasco
c20d7ef4ad Let Gradle out of Travis for the moment - needs additional review 2014-12-02 09:47:02 +01:00
David A. Velasco
2717c2a219 Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment 2014-12-02 09:29:26 +01:00
David A. Velasco
87f911c1ed Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager 2014-12-02 09:21:35 +01:00
David A. Velasco
e771c09ad9 Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method 2014-12-02 09:16:56 +01:00
David A. Velasco
c95eb327f8 Refactoring: get MediaScan trigger out of OCFile for renaming 2014-12-02 09:08:55 +01:00
jabarros
0a0c808e3b Merge pull request #662 from tobiasKaminsky/fileCount 
File count
 2014-12-02 08:31:54 +01:00
tobiasKaminsky
eaa3b1ef56 Merge remote-tracking branch 'upstream/develop' into triggerMediaScan 
-fr/strings.xml

Conflicts:
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/datamodel/OCFile.java
 2014-11-29 12:18:02 +01:00