2835 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luke Owncloud	397dd7b5b2	fix on click handler ... added on long click handler	2014-11-27 15:56:09 +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
Luke Owncloud	4018af1373	commenting	2014-11-27 10:07:04 +01:00
Luke Owncloud	28de702398	prepare delayed uploads ... commenting	2014-11-27 10:00:10 +01:00
Luke Owncloud	d7499fdd0d	moved upload helpers to UploadUtils	2014-11-27 09:02:12 +01:00
Luke Owncloud	949c2ae3c0	restructuring ... added for uploading KEY_WHILE_CHARGING_ONLY	2014-11-27 08:58:53 +01:00
Luke Owncloud	d08e4369f7	open UploadListActivity on click on upload failure notification	2014-11-26 14:46:23 +01:00
Luke Owncloud	6ca1c343d6	remove debug tag	2014-11-26 14:39:17 +01:00
Luke Owncloud	d1386ea140	Use OCFile inside UploadDbObject, ... made OCFile serializable (requires casts to make invocation of Intent.putExtra() unambiguous)	2014-11-26 13:56:55 +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
Luke Owncloud	39abd71e82	fixed multiple calls of ConnectivityActionReceiver	2014-11-26 12:34:54 +01:00
Luke Owncloud	8e9cf480ab	added log output ... fix multiple calls of ConnectivityActionReceiver	2014-11-26 12:28:29 +01:00
Luke Owncloud	d3be204240	use FileStorageUtils.fillOCFile in SynchronizeFolderOperation	2014-11-26 10:03:51 +01:00
Luke Owncloud	8f768d8224	added click action for UploadListActivity	2014-11-26 10:02:04 +01:00
jabarros	5c0e9ca5f2	Changes after CR	2014-11-26 09:05:23 +01:00
Luke Owncloud	e0e9a7c6ce	remove debug cmd	2014-11-26 07:44:04 +01:00
Luke Owncloud	07147e8cb6	start FileUploadService on app start ... add comments filter duplicate photos in InstantUploadBroadcastReceiver	2014-11-26 07:32:29 +01:00
Jorge Antonio Diaz-Benito Soriano	9764f939f5	Update the submodule version to the restored .gitignore	2014-11-25 21:34:20 +01:00
Luke Owncloud	df7ca603d5	fixing double upload issues	2014-11-25 21:16:43 +01:00
Luke Owncloud	b1e5654539	undo classpath change	2014-11-25 21:16:30 +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
Luke Owncloud	71c1bfb0d1	removed obsolete file	2014-11-25 17:01:29 +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
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
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	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