4826 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	e3d882b386	[tx-robot] updated from transifex	2016-01-20 01:13:33 -05:00
masensio	6f58527273	Update progress bar for Current Upload	2016-01-19 17:32:50 +01:00
Jenkins for ownCloud	9c59c5fb4c	[tx-robot] updated from transifex	2016-01-19 01:13:40 -05:00
Jan-Christoph Borchardt	61a1d97abc	wording fixes, simplify some strings and fix capitalization	2016-01-18 15:10:50 +01:00
masensio	6a8d0383c6	Show current uploads in uploads list view. Apply code review changes, merging FileUpload + FileUploadService	2016-01-18 14:20:55 +01:00
David A. Velasco	3b4b8ceadd	Dinamycally find out the maximum permissions to reshare	2016-01-18 14:08:38 +01:00
Jenkins for ownCloud	98229db831	[tx-robot] updated from transifex	2016-01-18 01:13:31 -05:00
Jenkins for ownCloud	a5aa573594	[tx-robot] updated from transifex	2016-01-17 01:13:33 -05:00
masensio	373daff473	Third step: merging services FileUploader + FileUploadService	2016-01-15 15:03:27 +01:00
masensio	3a908b8c1d	Second step: merging services FileUploader + FileUploadService	2016-01-15 11:06:12 +01:00
Jenkins for ownCloud	81494e6246	[tx-robot] updated from transifex	2016-01-15 01:13:37 -05:00
masensio	92c33d932c	First step to add lastest changes in FileUploader into FileUploadService	2016-01-14 13:27:12 +01:00
Jenkins for ownCloud	13f8ed9d39	[tx-robot] updated from transifex	2016-01-14 01:13:41 -05:00
David A. Velasco	81b8918939	Fixed color of 'stop sharing' button in Android 4.x	2016-01-13 14:23:50 +01:00
David A. Velasco	e4078a5734	Added scroll to permissions editor to grant usability in landscape	2016-01-13 13:43:07 +01:00
Jenkins for ownCloud	6165134f60	[tx-robot] updated from transifex	2016-01-13 01:13:43 -05:00
Andy Scherzinger	341abcd358	move to progress bar instead of unsupported legacy Indeterminate platform calls	2016-01-12 23:08:06 +01:00
masensio	2ec9899060	Show null path in uploads view	2016-01-12 18:28:22 +01:00
masensio	8c71b9ec29	Clean FileDisplayActivity: delete comments from merge conflicts and casting (Parcelable) on OCFile objects	2016-01-12 16:28:35 +01:00
masensio	990f16ca47	Add drawe access from uploads view	2016-01-12 14:16:22 +01:00
David A. Velasco	e7901656a1	Polish UI to edit permissions	2016-01-11 15:34:41 +01:00
masensio	de39244b83	Fix problems with DB access after updating upload	2016-01-11 14:51:41 +01:00
David A. Velasco	bba66e773d	Reset state of check boxes if update of privileges fails	2016-01-11 12:17:46 +01:00
David A. Velasco	6f5d09ada2	Update share permissions when 'DONE' button is clicked	2016-01-11 12:17:45 +01:00
David A. Velasco	d826451e2d	Added buttons to unshare (working) and finish (not working) in EditShareFragment layout	2016-01-11 12:17:11 +01:00
David A. Velasco	5fcb70beee	Added fragment to edit share permissions with basic layout	2016-01-11 12:17:08 +01:00
Jenkins for ownCloud	d8dca7243d	[tx-robot] updated from transifex	2016-01-11 01:13:42 -05:00
tobiasKaminsky	021fe9d14b	changes according to CR	2016-01-10 20:17:21 +01:00
Jenkins for ownCloud	233a881765	[tx-robot] updated from transifex	2016-01-10 01:13:46 -05:00
Jenkins for ownCloud	c371aa5b00	[tx-robot] updated from transifex	2016-01-09 01:13:44 -05:00
masensio	2181239c6d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-01-08 11:21:23 +01:00
Maria Asensio	ab7b3c09c3	Merge pull request #1099 from owncloud/switchListVsGrid ... Switch list vs grid	2016-01-08 10:18:00 +01:00
Jenkins for ownCloud	f97d57283b	[tx-robot] updated from transifex	2016-01-08 01:13:42 -05:00
Jenkins for ownCloud	73b58324a8	[tx-robot] updated from transifex	2016-01-07 01:13:44 -05:00
Jenkins for ownCloud	804be08c1b	[tx-robot] updated from transifex	2016-01-06 01:13:42 -05:00
David A. Velasco	d26da3cbc2	Recovered changes lost in complex rebase	2016-01-05 12:12:18 +01:00
David A. Velasco	ffbd118e8d	Removed calls to ApplicationContext and minor refactoring	2016-01-05 12:03:02 +01:00
David A. Velasco	4ec4b66921	Fix update of text in menu after removal of static methods	2016-01-05 12:03:00 +01:00
tobiasKaminsky	337191ff1a	minor code optimizations	2016-01-05 12:02:59 +01:00
tobiasKaminsky	45c82e4fed	removed static functions (according to CR)	2016-01-05 12:02:57 +01:00
tobiasKaminsky	9bcef74f6d	changes according to CR	2016-01-05 11:54:55 +01:00
tobiasKaminsky	cd04b0d389	do not show "switch" menu item on file details/preview text/video/audio	2016-01-05 11:50:03 +01:00
tobiasKaminsky	6920a7495e	do not show "switch" menu item on file details/preview text/video/audio	2016-01-05 11:50:02 +01:00
tobiasKaminsky	d7e9ef92b8	fixed according to review	2016-01-05 11:50:00 +01:00
tobiasKaminsky	2586298380	moved switch menu item to three dots menu	2016-01-05 11:21:37 +01:00
tobiasKaminsky	db46b19824	decision grid vs. list view remembered per folder, inherited by parents	2016-01-05 11:20:08 +01:00
tobiasKaminsky	6bd7065c73	wip	2016-01-05 11:16:00 +01:00
Jenkins for ownCloud	1fbcd81bd4	[tx-robot] updated from transifex	2016-01-05 01:13:48 -05:00
Jenkins for ownCloud	bc9a890b6f	[tx-robot] updated from transifex	2016-01-04 01:13:42 -05:00
tobiasKaminsky	718aef0039	Merge remote-tracking branch 'remotes/upstream/uploadShowsFiles' into uploadShowsFiles_Master	2016-01-03 13:43:23 +01:00