808 commits

Author	SHA1	Message	Date
Lukas Reschke	5624f1b838	Merge pull request #1701 from owncloud/XSS-fixes ... Sanitize HTML	2013-02-14 10:50:46 -08:00
Lukas Reschke	c7094197bf	Sanitize HTML	2013-02-14 18:15:14 +01:00
Thomas Mueller	c5d716effe	fixing javascript errors IE8 in apps management	2013-02-14 15:47:48 +01:00
Thomas Mueller	022993c098	fixing javascript errors IE8 in user management	2013-02-14 12:59:59 +01:00
Jenkins for ownCloud	bfe6334cd9	[tx-robot] updated from transifex	2013-02-14 00:06:51 +01:00
Thomas Mueller	9d6f74c65e	missing piece after merge	2013-02-13 10:59:41 +01:00
Thomas Mueller	bc43dd704f	Merge branch 'master' into fixing-1424-master ... Conflicts: settings/js/users.js	2013-02-13 01:18:01 +01:00
Jenkins for ownCloud	68fa0b7dcc	[tx-robot] updated from transifex	2013-02-13 00:05:40 +01:00
Frank Karlitschek	316807e0d3	Merge pull request #1624 from owncloud/singleselect ... Split editable select code used for quota selection into a jquery plugin	2013-02-12 11:05:07 -08:00
Jenkins for ownCloud	8d9352a40d	[tx-robot] updated from transifex	2013-02-12 15:12:46 +01:00
Jenkins for ownCloud	fb23ac3ce2	[tx-robot] updated from transifex	2013-02-12 00:21:45 +01:00
Thomas Mueller	037fcde133	Merge branch 'master' into fixing-1424-master	2013-02-11 21:42:27 +01:00
Jenkins for ownCloud	39d19a9274	[tx-robot] updated from transifex	2013-02-11 15:42:41 +01:00
Robin Appelman	e68e5cc849	Split editable select code used for quota selection into a jquery plugin	2013-02-11 15:18:14 +01:00
Jan-Christoph Borchardt	efc70e27bc	Merge pull request #1610 from owncloud/improved_personal_page ... add the buttons for the clients to the personal page.	2013-02-11 03:51:11 -08:00
Jan-Christoph Borchardt	40d8a2531d	move CSS to correct location, move and format php	2013-02-11 12:49:52 +01:00
Jan-Christoph Borchardt	47341eb4bd	spaces to tabs	2013-02-11 12:41:14 +01:00
Jan-Christoph Borchardt	2b586eb91c	correct target blank from image to link	2013-02-11 12:40:17 +01:00
Thomas Müller	b9089fe8d9	Merge branch 'master' into fixing-1424-master	2013-02-09 19:15:23 +01:00
Thomas Müller	0222c589ac	Merge pull request #1546 from owncloud/fix-loading-hooks ... Fix loading hooks when going though the routing system	2013-02-09 09:59:41 -08:00
Thomas Müller	e68cf72458	Merge pull request #1543 from owncloud/utf8-locale-master ... some systems use en_US.UTF8 instead of en_US.UTF-8	2013-02-09 09:58:05 -08:00
Thomas Müller	460faf3f97	Merge pull request #1569 from owncloud/clean-app-id ... Remove invalid characters from app id to prevent loading of invalid reso...	2013-02-09 09:56:26 -08:00
Jörn Friedrich Dreyer	bb656ca2fb	Merge pull request #1561 from Raydiation/master ... Moved the iframe height and width fix from js to css	2013-02-09 08:56:12 -08:00
Bernhard Posselt	62122148bf	Revert "moved iframe height and width fix from js to css" ... This reverts commit 842fc85b9a.	2013-02-09 17:46:23 +01:00
Bernhard Posselt	842fc85b9a	moved iframe height and width fix from js to css	2013-02-09 17:41:17 +01:00
Thomas Müller	d67d9566ce	Merge branch 'master' into clean-app-id	2013-02-09 17:28:30 +01:00
Bart Visscher	9dddcae9ca	Remove invalid characters from app id to prevent loading of invalid resources	2013-02-09 15:10:40 +01:00
Lukas Reschke	18fa8e2753	json_encode the appid	2013-02-09 15:06:35 +01:00
Thomas Müller	279cbeb001	Merge pull request #1481 from owncloud/fixing-1354-master ... basic WebDAV test in place now	2013-02-09 05:13:33 -08:00
Bernhard Posselt	f8335c4815	moved iframe height and width fix from js to css	2013-02-09 11:34:25 +01:00
Frank Karlitschek	4a130d106c	I'm an evil bastard and I commit this 3 letter text fix without a pull request.	2013-02-09 10:09:37 +01:00
Jenkins for ownCloud	04146f2059	[tx-robot] updated from transifex	2013-02-11 00:04:49 +01:00
Björn Schießle	45a4016878	Merge pull request #1552 from raghunayyar/personalpage-style-fix ... Personal Page Password Toggle Loads Fine.	2013-02-10 07:31:05 -08:00
Björn Schießle	d8fee28b3b	add switch to enable/disable the possibility to change the display name by the user	2013-02-10 14:43:31 +01:00
Lukas Reschke	01fabd6c65	Merge pull request #1577 from owncloud/typo_catagory ... Typo	2013-02-10 02:31:34 -08:00
Jenkins for ownCloud	f7d898d835	[tx-robot] updated from transifex	2013-02-10 00:10:29 +01:00
Lukas Reschke	2dde418e99	Remove uneeded lines	2013-02-09 23:43:48 +01:00
Lukas Reschke	bd2f8980cd	Typo	2013-02-09 23:37:42 +01:00
Frank Karlitschek	c14f0b5637	add in new window	2013-02-09 09:30:59 +01:00
Frank Karlitschek	9bd45b26a5	add the buttons for the clients to the personal page. ... Useful and prettier	2013-02-09 09:13:11 +01:00
raghunayyar	e8d17e4e8e	Personal Page Password Toggle Also Loads Well.	2013-02-09 11:40:07 +05:30
Jenkins for ownCloud	e5c05e9674	[tx-robot] updated from transifex	2013-02-09 00:14:08 +01:00
Bart Visscher	340d6fce11	Better way of getting the navigation entries for an app	2013-02-08 18:53:43 +01:00
Thomas Müller	232a98524c	some systems use en_US.UTF8 instead of en_US.UTF-8	2013-02-08 17:49:54 +01:00
Thomas Müller	05b46f7828	on creation only test for existing users if the backend supports user creation ... this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth	2013-02-08 17:16:18 +01:00
Jenkins for ownCloud	59249ebc0c	[tx-robot] updated from transifex	2013-02-08 00:13:16 +01:00
Thomas Mueller	5788d36c8d	Merge branch 'master' into fixing-1354-master ... Conflicts: settings/admin.php settings/templates/admin.php	2013-02-07 10:44:28 +01:00
Thomas Mueller	84f3c8b6cc	show webdav test results in admin section as well	2013-02-07 00:49:39 +01:00
Jenkins for ownCloud	35bd7a400d	[tx-robot] updated from transifex	2013-02-07 00:11:04 +01:00
Lukas Reschke	e969a78cf9	Merge pull request #1443 from owncloud/use-module-file-info-master ... we get best results regarding mime type detection if we use fileinfo - l...	2013-02-06 11:53:13 -08:00