mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
2837 commits 228 branches 1571 tags 618 MiB
Commit graph

1066 commits

Author SHA1 Message Date
Luke Owncloud
61de793925 hide empty upload groups 2014-12-10 14:33:47 +01:00
Luke Owncloud
11efd022f9 use settings layout for upload list (remove group header background, add underline, remove group icons) 2014-12-10 13:44:20 +01:00
Luke Owncloud
fd6d57fa75 removed unnecessary items from upload_list_item 2014-12-10 08:18:12 +01:00
Luke Owncloud
0c0ef5402d change upload list layout according to https://github.com/owncloud/android/issues/765#issuecomment-65076426 2014-12-08 17:03:46 +01:00
Luke Owncloud
2d0c347bc4 Merge remote-tracking branch 'upstream/develop' into HEAD 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-12-08 16:24:10 +01: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
Luke Owncloud
99d82430c5 Merge branch 'develop' of github.com:owncloud/android into reliable_uploads 
Conflicts:
	SETUP.md
	owncloud-android-library
	src/com/owncloud/android/datamodel/OCFile.java
 2014-12-01 07:43:56 +01:00
Luke Owncloud
0ff6921665 git added filesize 
improving status messages
 2014-11-30 20:18:27 +01:00
Luke Owncloud
9445692878 fix cancel upload 
add remove single upload from list
add retry upload
 2014-11-28 14:01:19 +01:00
Jenkins for ownCloud
37713d798b [tx-robot] updated from transifex 2014-11-28 01:13:32 -05:00
Luke Owncloud
cf63d7ce0e remove on long click, add context menu instead 2014-11-27 16:40:52 +01:00
Luke Owncloud
eaab185720 introduce divisions in upload list view 2014-11-27 14:26:31 +01:00
Luke Owncloud
37d3a72960 add ExpandableListFragment which is inherits from ExtendedListFragment 
Only difference: it uses an ExpandableListView which supports dividing list into groups
 2014-11-27 11:56:24 +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
5c0e9ca5f2 Changes after CR 2014-11-26 09:05:23 +01:00
Luke Owncloud
1096f40b8d making UploadService an IntentService 
added menu for uploadListActivity
created separate ConnectivityActionReceiver
 2014-11-25 16:59:34 +01:00
Luke Owncloud
4d07fcc1a1 Merge remote-tracking branch 'upstream/develop' into reliable_uploads 
Conflicts:
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
 2014-11-25 14:28:05 +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
97aa4e266b Merge branch 'develop' of github.com:owncloud/android into reliable_uploads 
Conflicts:
	src/com/owncloud/android/files/services/FileUploadService.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2014-11-20 13:36:46 +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
Jenkins for ownCloud
bb8a10f735 [tx-robot] updated from transifex 2014-11-19 01:13:30 -05: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
Luke Owncloud
2b85ed59b4 working on UploadListActivity 2014-11-14 17:02:58 +01:00
Luke Owncloud
1664d9ec68 Merge branch 'develop' of github.com:owncloud/android into reliable_uploads 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-11-14 13:09:01 +01: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