David A. Velasco
|
e4e50d44c4
|
Corrections from my own comments
|
2015-02-03 09:52:22 +01:00 |
|
David A. Velasco
|
4af15f7b4e
|
Merge branch 'develop' into imageGrid
|
2015-02-02 13:48:30 +01:00 |
|
Jenkins for ownCloud
|
8bf624ff8f
|
[tx-robot] updated from transifex
|
2015-02-01 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
2210ce961a
|
[tx-robot] updated from transifex
|
2015-01-31 01:13:34 -05:00 |
|
masensio
|
42b5a1e28f
|
Update some icons
|
2015-01-30 14:37:16 +01:00 |
|
masensio
|
7f6c5bd3b2
|
Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop
|
2015-01-30 12:10:15 +01:00 |
|
masensio
|
700318fec0
|
Update some icons
|
2015-01-30 11:00:14 +01:00 |
|
Jenkins for ownCloud
|
9d491f71ed
|
[tx-robot] updated from transifex
|
2015-01-30 01:13:31 -05:00 |
|
Jenkins for ownCloud
|
16b36d0418
|
[tx-robot] updated from transifex
|
2015-01-29 01:13:38 -05:00 |
|
masensio
|
d3b0747dde
|
Merge pull request #866 from owncloud/download_folder
Download a folder
|
2015-01-28 09:31:25 +01:00 |
|
masensio
|
0b8f3db914
|
Recover badges: show status icons in grid View ( favoriteIcon, localFileIndicator, shareIcon and shareWithMeIcon
|
2015-01-28 08:59:57 +01:00 |
|
Jenkins for ownCloud
|
da67575522
|
[tx-robot] updated from transifex
|
2015-01-28 01:13:45 -05:00 |
|
masensio
|
8ebaba45e7
|
Show status icons in gridview
|
2015-01-27 13:51:44 +01:00 |
|
masensio
|
051265620c
|
Add share icons and localFileIndicator to grid_image and grid_item layout
|
2015-01-27 09:46:19 +01:00 |
|
Jenkins for ownCloud
|
97386bdb87
|
[tx-robot] updated from transifex
|
2015-01-26 01:13:30 -05:00 |
|
jabarros
|
7d21a9ec5d
|
Merge pull request #825 from owncloud/SettingsGreyedOut
Instant Upload settings hide/show
|
2015-01-23 09:29:11 +01:00 |
|
jabarros
|
0470de47e0
|
Fixed. Line behind the folder is not shown in the upload view
|
2015-01-22 09:29:36 +01:00 |
|
jabarros
|
38ea01dc1e
|
Move GridViewWithHeaderAndFooter class to third_parties/in/srain/cube/
|
2015-01-21 17:51:16 +01:00 |
|
jabarros
|
9b1b5f5e3b
|
Fixed. Footer message should be showed in the list view mode. Also added in grid view mode.
|
2015-01-21 11:08:15 +01:00 |
|
Jenkins for ownCloud
|
9fcb1612fe
|
[tx-robot] updated from transifex
|
2015-01-21 01:13:32 -05:00 |
|
jabarros
|
f01156527a
|
Fix. Uploads view is not shown correctly
|
2015-01-20 14:38:32 +01:00 |
|
jabarros
|
d751df3daa
|
Add Scrollview in list fragment layout for showing text message
|
2015-01-20 10:43:39 +01:00 |
|
jabarros
|
451783be22
|
Merge branch 'develop' into imageGrid
|
2015-01-20 09:56:45 +01:00 |
|
jabarros
|
d0cee8be85
|
Merge branch 'develop' into SettingsGreyedOut
|
2015-01-20 09:25:20 +01:00 |
|
Jenkins for ownCloud
|
99276bae85
|
[tx-robot] updated from transifex
|
2015-01-20 01:13:34 -05:00 |
|
tobiasKaminsky
|
3c79991b12
|
Merge branches 'develop' and 'imageGrid' of github.com:owncloud/android into imageGrid2
Conflicts:
gradle/wrapper/gradle-wrapper.properties
owncloud-android-library
|
2015-01-19 22:24:33 +01:00 |
|
tobiasKaminsky
|
b5fdba576f
|
changes as requested
|
2015-01-19 22:13:45 +01:00 |
|
tobiasKaminsky
|
d4e0f3bdb1
|
Merge branch 'develop2' into imageGrid2
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2015-01-19 21:02:37 +01:00 |
|
jabarros
|
e98fc8b141
|
Merge branch 'develop' into download_folder
|
2015-01-19 12:49:28 +01:00 |
|
Jenkins for ownCloud
|
880ffab34c
|
[tx-robot] updated from transifex
|
2015-01-19 01:13:30 -05:00 |
|
tobiasKaminsky
|
6d5c6f86e5
|
Merge branch 'develop2' into imageGrid2
Conflicts:
owncloud-android-library
res/layout/list_fragment.xml
res/values-fr/strings.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2015-01-18 17:00:29 +01:00 |
|
Jenkins for ownCloud
|
bdb959f2e2
|
[tx-robot] updated from transifex
|
2015-01-18 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
46427dad18
|
[tx-robot] updated from transifex
|
2015-01-17 01:13:31 -05:00 |
|
Jenkins for ownCloud
|
86f9d43e8a
|
[tx-robot] updated from transifex
|
2015-01-15 01:13:33 -05:00 |
|
Jenkins for ownCloud
|
369fb6a0be
|
[tx-robot] updated from transifex
|
2015-01-14 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
f206d8c674
|
[tx-robot] updated from transifex
|
2015-01-13 01:13:31 -05:00 |
|
jabarros
|
e9016281bd
|
Add contentDescription tag into main menu items
|
2015-01-12 13:25:07 +01:00 |
|
David A. Velasco
|
b894a0a4f9
|
Removed ... from content description
|
2015-01-12 09:44:00 +01:00 |
|
Jenkins for ownCloud
|
26403abd0a
|
[tx-robot] updated from transifex
|
2015-01-12 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
acd19c911b
|
[tx-robot] updated from transifex
|
2015-01-10 01:13:30 -05:00 |
|
tobiasKaminsky
|
d54345d040
|
Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
Conflicts:
src/com/owncloud/android/ui/activity/Uploader.java
|
2015-01-08 22:41:41 +01:00 |
|
jabarros
|
3929f1e740
|
Add content description tag into EditText in account_setup
|
2015-01-08 13:07:54 +01:00 |
|
jabarros
|
d05d5ffe1a
|
Merge branch 'develop' into download_folder
|
2015-01-07 14:04:46 +01:00 |
|
jabarros
|
f737785b4f
|
Change error message when trying download a folder that does not exist
|
2015-01-07 13:47:38 +01:00 |
|
jabarros
|
90e49a96e4
|
Added folder name to 'file not found' error message
|
2015-01-07 13:04:46 +01:00 |
|
jabarros
|
1db11eb586
|
Fix. App does not realize that the folder does not exist
|
2015-01-07 11:22:24 +01:00 |
|
Jenkins for ownCloud
|
f670cfad8f
|
[tx-robot] updated from transifex
|
2015-01-07 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
464db6b4c5
|
[tx-robot] updated from transifex
|
2015-01-06 01:13:30 -05:00 |
|
tobiasKaminsky
|
0ae80926ac
|
update
|
2015-01-05 19:53:40 +01:00 |
|
Jenkins for ownCloud
|
ea101df8f5
|
[tx-robot] updated from transifex
|
2015-01-05 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
c8dc970121
|
[tx-robot] updated from transifex
|
2015-01-04 01:13:31 -05:00 |
|
Jenkins for ownCloud
|
57a840c92e
|
[tx-robot] updated from transifex
|
2015-01-03 01:13:28 -05:00 |
|
Jenkins for ownCloud
|
c03ea61704
|
[tx-robot] updated from transifex
|
2015-01-02 01:13:30 -05:00 |
|
tobiasKaminsky
|
cb725acdf3
|
- removed whitespaces
- renamed pin description
|
2015-01-01 13:06:25 +01:00 |
|
Jenkins for ownCloud
|
2fb89a9238
|
[tx-robot] updated from transifex
|
2015-01-01 01:13:33 -05:00 |
|
Jenkins for ownCloud
|
410bb307e1
|
[tx-robot] updated from transifex
|
2014-12-31 01:13:30 -05:00 |
|
tobiasKaminsky
|
74bd1d8d78
|
- clarify pin description
|
2014-12-30 09:35:48 +01:00 |
|
Jenkins for ownCloud
|
04631b6313
|
[tx-robot] updated from transifex
|
2014-12-30 01:13:30 -05:00 |
|
tobiasKaminsky
|
0e061f6f06
|
- fix #47
|
2014-12-29 22:36:15 +01:00 |
|
Jenkins for ownCloud
|
56459b1da2
|
[tx-robot] updated from transifex
|
2014-12-29 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
4f2a917933
|
[tx-robot] updated from transifex
|
2014-12-28 01:13:30 -05:00 |
|
jabarros
|
f0905fbaac
|
Merge pull request #784 from ekeitho/develop
subject mail populated when user shares >>file/folder<<
|
2014-12-26 09:04:02 +01:00 |
|
Jenkins for ownCloud
|
b64e5ff65b
|
[tx-robot] updated from transifex
|
2014-12-26 01:13:28 -05:00 |
|
Jenkins for ownCloud
|
db3c9440fb
|
[tx-robot] updated from transifex
|
2014-12-25 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
64c3c9d53c
|
[tx-robot] updated from transifex
|
2014-12-24 01:13:31 -05:00 |
|
Keith Abdulla
|
150050aeb0
|
fix tab indent
|
2014-12-23 09:38:38 -08:00 |
|
Keith Abdulla
|
1db0d7daf2
|
create an extra string resource
|
2014-12-23 09:31:59 -08:00 |
|
Jenkins for ownCloud
|
a11f951ed7
|
[tx-robot] updated from transifex
|
2014-12-23 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
29eba16031
|
[tx-robot] updated from transifex
|
2014-12-22 01:13:44 -05:00 |
|
Jenkins for ownCloud
|
68e8a942a1
|
[tx-robot] updated from transifex
|
2014-12-21 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
167c86b4ac
|
[tx-robot] updated from transifex
|
2014-12-20 01:13:31 -05:00 |
|
Jenkins for ownCloud
|
78c1a484e7
|
[tx-robot] updated from transifex
|
2014-12-19 01:13:38 -05:00 |
|
jabarros
|
6f11fa1c09
|
Added content description tag in 'account setup' layout elements
|
2014-12-18 12:22:07 +01:00 |
|
Jenkins for ownCloud
|
f8acc67eb7
|
[tx-robot] updated from transifex
|
2014-12-18 01:13:30 -05: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 |
|
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 |
|
Jenkins for ownCloud
|
9cdcea64ee
|
[tx-robot] updated from transifex
|
2014-12-12 01:13:36 -05: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 |
|
jabarros
|
c34646aed3
|
Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation
|
2014-12-10 14:13:32 +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 |
|
Jenkins for ownCloud
|
940f0cc89c
|
[tx-robot] updated from transifex
|
2014-12-06 01:13:30 -05: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
|
0a0c808e3b
|
Merge pull request #662 from tobiasKaminsky/fileCount
File count
|
2014-12-02 08:31:54 +01:00 |
|
Jenkins for ownCloud
|
37713d798b
|
[tx-robot] updated from transifex
|
2014-11-28 01:13:32 -05: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
|
5c0e9ca5f2
|
Changes after CR
|
2014-11-26 09:05:23 +01:00 |
|
tobiasKaminsky
|
611905a5d0
|
- Account list is now a radiobutton list
|
2014-11-25 17:42:41 +01:00 |
|
Jenkins for ownCloud
|
137105a38a
|
[tx-robot] updated from transifex
|
2014-11-24 01:13:31 -05:00 |
|
Jenkins for ownCloud
|
2d66aa1dd7
|
[tx-robot] updated from transifex
|
2014-11-22 01:13:44 -05:00 |
|
tobiasKaminsky
|
ae6b686775
|
Merge remote-tracking branch 'upstream/develop' into fileCount
|
2014-11-21 17:59:51 +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 |
|
Luke Owncloud
|
8de07698d9
|
integrating @davivels remarks
|
2014-11-20 13:46:54 +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 |
|
jabarros
|
a2de2f28ab
|
Add new preference on settings for setting the upload video path
|
2014-11-19 10:14:27 +01:00 |
|
tobiasKaminsky
|
bdd46fd811
|
cleanup
|
2014-11-19 09:11:44 +01:00 |
|
Jenkins for ownCloud
|
bb8a10f735
|
[tx-robot] updated from transifex
|
2014-11-19 01:13:30 -05:00 |
|
tobiasKaminsky
|
4867bb32c3
|
Merge remote-tracking branch 'upstream/develop' into imageGrid
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
|
2014-11-18 18:08:28 +01:00 |
|
jabarros
|
87b242019c
|
Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long
|
2014-11-18 14:57:19 +01:00 |
|
jabarros
|
dc8a495e55
|
Remove files_move layout after creating files_folder_picker one
|
2014-11-18 14:53:41 +01:00 |
|
jabarros
|
00a8eb415a
|
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
|
2014-11-18 14:51:49 +01:00 |
|
jabarros
|
12b4b0397f
|
Add view for selecting upload path folder browsing through local file list in preferences view
|
2014-11-18 11:01:55 +01:00 |
|
Jenkins for ownCloud
|
d3bfbb8568
|
[tx-robot] updated from transifex
|
2014-11-18 01:13:34 -05:00 |
|
Jenkins for ownCloud
|
3f5b3f0d1d
|
[tx-robot] updated from transifex
|
2014-11-17 01:13:35 -05:00 |
|
Jenkins for ownCloud
|
1dbd577166
|
[tx-robot] updated from transifex
|
2014-11-15 01:13:35 -05:00 |
|
David A. Velasco
|
1b36e1ca08
|
Merge pull request #685 from tobiasKaminsky/beautifyTimestamps
Relative time stamps in the list of files.
|
2014-11-13 12:21:49 +01:00 |
|
Jenkins for ownCloud
|
02a11c3b91
|
[tx-robot] updated from transifex
|
2014-11-13 01:13:37 -05:00 |
|
David A. Velasco
|
17afcb0251
|
Merge pull request #683 from tobiasKaminsky/videoFullsize
Bugfix: video is now playing in fullscreen
|
2014-11-12 09:29:28 +01:00 |
|
tobiasKaminsky
|
79cb6106fd
|
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
|
2014-11-12 09:02:23 +01:00 |
|
tobiasKaminsky
|
2117c024c4
|
< 60 seconds -> "seconds ago"
|
2014-11-12 08:56:53 +01:00 |
|
Jenkins for ownCloud
|
1efefbd22c
|
[tx-robot] updated from transifex
|
2014-11-12 01:13:41 -05:00 |
|
Jenkins for ownCloud
|
3c19c59d9e
|
[tx-robot] updated from transifex
|
2014-11-11 01:13:34 -05:00 |
|
tobiasKaminsky
|
4560776ecc
|
- use match_parent instead
|
2014-11-10 20:14:45 +01:00 |
|
Jenkins for ownCloud
|
54b814a604
|
[tx-robot] updated from transifex
|
2014-11-10 01:13:34 -05:00 |
|
Jenkins for ownCloud
|
ae67bbb648
|
[tx-robot] updated from transifex
|
2014-11-09 01:13:35 -05:00 |
|
Jenkins for ownCloud
|
2f058ad70e
|
[tx-robot] updated from transifex
|
2014-11-08 01:13:37 -05:00 |
|
Jenkins for ownCloud
|
4ab6d85c47
|
[tx-robot] updated from transifex
|
2014-11-07 01:13:38 -05:00 |
|
Jenkins for ownCloud
|
5b37b99af3
|
[tx-robot] updated from transifex
|
2014-11-06 01:13:41 -05:00 |
|
tobiasKaminsky
|
f331120a14
|
Merge remote-tracking branch 'upstream/develop' into imageGrid
Conflicts:
owncloud-android-library
res/layout/list_item.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
|
2014-11-05 22:07:11 +01:00 |
|
jabarros
|
eb77fe1da1
|
Merge pull request #700 from owncloud/remember_last_share_location_fixed
Remember last share location
|
2014-11-05 08:36:16 +01:00 |
|
Jenkins for ownCloud
|
02b8ac0d91
|
[tx-robot] updated from transifex
|
2014-11-05 01:13:37 -05:00 |
|
David A. Velasco
|
183cd732d0
|
Merge pull request #687 from owncloud/thumbnails_from_server
Get remote thumbnails from server (OC8)
|
2014-11-03 13:38:58 +01:00 |
|
David A. Velasco
|
a09a837585
|
Adjust the thumbnails size to the size used on screen
|
2014-11-03 11:27:51 +01:00 |
|
tobiasKaminsky
|
ccdf0f1b96
|
- adding possibility to create folder during upload
|
2014-11-01 13:41:06 +01:00 |
|
Jenkins for ownCloud
|
8de92ba3b0
|
[tx-robot] updated from transifex
|
2014-11-01 01:13:35 -04:00 |
|
David A. Velasco
|
0bedcb9128
|
Merge branch 'remember_last_share_location' into remember_last_share_location_fixed
|
2014-10-31 15:23:59 +01:00 |
|
Jenkins for ownCloud
|
ca0eac841a
|
[tx-robot] updated from transifex
|
2014-10-31 01:13:34 -04:00 |
|
Luke Owncloud
|
035fc24a17
|
allow user to save choice of app for sending log
warn user if no app for sending log available
|
2014-10-30 09:53:24 +01:00 |
|
grecep
|
31ffae0093
|
Revert "Add "select all" option to photo (or other) upload screen"
|
2014-10-29 22:37:45 +01:00 |
|
grecep
|
fd7a940dee
|
Merge pull request #669 from grecep/master
Add "select all" option to photo (or other) upload screen
|
2014-10-29 22:29:38 +01:00 |
|
Luke Owncloud
|
5caa8d25a0
|
use chooser for sendmail (remove explicit gmail) in LogHistory
|
2014-10-29 12:39:44 +01:00 |
|
Jenkins for ownCloud
|
068b826b32
|
[tx-robot] updated from transifex
|
2014-10-29 01:13:41 -04:00 |
|
Jenkins for ownCloud
|
5acc314524
|
[tx-robot] updated from transifex
|
2014-10-28 01:13:38 -04:00 |
|
Jenkins for ownCloud
|
495c812671
|
[tx-robot] updated from transifex
|
2014-10-27 01:13:33 -04:00 |
|
Jenkins for ownCloud
|
3507ff8003
|
[tx-robot] updated from transifex
|
2014-10-26 01:13:34 -04:00 |
|
tobiasKaminsky
|
b18fabe9d7
|
- bugfix: video is now playing in fullscreen
|
2014-10-25 18:55:15 +02:00 |
|
Jenkins for ownCloud
|
27bcd4de0a
|
[tx-robot] updated from transifex
|
2014-10-25 01:13:41 -04:00 |
|
tobiasKaminsky
|
fbc3d970c5
|
Merge remote-tracking branch 'upstream/develop' into fileCount
Conflicts:
res/layout/list_fragment.xml
res/values/strings.xml
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2014-10-24 18:18:06 +02:00 |
|
David A. Velasco
|
01f1f62d2c
|
Merge pull request #676 from owncloud/sorting_files
Added sorting by name or date
|
2014-10-24 13:24:35 +02:00 |
|
Jenkins for ownCloud
|
8a77b0be15
|
[tx-robot] updated from transifex
|
2014-10-24 01:13:37 -04:00 |
|
jabarros
|
3bd60c2b0f
|
Fixed. In devices with Android 2.x 'Sort' option in menu has not icon related
|
2014-10-23 18:05:28 +02:00 |
|
jabarros
|
6970560d2f
|
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
|
2014-10-23 11:06:05 +02:00 |
|
jabarros
|
2fad1e1a99
|
Merge branch 'develop' into sorting_files_2
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
|
2014-10-23 10:18:20 +02:00 |
|
Jenkins for ownCloud
|
832a98f47c
|
[tx-robot] updated from transifex
|
2014-10-23 01:13:40 -04:00 |
|
Jenkins for ownCloud
|
2e6410e771
|
[tx-robot] updated from transifex
|
2014-10-22 01:14:52 -04:00 |
|
Magnus Sjoqvist
|
52bf54a00d
|
Removes remember last share location setting
|
2014-10-21 17:27:47 +02:00 |
|
Magnus Sjoqvist
|
2b1865d1d0
|
Removes translations
|
2014-10-21 16:17:00 +02:00 |
|
Jenkins for ownCloud
|
7dc7e85df8
|
[tx-robot] updated from transifex
|
2014-10-21 01:15:22 -04:00 |
|
tobiasKaminsky
|
c1f920cc75
|
- update folder_public name
|
2014-10-20 19:46:10 +02:00 |
|
jabarros
|
3a8ff76d0a
|
Merge branch 'master' into develop
Conflicts:
owncloud-android-library
|
2014-10-20 14:54:46 +02:00 |
|
Magnus Sjoqvist
|
844790057b
|
Merge with develop
|
2014-10-20 14:38:13 +02:00 |
|
David A. Velasco
|
6ed394195d
|
Merge pull request #658 from owncloud/instant_upload_path_chooseable
Instant upload path chooseable
|
2014-10-20 13:56:18 +02:00 |
|
Jenkins for ownCloud
|
8be4bb14a3
|
[tx-robot] updated from transifex
|
2014-10-20 01:14:34 -04:00 |
|
tobiasKaminsky
|
635394f2a2
|
- minor design changes
|
2014-10-19 08:56:57 +02:00 |
|
tobiasKaminsky
|
4e960eafeb
|
added "x folders and y files" to end of list
|
2014-10-18 10:47:08 +02:00 |
|
Magnus Sjoqvist
|
b6c7719415
|
Merge with develop
|
2014-10-17 11:06:30 +02:00 |
|
Jenkins for ownCloud
|
95a02855ee
|
[tx-robot] updated from transifex
|
2014-10-17 01:13:52 -04:00 |
|
Jenkins for ownCloud
|
475dff85c6
|
[tx-robot] updated from transifex
|
2014-10-16 01:14:37 -04:00 |
|
jabarros
|
016bdfac1f
|
Fixed. Upload path is not place correctly in setting view
|
2014-10-15 08:21:23 +02:00 |
|
Jenkins for ownCloud
|
1ffa6e969a
|
[tx-robot] updated from transifex
|
2014-10-15 01:13:34 -04:00 |
|
Magnus Sjoqvist
|
ebe0f73068
|
Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences.
|
2014-10-14 09:34:49 +02:00 |
|
Jenkins for ownCloud
|
ea04e197c7
|
[tx-robot] updated from transifex
|
2014-10-14 01:13:35 -04:00 |
|
Jenkins for ownCloud
|
a2d4800df5
|
[tx-robot] updated from transifex
|
2014-10-12 01:13:37 -04:00 |
|
tobiasKaminsky
|
706a769e30
|
- disabled sort by size until server supports server-side folder size
calculation
|
2014-10-11 09:14:14 +02:00 |
|
tobiasKaminsky
|
5da452c47e
|
- images
|
2014-10-11 09:03:43 +02:00 |
|
Jenkins for ownCloud
|
d645343671
|
[tx-robot] updated from transifex
|
2014-10-11 01:13:34 -04:00 |
|
tobiasKaminsky
|
b452c1711f
|
- removed german translation
|
2014-10-10 17:13:08 +02:00 |
|
grecep
|
df4f60dda4
|
select all / deselect all file in upload menu
|
2014-10-10 14:05:49 +02:00 |
|
David A. Velasco
|
ca3e73065d
|
Merge branch 'develop' into instant_upload_path_chooseable
|
2014-10-10 11:04:37 +02:00 |
|
Jenkins for ownCloud
|
1a52095f01
|
[tx-robot] updated from transifex
|
2014-10-10 04:18:14 -04:00 |
|
Jenkins for ownCloud
|
73959beb7a
|
[tx-robot] updated from transifex
|
2014-10-10 01:13:33 -04:00 |
|
jabarros
|
7d9fc6857e
|
Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files
Conflicts:
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
|
2014-10-09 17:26:02 +02:00 |
|
jabarros
|
95639df3ae
|
Fix. Remove incorrect 'values-tl_PH' folder for allowing project compilation
|
2014-10-09 17:07:50 +02:00 |
|
Jenkins for ownCloud
|
3068752b02
|
[tx-robot] updated from transifex
|
2014-10-08 01:13:40 -04:00 |
|
Jenkins for ownCloud
|
a63e9b16f4
|
[tx-robot] updated from transifex
|
2014-10-07 01:13:42 -04:00 |
|
jabarros
|
1e7e893321
|
Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable
|
2014-10-06 14:58:34 +02:00 |
|
Jenkins for ownCloud
|
ad518e318c
|
[tx-robot] updated from transifex
|
2014-10-06 01:13:33 -04:00 |
|
Jenkins for ownCloud
|
45031a321f
|
[tx-robot] updated from transifex
|
2014-10-05 01:13:36 -04:00 |
|
tobiasKaminsky
|
8ae90ee5e5
|
- new icons
|
2014-10-04 11:56:43 +02:00 |
|
Jenkins for ownCloud
|
0c7438de16
|
[tx-robot] updated from transifex
|
2014-10-04 01:13:31 -04:00 |
|
Jenkins for ownCloud
|
54dc2756b8
|
[tx-robot] updated from transifex
|
2014-10-03 01:13:33 -04:00 |
|
jabarros
|
2e472998c1
|
Merge branch 'develop' into release-1.6.0
|
2014-10-02 09:04:11 +02:00 |
|
Jenkins for ownCloud
|
d81c19c963
|
[tx-robot] updated from transifex
|
2014-10-01 19:22:04 -04:00 |
|
Jenkins for ownCloud
|
b7674b49e9
|
[tx-robot] updated from transifex
|
2014-10-01 06:54:48 -04:00 |
|
jabarros
|
b35f0f0af2
|
Merge pull request #632 from wakeup/patch-1
fix owncloud capitalization
|
2014-10-01 11:40:16 +02:00 |
|
Javier Gonzalez
|
ab61008c9d
|
Merge pull request #642 from owncloud/remove_values_fil_folder
Fix. Remove 'values-fil' folder for allowing the project compilation
|
2014-09-30 14:15:31 +02:00 |
|
jabarros
|
52ddd7ebdd
|
Fix. Remove 'values-fil' for allow the project compilation
|
2014-09-30 14:04:52 +02:00 |
|
Jenkins for ownCloud
|
40ed6e4195
|
[tx-robot] updated from transifex
|
2014-09-30 01:13:36 -04:00 |
|
Jenkins for ownCloud
|
99ca27e87e
|
[tx-robot] updated from transifex
|
2014-09-29 01:13:33 -04:00 |
|
Jenkins for ownCloud
|
ea87065c8d
|
[tx-robot] updated from transifex
|
2014-09-28 01:13:32 -04:00 |
|