4160 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	dadf31f522	[tx-robot] updated from transifex	2015-12-13 01:13:30 -05:00
Jenkins for ownCloud	27bc03b6de	[tx-robot] updated from transifex	2015-12-12 01:13:40 -05:00
David A. Velasco	f35a349119	Merge pull request #1340 from owncloud/stable ... Update Changelog for 1.9 version	2015-12-11 09:33:25 +01:00
masensio	9e5a49a6ac	Update Changelog for 1.9 version	2015-12-11 09:24:54 +01:00
Jenkins for ownCloud	8855855a52	[tx-robot] updated from transifex	2015-12-11 01:13:40 -05:00
Jenkins for ownCloud	3e25c84863	[tx-robot] updated from transifex	2015-12-10 01:13:44 -05:00
Maria Asensio	896e4859c0	Merge pull request #1168 from owncloud/avoidDuplicateFiles ... Avoid duplicate files	2015-12-09 09:27:54 +01:00
Jenkins for ownCloud	2f7690879a	[tx-robot] updated from transifex	2015-12-08 01:13:37 -05:00
Carla Schroder	09ee01c787	Merge branch 'master' of https://github.com/owncloud/android	2015-12-07 16:48:55 -08:00
Carla Schroder	1fea82efde	update submodule & integrate new theme changes	2015-12-07 16:48:21 -08:00
Jenkins for ownCloud	d696f10e06	[tx-robot] updated from transifex	2015-12-07 01:13:29 -05:00
Jenkins for ownCloud	106a2324e1	[tx-robot] updated from transifex	2015-12-06 01:13:29 -05:00
Jenkins for ownCloud	2e9c4ed217	[tx-robot] updated from transifex	2015-12-05 01:13:42 -05:00
Carla Schroder	4349ad325e	Merge pull request #1329 from owncloud/confpy ... update version number in conf.py	2015-12-04 14:40:54 -08:00
Carla Schroder	2d8b063595	update version number in conf.py	2015-12-04 14:37:20 -08:00
Carla Schroder	1918516b5b	Merge pull request #1328 from owncloud/19droid ... update for 1.9 release w expanded sharing	2015-12-04 14:31:00 -08:00
Carla Schroder	df56333624	update for 1.9 release w expanded sharing	2015-12-04 14:27:19 -08:00
Jenkins for ownCloud	d44f2a3a10	[tx-robot] updated from transifex	2015-12-04 01:13:39 -05:00
masensio	59442c80ea	Update string	2015-12-03 12:58:22 +01:00
masensio	d0b5d397c4	Merge branch 'stable'	2015-12-03 12:50:01 +01:00
masensio	210298befa	Update library reference	2015-12-03 12:47:55 +01:00
masensio	0794871f88	Merge branch 'release-1.9' into stable	2015-12-03 09:25:06 +01:00
masensio	4bd4cd24b4	Update library reference, oc-android-library-0.9.9	2015-12-03 09:24:01 +01:00
Jenkins for ownCloud	db2256765d	[tx-robot] updated from transifex	2015-12-03 01:13:40 -05:00
tobiasKaminsky	9e678fc697	changed according to latest comments	2015-12-02 19:55:41 +01:00
Jenkins for ownCloud	872e32475b	[tx-robot] updated from transifex	2015-12-02 01:13:53 -05:00
tobiasKaminsky	04fc2e3cc2	changed according to latest discussion	2015-12-01 22:00:53 +01:00
masensio	a7304351b1	Fix issue 1319: Error on the preview, Android 4.1.2	2015-12-01 16:08:01 +01:00
David A. Velasco	d1a06c2dd3	Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread	2015-12-01 13:20:50 +01:00
Jenkins for ownCloud	eb5a24d25c	[tx-robot] updated from transifex	2015-12-01 01:13:42 -05:00
Andy Scherzinger	4f7d416b81	BugFix for #1312 - setting ListPreference selection on pre kitkat	2015-11-30 14:22:52 +01:00
Jenkins for ownCloud	6f04c58f59	[tx-robot] updated from transifex	2015-11-30 01:13:52 -05:00
Jenkins for ownCloud	82fd5e47e2	[tx-robot] updated from transifex	2015-11-29 01:13:42 -05:00
Jenkins for ownCloud	248aaf4bf0	[tx-robot] updated from transifex	2015-11-28 01:13:42 -05:00
tobiasKaminsky	5d77cfc62d	fix 1313	2015-11-27 17:11:13 +01:00
Jenkins for ownCloud	c173743870	[tx-robot] updated from transifex	2015-11-27 01:13:44 -05:00
masensio	49f593ecd1	Fix bug: App crash when try to share link with api disabled	2015-11-26 14:07:32 +01:00
masensio	b5ef1698bd	Fix bug related with sharee with special characters	2015-11-26 14:07:31 +01:00
David A. Velasco	0ab80ee4d2	Fixed stalled connections when a thumbnail that cannot be generated by the server is requested several times	2015-11-26 14:00:52 +01:00
Jenkins for ownCloud	70f59f6ad9	[tx-robot] updated from transifex	2015-11-26 01:13:44 -05:00
David A. Velasco	40d1961e66	Fixed bug: a file already shared with users couldn't be shared via link	2015-11-25 09:47:38 +01:00
David A. Velasco	7277d0a840	Prevent that repeated requests to FileDownloader/FileUploader/SyncFolderHandler get to the worker thread	2015-11-25 09:42:19 +01:00
David A. Velasco	854d333bd8	Silently handle remote folders removed while a full account refresh is run	2015-11-25 09:42:18 +01:00
David A. Velasco	0199ef3ef2	Fixed NPE in synchronization of full account	2015-11-25 09:42:17 +01:00
David A. Velasco	538af7d36b	Added error messages on view for sharees searching	2015-11-25 09:42:16 +01:00
David A. Velasco	79c0171416	Removed unneeded permissions	2015-11-25 09:42:15 +01:00
David A. Velasco	36a97a091d	Bumped version numbers (app and workaround-app)	2015-11-25 09:42:13 +01:00
David A. Velasco	385f3b7a1c	Merge pull request #1307 from owncloud/share_with_password_and_expiration_time ... Share via link with password and expiration time	2015-11-25 09:36:48 +01:00
David A. Velasco	5c24e55421	Grant that ShareActivity is correctly refreshed if public share was removed in the server ... Updated library reference after merge in master	2015-11-25 09:33:37 +01:00
David A. Velasco	00a4ba4f52	Retry forbidden share adding a password only if the value of 'enforce password' option is unknown	2015-11-25 09:32:35 +01:00