server

Author	SHA1	Message	Date
Thomas Müller	32b29c9d73	Merge branch 'master' into fix-7307 Conflicts: core/js/router.js settings/js/admin.js	2014-03-06 00:15:08 +01:00
Jan-Christoph Borchardt	36fcb0fb4e	Merge pull request #7569 from owncloud/scrutinizer-tabs fix some spaces to tabs issues reported by Scrutinizer	2014-03-05 18:10:01 +01:00
Morris Jobke	8c1cd2b83e	Merge pull request #7566 from owncloud/button-outlines Adds 0 Outlines to Buttons	2014-03-05 16:50:22 +01:00
Jan-Christoph Borchardt	7ad7f94797	fix some spaces to tabs issues reported by Scrutinizer	2014-03-05 15:47:12 +01:00
Jan-Christoph Borchardt	4a4b32d325	restrict height of settings and make scrollable	2014-03-05 15:08:16 +01:00
raghunayyar	5a9689eb5c	Adds 0 Outlines to Buttons	2014-03-05 19:36:36 +05:30
Jan-Christoph Borchardt	4d679de30b	add hover/focus states for star icons to hint at action	2014-03-05 13:21:33 +01:00
Joas Schilling	80393d9c0f	Do not allow setting an expiration date in the past Fix #7297	2014-03-05 13:12:58 +01:00
Morris Jobke	a8ae2f10b9	Merge pull request #7554 from owncloud/issue/7304 Fix position of eye icon on database password field	2014-03-05 11:13:43 +01:00
Vincent Petry	6de370b64c	Removed obsolete OC.Router stubs in specHelper	2014-03-05 10:27:15 +01:00
Joas Schilling	4ee4f0c365	Fix position of eye icon on database password field Fix #7304	2014-03-05 10:22:35 +01:00
Thomas Müller	33b798c3d6	fixing js unit tests	2014-03-05 01:10:39 +01:00
Vincent Petry	25251d4bf7	Fix mail template to use p() for colors Now using p() instead of print_unescaped() for colors.	2014-03-03 17:36:12 +01:00
Frank Karlitschek	7983c90fdc	Merge pull request #7500 from owncloud/theme-mailtemplate Enable theming of the mail template header	2014-03-03 17:22:33 +01:00
jbtbnl	e603164517	Do not override button background image	2014-03-03 14:07:44 +01:00
Jan-Christoph Borchardt	b8d0fc9494	make mail notification header color themable	2014-03-03 12:43:22 +01:00
Jan-Christoph Borchardt	eac9eebfdb	compress mail notification logo	2014-03-03 12:42:58 +01:00
Jan-Christoph Borchardt	607f205bda	mail template: remove off-white background color to better blend into mail client	2014-03-03 12:21:08 +01:00
Thomas Müller	e1030c6b5f	adding JSDoc + remove unused function	2014-03-02 23:15:37 +01:00
Thomas Müller	1291303c5a	Replace OC.Router.generate() with OC.generateUrl()	2014-03-02 22:30:24 +01:00
Raghu Nayyar	e304809612	Merge pull request #7382 from jbtbnl/master Remove necessity of icon class	2014-02-27 21:11:26 +05:30
Morris Jobke	7af846e656	Merge pull request #7452 from owncloud/icon-delete-hover icons: automatically show delete hover instead of using explicit class	2014-02-27 14:44:29 +01:00
Morris Jobke	6fe1cf7ae4	Merge pull request #7449 from owncloud/remove-input-border remove border from log in input fields, simpler and works better with themes	2014-02-27 13:24:44 +01:00
Jan-Christoph Borchardt	58bc6aee51	icons: automatically show delete hover instead of using explicit class	2014-02-27 12:48:25 +01:00
Jan-Christoph Borchardt	af467d92f6	Installation: relabel 'Advanced' to more descriptive 'Storage & database'	2014-02-27 12:24:14 +01:00
Jan-Christoph Borchardt	f0cd08ab5d	remove border from log in input fields, simpler and works better with themes	2014-02-27 12:13:09 +01:00
Joas Schilling	922c1909f8	Translate string when an error occured while sending a forgot password mail Fix #7423	2014-02-26 17:29:47 +01:00
Thomas Müller	2f0db9af07	Merge pull request #7409 from owncloud/issue/5361 Add owncloud version to JS scope	2014-02-26 14:44:12 +01:00
Jan-Christoph Borchardt	d9a153dbe9	Merge pull request #7174 from owncloud/issue/7166 Add option to change email settings in admin section	2014-02-26 14:41:07 +01:00
Joas Schilling	9847912257	Remove unused variables, add doc blocks and break lines Fix #7166	2014-02-26 13:10:46 +01:00
Joas Schilling	cb14b1c58d	Add owncloud version to JS scope Fix #5361	2014-02-26 11:50:52 +01:00
jbtbnl	d28fd8f64d	Remove necessity of icon class Only the icon specific class is needed	2014-02-24 22:37:19 +01:00
Morris Jobke	5fb1374b0f	Merge pull request #7285 from owncloud/mimeicons-svg Show svg mime icons when no preview is available	2014-02-24 14:12:10 +01:00
Morris Jobke	8d17f6d675	Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 Update page title when navigating through directories (local)	2014-02-24 13:34:07 +01:00
icewind1991	ddb8cf32e9	Merge pull request #7344 from owncloud/add-js-config-vars Allow apps to add/modify config js output via hook.	2014-02-24 13:29:54 +01:00
Robin Appelman	7c4f81bd78	rename url parameter	2014-02-24 13:24:10 +01:00
Vincent Petry	80c61d480c	Added oc_defaults stub in specHelper.js This is needed for JS Unit tests to run properly as they are expecting the new "oc_default" map to exist.	2014-02-24 09:45:02 +01:00
Morris Jobke	079d64ce75	Merge pull request #7310 from owncloud/no-css-js-delivery-via-php No css js delivery via php	2014-02-21 20:37:10 +01:00
icewind1991	9b9b2255b6	Merge pull request #7355 from owncloud/new-menu-svg Use SVG icons in New file menu	2014-02-21 16:18:43 +01:00
Robin Appelman	df35929ed2	Merge branch 'master' into add-js-config-vars	2014-02-21 16:07:21 +01:00
Robin Appelman	59ec61dc03	Merge branch 'master' into GuillaumeAmat-patch-1	2014-02-21 16:04:31 +01:00
Morris Jobke	a5c70f16d2	Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs fix thumbnail generation for subdirectories in the conflicts dialog	2014-02-21 15:33:13 +01:00
icewind1991	aa0bcf7ba4	Merge pull request #7336 from owncloud/IE-wipho-viewport fix viewport size on windows phone	2014-02-21 15:13:20 +01:00
Jan-Christoph Borchardt	877cfb963a	use SVG icons from icons.css for New file menu	2014-02-21 14:07:25 +01:00
Robin Appelman	4715fb12c8	Add url parameter to control whether previews should return 404 when the mimetype is unsupported	2014-02-21 14:06:15 +01:00
Jörn Friedrich Dreyer	d9e333c0da	use directory from original instead of current dir	2014-02-21 14:01:38 +01:00
Thomas Müller	27ad69eea5	Merge branch 'master' into no-css-js-delivery-via-php	2014-02-21 14:01:24 +01:00
Robin Appelman	3f52eb073d	Merge branch 'master' into mimeicons-svg	2014-02-21 14:00:17 +01:00
Robin Appelman	80481a1e41	Merge branch 'master' into mobile-header	2014-02-21 12:46:09 +01:00
Thomas Müller	f19276f7bc	Merge branch 'master' into no-css-js-delivery-via-php Conflicts: config/config.sample.php	2014-02-21 09:51:51 +01:00
ringmaster	58be2eb955	Allow apps to add/modify config js output via hook.	2014-02-20 18:13:27 -05:00
Lukas Reschke	917a505af4	Merge pull request #7291 from owncloud/adminess-raghu Move isadmin to template and rename it to oc_isadmin	2014-02-20 19:01:28 +01:00
Robin Appelman	daf28225b7	fix viewport size on windows phone	2014-02-20 18:42:59 +01:00
Jan-Christoph Borchardt	d5739e83d1	remove additional transition rule, reduce width of collapsed search bar	2014-02-20 18:40:08 +01:00
Robin Appelman	d9bb21146f	fix IE10 viewport sizeing	2014-02-20 18:14:40 +01:00
Jan-Christoph Borchardt	d466458469	restrict zooming in to not mangle layout accidentally	2014-02-20 17:37:48 +01:00
Robin Appelman	0624476aa1	Merge branch 'master' into mimeicons-svg	2014-02-20 16:55:18 +01:00
Jan-Christoph Borchardt	bfe6dfe5da	Merge pull request #7056 from owncloud/users-scrollperformance Improve users list scrolling performance	2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt	5cc4a47f4c	Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix remove fix for IE9 nav bar width	2014-02-20 16:25:08 +01:00
Lukas Reschke	e4c3ef2ca6	Merge pull request #7289 from owncloud/fix-filetype-icons Fix filetype icons	2014-02-20 14:53:41 +01:00
Vincent Petry	6cf83de60e	Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1	2014-02-20 14:49:54 +01:00
Jörn Friedrich Dreyer	3f6d14be85	Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core Conflicts: core/css/styles.css	2014-02-20 14:29:23 +01:00
Thomas Müller	31bab55847	Merge branch 'master' into no-css-js-delivery-via-php	2014-02-20 13:52:53 +01:00
Jan-Christoph Borchardt	20b740f8e4	do not show display name on mobile when profile picture is present	2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt	92d57cb5a7	move avatar into clickable area of user menu	2014-02-20 13:36:52 +01:00
Thomas Müller	ac8e6b15b6	kill references to core.js and core.css	2014-02-20 13:23:24 +01:00
Thomas Müller	bf22ed7bdb	kill old minimizer code	2014-02-20 13:10:56 +01:00
Lukas Reschke	169f4cf7ff	Fix typo	2014-02-20 12:51:15 +01:00
Björn Schießle	16eb43c033	Merge pull request #7247 from owncloud/sharing_cleanup_step1 clean up the sharing ajax calls, add mail notification class	2014-02-20 11:56:20 +01:00
Jan-Christoph Borchardt	3e2c56157b	reduce width of searchbox on mobile, fix overlap, fix #7282	2014-02-20 11:33:46 +01:00
Lukas Reschke	65c0b73c87	Merge pull request #7255 from owncloud/fix-admin-remote An admin should not be able to add remote and public services on its own	2014-02-20 11:16:43 +01:00
Jan-Christoph Borchardt	3e235b2699	merge master	2014-02-20 10:51:13 +01:00
Thomas Müller	3ce77a35e5	fixing js syntax error	2014-02-20 10:42:54 +01:00
Lukas Reschke	ba7a79372a	Variable value is expected and not an echoed output	2014-02-20 10:28:11 +01:00
Lukas Reschke	b61f0f11c5	Move oc_isadmin to the config JS script	2014-02-20 10:26:05 +01:00
kondou	90f351afa2	Optimize some images and strip metadata from png images with optipng in image_optimization.sh	2014-02-19 21:31:50 +01:00
Bjoern Schiessle	2fd75d8f1c	clean up the sharing ajax calls, add mail notification class	2014-02-19 19:33:00 +01:00
Lukas Reschke	16262e3fd2	Move isadmin to template and rename it to oc_isadmin	2014-02-19 17:56:12 +01:00
kondou	16cbfd0383	Optimize images	2014-02-19 16:44:08 +01:00
Jan-Christoph Borchardt	937a25593b	fix lots of file type icons for archives, js, flash, ics, fonts, code, ...	2014-02-19 16:27:38 +01:00
Robin Appelman	609a91a9b1	Show svg mime icons when no preview is available	2014-02-19 14:47:29 +01:00
Joas Schilling	fdb0d2067f	Remove duplicated definition and move OC.msg to js/js.js Fix issue #7166	2014-02-19 10:20:52 +01:00
Scrutinizer Auto-Fixer	adaee6a5a1	Scrutinizer Auto-Fixes This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend	2014-02-19 09:31:54 +01:00
Thomas Müller	1e321406ee	Merge pull request #7114 from owncloud/scrutinizer_documentation_patches polish documentation based on scrutinizer patches	2014-02-19 07:04:37 +01:00
Thomas Müller	c6f4f85e27	Merge branch 'master' into scrutinizer_documentation_patches Conflicts: lib/private/migration/content.php	2014-02-18 18:31:33 +01:00
Tom Needham	635b8f6b83	Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect do not autocapitalize fields on mobile, fix user name input	2014-02-18 18:26:56 +01:00
Lukas Reschke	c19cacb29f	Check whether the app is set	2014-02-18 14:12:49 +01:00
Lukas Reschke	1352c63dca	Check whether the Key is set	2014-02-18 12:47:05 +01:00
Lukas Reschke	dc6f1d875d	An admin should not be able to add remote and public services on its own. This should only be possible programmatically. This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.	2014-02-18 12:32:57 +01:00
Jan-Christoph Borchardt	dafa8fc37e	do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete	2014-02-18 10:58:00 +01:00
Thomas Müller	92560c5b86	Merge pull request #7243 from owncloud/core-sessionlifetimedefault Now using PHP session lifetime as default value for the JS config	2014-02-18 10:30:25 +01:00
Vincent Petry	f9763e1fc5	Now using PHP session lifetime as default value for the JS config This will fix the heartbeat when the session_lifetime config parameter hasn't been set explicitly.	2014-02-17 21:33:04 +01:00
Jan-Christoph Borchardt	0f434038a7	add cbr/cbz file type icon, fix #6953	2014-02-17 20:48:32 +01:00
Vincent Petry	c732764eb5	Improve users list scrolling performance - fixed JS error when avatar mode is disabled - added spinner at the bottom of the table - scroll detection now happens earlier - single/multiselect init is deferred so that the new rows are first appended into the list (more responsive) and initialized afterwards - disabled users sorting after add (assuming they are always sorted on the server side)	2014-02-17 19:32:45 +01:00
Bart Visscher	8a6dcdf4a4	Move password interaction to interact function	2014-02-17 18:09:42 +01:00
Bart Visscher	bcb78e48b2	Split execute function into multiple functions	2014-02-17 18:02:58 +01:00
Jan-Christoph Borchardt	84cd6e035e	Merge pull request #7132 from owncloud/issue/6920 Do not select input for all text input fields	2014-02-17 15:01:03 +01:00
Thomas Müller	9fac95c2ab	Merge branch 'master' into scrutinizer_documentation_patches Conflicts: lib/private/appconfig.php	2014-02-14 23:03:27 +01:00
Vincent Petry	d7f4547717	Merge pull request #6726 from owncloud/fix_6630 don't urldecode get var, php does this automatically	2014-02-14 14:34:20 +01:00
Guillaume AMAT	01dee35ebe	Adds OC_Defaults values in javascript config	2014-02-13 10:47:03 +01:00
Bart Visscher	ae525d1f12	Fix namespace for Exception	2014-02-12 17:42:55 +01:00
Bart Visscher	3abcd13979	Allow converting from any db type	2014-02-11 18:01:41 +01:00
Bart Visscher	eede20c5ac	Check target DB type	2014-02-11 17:59:50 +01:00
Arthur Schiwon	af781bdea7	fix DI	2014-02-11 10:50:03 +01:00
Arthur Schiwon	41e8d44cf7	move sorter into a class	2014-02-11 10:49:34 +01:00
Arthur Schiwon	1d0a236563	respect coding guidelines	2014-02-11 10:49:27 +01:00
Arthur Schiwon	71e4d965a1	on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430	2014-02-11 10:49:22 +01:00
Joas Schilling	dbec143f09	Change MySQL to MySQL/MariaDB in the frontend Fix issue #6269	2014-02-07 17:03:43 +01:00
Joas Schilling	145d9a09ab	Do not select input for all text input fields Fix issue #6920	2014-02-07 16:31:29 +01:00
Jörn Friedrich Dreyer	2a6a9a8cef	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
Thomas Müller	79fc4f3126	Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging	2014-02-06 11:34:27 +01:00
Thomas Müller	0db5fead8e	remove some more global variable $RUNTIME_NOAPPS	2014-02-06 10:04:18 +01:00
Thomas Müller	afbe50d09c	remove global variable $RUNTIME_NOAPPS - it's just superfluous	2014-02-06 09:44:13 +01:00
Thomas Müller	e2625ae7aa	fixing autoconfig handling	2014-02-05 18:23:40 +01:00
Vincent Petry	3d88b10f20	Merge pull request #7067 from owncloud/core-sessionheartbeatconfig Core sessionheartbeatconfig	2014-02-05 10:03:36 +01:00
Thomas Müller	ced80c6f27	Merge pull request #6969 from owncloud/tests-morecoverage Fixed unit test scripts + coverage	2014-02-04 12:21:13 -08:00
Thomas Müller	45ab9810c5	fixing typos	2014-02-04 20:58:06 +01:00
Morris Jobke	3c80071807	Merge pull request #4795 from owncloud/setup Move core setup code to controller class	2014-02-04 06:04:21 -08:00
Vincent Petry	e75f7e58e9	Added unit tests for session_keepalive / heartbeat	2014-02-04 13:56:41 +01:00
Vincent Petry	912da8d277	Added session_keepalive setting When session_keepalive is true (default) the heartbeat will be send as often as the half of the session timeout value.	2014-02-04 13:56:10 +01:00
Jan-Christoph Borchardt	cfcd71f3e4	better picture icon, fix https://github.com/owncloud/apps/issues/1401	2014-02-03 18:47:25 +01:00
Morris Jobke	5844d682a7	Use === instead of ==, add missing whitespace and CSS class	2014-02-01 15:02:36 +01:00
Bart Visscher	d8ec7e2701	DRY for database type radiolist	2014-01-31 17:31:19 +01:00
Bart Visscher	12a900de25	Do setup default value handling in the controller not the template	2014-01-31 16:57:49 +01:00
Bart Visscher	bca725dc32	Merge branch 'master' into setup Conflicts: core/setup.php	2014-01-31 16:43:12 +01:00
Bart Visscher	b57299f727	Merge branch 'master' into db-convert-tool Conflicts: 3rdparty	2014-01-30 18:16:55 +01:00
Georg Ehrke	f7c291e276	remove empty line	2014-01-30 16:32:45 +01:00
Georg Ehrke	c5742520e1	don't urldecode get var, php does this automatically	2014-01-30 16:32:45 +01:00
Vincent Petry	63cca35baa	Added core unit tests for basename and dirname Note that it doesn't work 100% like the PHP functions so the tests have TODO comments to fix those core functions eventually.	2014-01-30 13:22:16 +01:00
Vincent Petry	f7ac9f8069	Fixed unit test scripts + coverage Tried to add more apps (others break). "preprocessors" is now populated automatically based on the tested apps.	2014-01-30 11:56:14 +01:00
Raghu Nayyar	299a8285bd	Merge pull request #6278 from nickvergessen/issue/6263 [issue/6263] layout.user.php code is not valid markup	2014-01-29 10:42:17 -08:00
Jan-Christoph Borchardt	271088a7a2	Merge pull request #6777 from owncloud/mobile-style Mobile style for public links: files, folders, picture sets	2014-01-29 09:17:02 -08:00
jbtbnl	f798ad9a20	Add white color variant of checkmark icon	2014-01-29 13:47:37 +01:00
Jan-Christoph Borchardt	13ed59c1cf	merge master into mobile-style	2014-01-29 10:55:44 +01:00
Morris Jobke	cf2c061f1f	Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink Sharing fixfiledownloadlink	2014-01-29 00:39:14 -08:00
Morris Jobke	25305a535b	Merge pull request #6958 from owncloud/localised_date use localised date in notification mails	2014-01-27 04:54:30 -08:00
Morris Jobke	0a1708ba11	Merge pull request #6912 from owncloud/replace-webroot-in-css Remove %webroot% from CSS	2014-01-27 04:11:15 -08:00
Bjoern Schiessle	2bb13a8db9	use localised date in notification mails	2014-01-27 12:47:54 +01:00
Jan-Christoph Borchardt	46745895ae	Merge pull request #5153 from owncloud/core-em-to-px Cleans up Core apps for relative(em) to absolute(px) styles.	2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt	6fbc73e673	Merge pull request #5152 from owncloud/files-em-to-px Converts em to px values for styles in Files.	2014-01-27 02:28:01 -08:00
raghunayyar	932e8f9f58	Fixes width of the dropdown menus as per computed styles.	2014-01-26 02:59:28 +05:30
Vincent Petry	3bea9b8ddd	Merge pull request #6905 from owncloud/add_expiredate_to_linkshare add expire date to link share if possible	2014-01-24 07:44:33 -08:00
Vincent Petry	c6695bbd76	Fixed download URL in public page - Refactored download URL building to make it overridable - Added download URL override in public page - Added JS unit tests for download URL - Added OC.redirect() method to facilitate unit testing	2014-01-24 13:38:39 +01:00
Vincent Petry	41b6d4b702	Added OC.buidQueryString() utility function Makes it possible to create query strings by passing a JavaScript hash map and automatically encodes the keys and values.	2014-01-24 12:44:31 +01:00
Bjoern Schiessle	77de47858b	add expire date to link share if possible	2014-01-24 10:46:08 +01:00
Thomas Müller	9fa788c452	Merge pull request #6736 from owncloud/tests-jsunittests Added Javascript unit tests	2014-01-23 12:43:05 -08:00
Jan-Christoph Borchardt	25e9b7a742	add icons.css file, first step to get rid of %webroot%	2014-01-23 12:55:39 +01:00
Thomas Müller	f950ce82ae	Merge branch 'master' into mobile-style Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php	2014-01-23 00:39:11 +01:00
Jan-Christoph Borchardt	f46e660737	do not check 'remember' log in by default	2014-01-21 17:02:59 +01:00
Morris Jobke	903b330ccc	Merge pull request #6721 from tsumi/patch-1 Added SVG fallback to apps settings popup	2014-01-18 08:34:45 -08:00
Morris Jobke	ce0cbbd7bc	remove comment & add space	2014-01-18 14:22:56 +01:00
Jan-Christoph Borchardt	3e803b5e36	restrict zooming on mobile devices for the publicly accessible, optimized pages	2014-01-17 14:41:05 +01:00
Jan-Christoph Borchardt	1d380a2011	optimize size of toggle icons	2014-01-17 13:28:25 +01:00
Jan-Christoph Borchardt	ccadab96a6	add icons for file list and picture view toggles	2014-01-17 12:51:13 +01:00
Konstantin.Popov	9d355f2124	remove fix for IE9 nav bar width	2014-01-17 13:41:51 +04:00
Vincent Petry	350214c609	Added Javascript unit tests - added karma utility to run jasmine unit tests - added Sinon library (for stubs/mocks/fakeserver) - added a few unit tests for core and files - added autotest-js.sh script	2014-01-16 17:12:29 +01:00
raghunayyar	12e5d0f68d	Fixes typos, adds ; wherever not present.	2014-01-16 21:06:14 +05:30
raghunayyar	775e08e0ee	Merge branch 'master' into core-em-to-px Conflicts: apps/files_sharing/css/public.css apps/user_ldap/css/settings.css core/css/multiselect.css core/css/share.css	2014-01-16 14:42:37 +05:30
raghunayyar	f975fd5499	Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase	2014-01-16 14:23:39 +05:30
Morris Jobke	5c1a9f35f1	Indicate password strength using strengthify * uses zxcvbn * outsourced to separate jquery plugin * async loading * hide strength meter if input is empty * feedback if user enters weakest password * fade in and out * show tipsy with strength * Opera 12, IE8-10, FF 23, Chromium 29	2014-01-15 11:10:12 +01:00
tsumi	f41255f652	Useless else removed As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922	2014-01-15 09:39:21 +01:00
Thomas Müller	92969052d7	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
Thomas Müller	fcf6653e64	Merge pull request #6694 from owncloud/fix-email-template-l10n fix email template l10n, emphasize filename	2014-01-13 04:34:28 -08:00
Bart Visscher	2638fd4767	Postgresql needs the sequences adjusted after the inserts	2014-01-11 12:25:35 +01:00
Bart Visscher	af3bedf985	Add option to remove all the tables from the destination database	2014-01-11 12:23:28 +01:00
Bart Visscher	1b7eb4dc6c	Quote column names on insert	2014-01-11 12:22:23 +01:00
tsumi	7c1649fc24	Added SVG fallback to apps settings popup This fix issue of calendar app with IE8, see issue report for details: https://github.com/owncloud/calendar/issues/291	2014-01-10 21:19:30 +01:00
Vincent Petry	1042733634	Fixed various file name escaping issues in core apps - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes	2014-01-10 15:02:26 +01:00
Joas Schilling	17c00f34d3	Add alt attribute for img elements	2014-01-10 10:19:08 +01:00
Joas Schilling	d95cab632b	Extend margin to avoid displaying a scrollbar	2014-01-10 10:17:19 +01:00
Joas Schilling	3ae17d0785	Fix unallowed child elements	2014-01-10 10:17:19 +01:00
Jan-Christoph Borchardt	76a7ae77a8	fix email template l10n, emphasize filename	2014-01-09 10:54:23 +01:00
blizzz	d8b8abb429	Merge pull request #6681 from owncloud/userreport add command line option to get user number statistics	2014-01-08 10:41:39 -08:00
Jenkins for ownCloud	6be2dee5bc	[tx-robot] updated from transifex	2014-01-08 01:55:41 -05:00
Jörn Friedrich Dreyer	f356894aa3	Merge pull request #6594 from owncloud/kill-index.php-from-url Kill index.php from url	2014-01-07 22:28:58 -08:00
Arthur Schiwon	bc1235d325	Add command line tool to show numbers of users and user directories	2014-01-07 23:06:37 +01:00
Jenkins for ownCloud	d2f2645a6a	[tx-robot] updated from transifex	2014-01-07 01:56:11 -05:00
Jenkins for ownCloud	0e843b9d7d	[tx-robot] updated from transifex	2014-01-06 01:55:59 -05:00
Morris Jobke	ce3df44699	Merge pull request #6031 from s0taka/master No decimal points for Kilobyte and Byte #5371.	2014-01-05 11:52:10 -08:00
Jenkins for ownCloud	e4616199df	[tx-robot] updated from transifex	2014-01-05 01:55:53 -05:00
Jenkins for ownCloud	095f9b8ee0	[tx-robot] updated from transifex	2014-01-02 01:56:21 -05:00
Thomas Müller	988710b0fc	avoid conflict with physical file config.js	2013-12-31 14:34:28 +01:00
Jenkins for ownCloud	760fa9ea30	[tx-robot] updated from transifex	2013-12-31 01:55:42 -05:00
Jenkins for ownCloud	9ea9638490	[tx-robot] updated from transifex	2013-12-30 01:55:38 -05:00
Jenkins for ownCloud	7b2f4b08ac	[tx-robot] updated from transifex	2013-12-26 01:55:34 -05:00
Jenkins for ownCloud	dbfe313a63	[tx-robot] updated from transifex	2013-12-25 01:55:35 -05:00
Thomas Müller	a87a18d56c	Merge pull request #6561 from syncloud/master Made admin password field required on client side	2013-12-24 14:25:01 -08:00
Bart Visscher	4e1a3f212f	Review points	2013-12-24 13:44:35 +01:00
Bart Visscher	202e26647e	Inject config object	2013-12-24 13:36:32 +01:00
Jenkins for ownCloud	dbbd99db09	[tx-robot] updated from transifex	2013-12-24 01:55:40 -05:00
Vladimir Sapronov	cef39243f8	Made password field required on client side Fix for case described in https://github.com/syncloud/owncloud-setup/issues/19	2013-12-22 17:43:50 -05:00
Jenkins for ownCloud	cd26631a6d	[tx-robot] updated from transifex	2013-12-21 01:56:13 -05:00
Frank Karlitschek	dc45141f4a	Merge pull request #6262 from nickvergessen/issue/4375 correctly mark app management active	2013-12-20 02:27:52 -08:00
Jenkins for ownCloud	37cdbc3be0	[tx-robot] updated from transifex	2013-12-19 01:57:03 -05:00
Simon Könnecke	8fdc4585f7	spaces to tabs	2013-12-18 15:43:45 +01:00
Thomas Müller	f57c38df77	Merge pull request #6431 from owncloud/core-pluraltranslationsfix Added plural translation fallback	2013-12-18 03:11:18 -08:00
Jenkins for ownCloud	6488ff2c75	[tx-robot] updated from transifex	2013-12-17 16:43:17 -05:00
Jenkins for ownCloud	a99dd3183c	[tx-robot] updated from transifex	2013-12-17 06:46:52 -05:00
Frank Karlitschek	753525c57f	Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb always show 'Deleted Files' breadcrumb	2013-12-17 00:25:06 -08:00
Bjoern Schiessle	3e17fbe30d	always show home breadcrumb in files view	2013-12-16 17:40:35 +01:00
Vincent Petry	d8d11e3976	Fixed JS plural function to be per app Some apps might not define the same "nplural" value. To avoid conflicts, the plural function is now generated per app. Fixes #6427	2013-12-16 16:00:23 +01:00
Jenkins for ownCloud	77b68505c2	[tx-robot] updated from transifex	2013-12-13 14:44:31 -05:00
Vincent Petry	ad998c1fb5	Merge pull request #6390 from owncloud/migration-fixwebroot Fix webroot for update page	2013-12-13 05:35:29 -08:00
Vincent Petry	df1a404466	Fix webroot for update page On the update page, config.js was missing which caused oc_webroot to not be available. That would trigger the faulty oc_webroot fallback that didn't take URLs like "/owncloud/index.php/files/apps" into account. This fix adds config.js in the update page and also a fix for the oc_webroot fallback, in case it is used elsewhere.	2013-12-13 12:56:48 +01:00
Jenkins for ownCloud	7b20212c0a	[tx-robot] updated from transifex	2013-12-11 13:32:13 -05:00
Vincent Petry	22abc53e3b	Merge pull request #5968 from owncloud/legacy-popup-fixes fix the legacy popup to make calendar settings look nicer	2013-12-10 05:37:52 -08:00
Joas Schilling	009e25788f	correctly mark app management active	2013-12-09 15:53:31 +01:00
Jenkins for ownCloud	6aab1ebf44	[tx-robot] updated from transifex	2013-12-09 06:40:22 -05:00
Jan-Christoph Borchardt	e574158bd8	fix shadow size and arrow position	2013-12-09 12:21:37 +01:00
blizzz	bc3650e48c	Merge pull request #6231 from owncloud/fix-plural-l10n fix plural translation - fixes #6226	2013-12-09 01:41:06 -08:00
Jenkins for ownCloud	079d20a80e	[tx-robot] updated from transifex	2013-12-07 22:28:29 -05:00
Morris Jobke	823c85e65f	Merge pull request #6202 from owncloud/fix_6032_alt Add overlay noscript message to fix #6032	2013-12-07 08:04:29 -08:00
Morris Jobke	3444c15b86	fix IE8 transparent background	2013-12-07 17:03:53 +01:00
Bart Visscher	731e83c35a	Save the new database config	2013-12-07 15:14:54 +01:00
Bart Visscher	22edc42f54	Add UTF8 charset to connection params	2013-12-07 15:09:36 +01:00
Bart Visscher	e4c31b362e	Add command for converting sqlite database to server based one	2013-12-07 14:44:23 +01:00
Morris Jobke	4c4c9096c4	fix plural translation - fixes #6226	2013-12-07 11:38:01 +01:00
ringmaster	1dc9998920	Remove reference to ownCloud.	2013-12-05 17:01:51 -05:00
unknown	853373348c	Slide duration set to 200ms for multiselect (same duration as user menu)	2013-12-05 15:46:13 -05:00
Morris Jobke	ec0aa6bb65	Revert "Merge pull request #6210 from owncloud/fix-5865" This reverts commit `f12363d90b`, reversing changes made to `eba35d28cd`.	2013-12-05 21:03:17 +01:00
unknown	fd3aae6691	Changed duration of slideDown, slideUp and fadeOut to 200ms	2013-12-05 13:15:52 -05:00
ringmaster	e7748613ef	Link to enable-javascript.com	2013-12-05 12:06:20 -05:00
ringmaster	1687ec0cd2	Make noscript message translatable	2013-12-05 09:52:13 -05:00
ringmaster	38745e4bd1	Move message up 10%	2013-12-05 09:48:20 -05:00
ringmaster	bdab0409c4	Add overlay noscript message to fix #6032	2013-12-05 09:19:46 -05:00
Morris Jobke	1620015531	fix appearance of error message - .errors is outdated	2013-12-05 11:23:30 +01:00
Jenkins for ownCloud	7e702f294f	[tx-robot] updated from transifex	2013-12-04 18:14:17 -05:00
Vincent Petry	72f80c972f	Merge pull request #5946 from owncloud/public-page-details Public page details	2013-12-03 07:26:00 -08:00
Thomas Müller	ab21e1b16e	Merge pull request #5931 from owncloud/fix-time-field-properly fix time input field properly, details	2013-12-03 07:23:04 -08:00
zombiehugs	519f63ee97	Revert "[fix] Center Share Dropdown & Versions Dropdown" This reverts commit `1dbbfcf3dc`.	2013-12-03 08:23:13 -06:00
zombiehugs	1dbbfcf3dc	[fix] Center Share Dropdown & Versions Dropdown Center Share Dropdown & Versions Dropdown	2013-12-03 08:14:06 -06:00
Morris Jobke	b3a96c081b	fix public page - gallery view issues	2013-12-03 13:46:58 +01:00
Jan-Christoph Borchardt	c44f534c2b	account for shift of controls bar due to app navigation, do not shift on public page	2013-12-03 10:54:16 +01:00
Jenkins for ownCloud	83ec234f53	[tx-robot] updated from transifex	2013-12-02 17:28:29 -05:00
Thomas Müller	338a55e36c	Merge pull request #6128 from owncloud/fix-6126-master Also merge autoconfig variables into $_REQUEST.	2013-11-29 11:22:44 -08:00
Jenkins for ownCloud	1b18c5a047	[tx-robot] updated from transifex	2013-11-29 14:10:40 -05:00
Andreas Fischer	2ec085b51f	Also merge autoconfig variables into $_REQUEST.	2013-11-29 16:24:48 +01:00
Frank Karlitschek	1dc931b778	Merge pull request #5984 from owncloud/nav-scrollbar always show app navigation scrollbar when too many apps in there	2013-11-29 03:27:50 -08:00
Morris Jobke	587fc1aff3	Fix resize issue for trash button in chrome and overflowing spinner in .update class fixes #6108	2013-11-28 21:36:43 +01:00
Frank Karlitschek	6c16d45dc7	Merge pull request #6070 from ganomi/showstars Show stars as password placeholder for sharing	2013-11-28 02:16:44 -08:00
Morris Jobke	54b24ca88d	Merge pull request #6048 from owncloud/encryption_initial_enc_indicator show a message at the log-in screen if inital encryption take place	2013-11-27 14:10:11 -08:00
Morris Jobke	55d7cf8ffd	improve encryption message	2013-11-27 23:07:19 +01:00
Bjoern Schiessle	0219b8b3b9	add spinner to the template so that it can be loaded in time	2013-11-27 22:36:47 +01:00
Bjoern Schiessle	e0924a5f07	switch to large spinner	2013-11-27 21:58:38 +01:00
Jenkins for ownCloud	4a78f12682	[tx-robot] updated from transifex	2013-11-27 12:10:54 -05:00
Bjoern Schiessle	1536c7ea58	switch from "name" attribute to "id"	2013-11-27 17:01:21 +01:00
Morris Jobke	6b3b3d8af4	Fix for IE - an ugly horizontal scrollbar appears * for IE9 the nav bar was too narrow * for other IEs the width of each app element was to wide and cause the horizontal scoll bar - now this content is hidden like before this PR	2013-11-27 16:45:04 +01:00
Morris Jobke	41c6752030	fix navbar	2013-11-27 16:10:49 +01:00
Jan-Christoph Borchardt	3360719bbf	prevent shift of app names caused by scrollbar, part 2	2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt	f9f123c6f6	prevent shift of app titles caused by scrollbar	2013-11-27 16:10:48 +01:00
Jan-Christoph Borchardt	457a7d4baa	always show app navigation scrollbar when too many apps in there	2013-11-27 16:10:48 +01:00
ganomi	33e77d34f4	Show stars as placeholder	2013-11-26 20:17:13 +01:00
Bjoern Schiessle	7240d349da	Merge branch 'master' into encryption_initial_enc_indicator	2013-11-26 19:15:53 +01:00
Bjoern Schiessle	c7e1fe50c2	added a small version of the dark loading gif, looks nicer on the blue background	2013-11-26 17:14:16 +01:00
Jenkins for ownCloud	fb7aa2f014	[tx-robot] updated from transifex	2013-11-26 10:47:07 -05:00
Morris Jobke	81f6be92ef	Translate reload message after update fixes #6064	2013-11-26 16:22:01 +01:00
Robin Appelman	10d84f6e9b	Add a (currently) empty system for running common repair steps	2013-11-26 14:12:48 +01:00
Jenkins for ownCloud	dc67c7efa9	[tx-robot] updated from transifex	2013-11-26 04:04:05 -05:00
Bjoern Schiessle	d6fb2afa85	show a message at the log-in screen if inital encryption take place	2013-11-25 23:49:05 +01:00
Robin Appelman	9fbccc83e3	merge master into single-user-mode	2013-11-25 21:25:04 +01:00
icewind1991	4626fae882	Merge pull request #6038 from owncloud/occ-app-enable add occ commands for enabling and disabling apps	2013-11-25 10:12:49 -08:00
Robin Appelman	abe63bd329	Add occ command to list all apps	2013-11-25 17:34:16 +01:00
Robin Appelman	fc1d897ea5	rename app_id to app-id	2013-11-25 17:28:01 +01:00
Morris Jobke	4dc35909b5	Fix navbar issue fixes #6024	2013-11-25 17:04:19 +01:00
Robin Appelman	1bcb04f94e	Add template for single user mode message	2013-11-25 15:59:37 +01:00
Robin Appelman	a324c09e6c	Add occ command to enable and disable single user mode	2013-11-25 15:27:05 +01:00
Robin Appelman	d3bfb433d1	add occ commands for enabling and disabling apps	2013-11-25 13:20:16 +01:00
Simon Könnecke	243f3f0c4c	No decimal points for Kilobyte and Byte #5371 .	2013-11-25 12:26:03 +01:00
Thomas Müller	60e2ee631a	Merge pull request #5998 from owncloud/navigation-fix Doesn't Cut the top arrow from navigation	2013-11-24 15:02:56 -08:00
Jenkins for ownCloud	ba0e09adce	[tx-robot] updated from transifex	2013-11-24 00:14:51 -05:00
Morris Jobke	ae6610f0ea	fix navigation scrollbar	2013-11-22 15:48:24 +01:00
Jenkins for ownCloud	60cfdae503	[tx-robot] updated from transifex	2013-11-21 21:07:12 -05:00
raghunayyar	aa5d5a422f	Doesn't Cut the top arrow from navigation	2013-11-22 02:10:22 +05:30
Jenkins for ownCloud	5d9731cef2	[tx-robot] updated from transifex	2013-11-21 10:05:34 -05:00
Thomas Müller	02b92137b3	unify translation string - less work for the translators	2013-11-21 09:58:35 +01:00
Jan-Christoph Borchardt	5cb8fd2bad	fix the legacy popup to make calendar settings look nicer	2013-11-20 16:29:00 +01:00
Frank Karlitschek	8bc339413b	Merge pull request #5926 from owncloud/less-bold remove bold from legend, table header, label - less obtrusive	2013-11-19 13:57:21 -08:00
Jan-Christoph Borchardt	59e75d4326	fix time input field properly, details	2013-11-18 19:44:56 +01:00
Jan-Christoph Borchardt	b678766c7d	remove bold from legend, table header, label - less obtrusive	2013-11-18 17:32:06 +01:00
Jan-Christoph Borchardt	463b054530	adjust input CSS to multiline, coding guidelines	2013-11-18 16:14:13 +01:00
Jan-Christoph Borchardt	8dd50dc9a6	fix input type time fields, have them use the default styles	2013-11-18 14:51:43 +01:00
Bjoern Schiessle	7f3d717037	Check which permissions are possible to re-share a file	2013-11-18 11:58:42 +01:00
Jenkins for ownCloud	c3746e866a	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05:00
Vincent Petry	f670d74634	Added min-height in case of empty multi-select	2013-11-14 14:26:48 +01:00
Vincent Petry	55355ba28e	Fixed multiselect to not set the button's height on itself after select Fixes #5841	2013-11-14 14:18:22 +01:00
Thomas Müller	d4c0ac7790	introduce auto completion on share email - integrated with the contactsmanager api	2013-11-14 09:38:55 +01:00
Morris Jobke	c9517c4fc8	new line for css rule	2013-11-12 11:31:58 +01:00
Arthur Schiwon	5c31440dcd	Disabled textareas should look like they are disabled	2013-11-11 19:41:51 +01:00
Jenkins for ownCloud	3428c03b80	[tx-robot] updated from transifex	2013-11-09 01:45:32 -05:00
Jenkins for ownCloud	263603aa4c	[tx-robot] updated from transifex	2013-11-06 21:44:36 -05:00
Thomas Müller	3488202f67	Merge pull request #5582 from owncloud/files-previewcaching Append file etag to preview URLs	2013-11-05 01:21:51 -08:00
Jenkins for ownCloud	e89f080f09	[tx-robot] updated from transifex	2013-11-03 14:39:28 -05:00
Jenkins for ownCloud	07e540613e	[tx-robot] updated from transifex	2013-11-03 12:44:12 -05:00
Andreas Fischer	c40515c33f	Merge pull request #5531 from owncloud/upgrade-form-occ Add `occ upgrade` command. * owncloud/upgrade-form-occ: Add some color to the occ upgrade output. Use "else if" to remove one level of indentation. Missed one write()->writeln(). Fixed. Use writeln() instead of write() Use the OutputInterface for output and return error codes. Move all upgrade routines into the command-line tool. Add `occ upgrade` command.	2013-10-31 15:30:35 +01:00
Vincent Petry	28fbc1b3cc	Fixed input field and tipsy positioning in singleselect If the user scrolls or the window is resized, the formerly cached offset was wrong. This fix makes sure the offset is re-read before showing the input field.	2013-10-31 10:50:18 +01:00
Vincent Petry	9d230bcc75	Improve quota input field - Added tooltip with examples - The quota value returned by the server is now displayed after update - Fixes #5346	2013-10-30 20:46:53 +01:00
Bjoern Schiessle	4c7082bf1d	allow to share a file/folder as public link also if one of it parents was already shared as link	2013-10-30 17:03:53 +01:00
Jenkins for ownCloud	54ae799cd9	[tx-robot] updated from transifex	2013-10-30 03:33:25 -04:00
Andreas Fischer	70111ea299	Add some color to the occ upgrade output.	2013-10-28 22:26:44 +01:00
Andreas Fischer	b8dbec0da4	Use "else if" to remove one level of indentation.	2013-10-28 22:22:59 +01:00
ringmaster	f130caa4a2	Missed one write()->writeln(). Fixed.	2013-10-28 17:06:36 -04:00
ringmaster	bca1e12597	Use writeln() instead of write()	2013-10-28 16:53:36 -04:00
ringmaster	d1c5e5d777	Use the OutputInterface for output and return error codes.	2013-10-28 16:50:28 -04:00
Thomas Müller	8ab5da0833	Merge pull request #5592 from owncloud/lost_password_screen Fixing lost password-screen	2013-10-29 09:50:32 -07:00
Morris Jobke	7223b5acce	Merge pull request #5396 from owncloud/fix-sharing-code Fix sharing error message - id -> file name	2013-10-29 07:33:23 -07:00
Morris Jobke	b56c936212	also add new parameter to function calls	2013-10-29 14:22:24 +01:00
Morris Jobke	ffbcfef614	fix lost password screen - reuse available CSS rules	2013-10-29 13:42:39 +01:00
Jenkins for ownCloud	b0b76fe064	[tx-robot] updated from transifex	2013-10-29 07:31:51 -04:00
Julian Müller	776346b503	Fixing the lost Password Screen	2013-10-29 01:33:12 +01:00
Julian Müller	e9caaa933c	Fixing the Lost Password Screen	2013-10-29 01:29:38 +01:00
ringmaster	a24cbb50af	Move all upgrade routines into the command-line tool.	2013-10-28 10:15:56 -04:00
Vincent Petry	e62ca4ea4f	Append file etag to preview URLs Fixes #5534	2013-10-28 14:14:55 +01:00
Jenkins for ownCloud	8df8211225	[tx-robot] updated from transifex	2013-10-27 07:27:22 -04:00
Jenkins for ownCloud	119ecc6f34	[tx-robot] updated from transifex	2013-10-27 02:32:11 -04:00
Arthur Schiwon	3248b0e2be	Fix broken users page when a username consists of digits only, fixes #5560	2013-10-25 22:00:32 +02:00
ringmaster	29a21466f3	Add `occ upgrade` command.	2013-10-24 13:59:39 -04:00
Thomas Müller	3917d18980	Merge pull request #5528 from frisco82/changeUpadateNotification Changed update message to be more instructive	2013-10-24 10:28:17 -07:00
Ramiro Aparicio	3a81c8e3af	Changed update message to be more instructive, changed update style to be less aggresive Fix br tags Improve english messages	2013-10-24 19:21:40 +02:00
Vincent Petry	2102ab8fec	Fix leftcontent/right content, fixes tasks app Tasks app layout was broken since the controls bar is higher now. This change should hopefully fix other apps using the same layout.	2013-10-24 12:28:28 +02:00
Thomas Müller	535bc7b664	Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename prevent user from creating or renaming sth. to an existing filename	2013-10-23 13:45:27 -07:00
Thomas Müller	291cdbdd98	Merge pull request #5497 from owncloud/ie8-placeholdershim Ie8 placeholdershim	2013-10-23 13:18:37 -07:00
Thomas Müller	e95ad29d90	Merge pull request #5435 from owncloud/share-improvements Share improvements	2013-10-23 09:56:24 -07:00
Vincent Petry	086b82bd69	Fixed sharing dropdown placeholders in IE8/9 Added jquery.placeholder shim to handle input field placeholders in IE8/9	2013-10-23 18:51:25 +02:00
Thomas Müller	1317b7c03d	pass the name of the item source from the browser to the server - no need to get the data via complicated db queries	2013-10-23 18:39:37 +02:00
Vincent Petry	88c2646f7e	Fixed share dropdown checkbox wrapping The "show cruds" button is now embedded into the last label/checkbox group and wraps with it. Added ellipsis to prevent long names to exceed the dropdown's width.	2013-10-23 17:58:27 +02:00
Jan-Christoph Borchardt	a2e9c0f81a	better wording for share input field and share link	2013-10-23 17:57:06 +03:00
Vincent Petry	9aa164f381	Renamed current placeholder jquery plugin to imageplaceholder This is to prevent conflicts with jquery libs that handle text placeholders in IE8	2013-10-23 16:47:25 +02:00
Vincent Petry	9656280252	Added left padding to notCreatable message	2013-10-23 16:20:53 +02:00
Jörn Friedrich Dreyer	c478a792fb	add missing ;	2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer	20716a153a	fix message dialog titles in IE8	2013-10-23 10:58:25 +02:00
Jörn Friedrich Dreyer	45e6d96702	prevent user from creating or renaming sth. to an existing filename - show tooltip when violating naming constraints while typing - when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong - fixes #5062 - also fixes some whitespace and codestyle issues in files js - uses css selector over filterAttr in touched js files	2013-10-22 18:11:03 +02:00
Thomas Müller	cadd71ec8a	Merge pull request #5455 from owncloud/fixing-2423-master introduce link_to_docs() and migrate links	2013-10-22 01:28:43 -07:00
Frank Karlitschek	6915367622	Merge pull request #5446 from frisco82/fixNotifyUser Fix notify user checkbox	2013-10-21 14:07:33 -07:00
Vincent Petry	fa1864971e	Merge pull request #5120 from frisco82/sendEmailJS Fix disabled status after sending a share link email	2013-10-21 13:02:52 -07:00
Thomas Müller	148d2616e5	introduce link_to_docs() and migrate links	2013-10-21 21:29:45 +02:00
Vincent Petry	635a46b373	Merge pull request #5444 from frisco82/fixDisplayGroup Fix display name for user after sharing	2013-10-21 12:05:14 -07:00
Vincent Petry	bd7cf436c6	Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix Fixed share with link checkbox missing as regular user	2013-10-21 11:46:01 -07:00
Jenkins for ownCloud	a376407da3	[tx-robot] updated from transifex	2013-10-21 13:03:32 -04:00
Ramiro Aparicio	b27595888a	fix notify user, and made js more resiliant to changes	2013-10-21 16:14:23 +02:00
Ramiro Aparicio	85edbb08c1	fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used	2013-10-21 15:31:31 +02:00
Vincent Petry	f8717bc260	Fixed share with link checkbox missing as regular user Instead of loading the app config setting "shareapi_allow_links" using a synchronous ajax call that fails when the user is not an admin, this fix puts the flag directly in the template so it doesn't need to be loaded afterwards. Fixes #5440	2013-10-21 11:29:40 +02:00
Frank Karlitschek	f5a6d6b43e	Merge pull request #5200 from owncloud/ie8-warning-fix Fix warning box in IE8	2013-10-20 23:55:18 -07:00
Jan-Christoph Borchardt	dbcfb1b830	beautify 'you dont have write permissions' notice, fix #2770	2013-10-20 23:15:58 +03:00
Jan-Christoph Borchardt	84d4d797d1	shorten string to 'notify by email', cut 'user'	2013-10-20 23:04:24 +03:00
Jan-Christoph Borchardt	fc7269e728	remove hover hide/show stuff for share dropdown to make things more obvious	2013-10-20 23:03:48 +03:00
Jan-Christoph Borchardt	1e8af6c5ef	bold share username	2013-10-20 22:52:18 +03:00
Jan-Christoph Borchardt	846ce67d01	properly align checkboxes to text	2013-10-20 22:51:04 +03:00
Jan-Christoph Borchardt	5b75673e77	more breathing space in share list	2013-10-20 22:48:25 +03:00
Jan-Christoph Borchardt	fbd0076be0	remove superfluous input hover color change	2013-10-20 22:38:14 +03:00
Jan-Christoph Borchardt	fa66dfff80	input field background size to white, fix input fields seeming disabled, fix #5168	2013-10-20 21:22:41 +03:00
Jenkins for ownCloud	6aee83cadf	[tx-robot] updated from transifex	2013-10-19 08:27:13 -04:00
Morris Jobke	b201e87af6	Merge pull request #5338 from frisco82/fixGroupDisplay Show (group) after groups in share dropdown	2013-10-18 05:46:05 -07:00
Jan-Christoph Borchardt	7297c6a5ef	Merge pull request #5403 from owncloud/fix-breadcrumbs correctly position ... overflow in breadcrumbs, fix #5158	2013-10-18 05:28:48 -07:00
Morris Jobke	0febccee49	readability: single line -> multiple lines	2013-10-18 10:39:02 +02:00
Michael Gapczynski	7f9ff51308	Fix accidental deletion of if	2013-10-18 10:34:31 +02:00
Michael Gapczynski	a2c80bbc68	Don't show links option in dropdown if disabled	2013-10-18 10:34:30 +02:00
Jan-Christoph Borchardt	07b885e291	correctly position ... overflow in breadcrumbs, fix #5158	2013-10-17 21:22:55 +03:00
Jenkins for ownCloud	2845747528	[tx-robot] updated from transifex	2013-10-17 13:48:52 -04:00
Morris Jobke	01349850b0	Merge pull request #5381 from owncloud/files-sharingstateafterupload Fixed sharing status update for new/uploaded files	2013-10-17 05:51:12 -07:00
Vincent Petry	8a5c761239	Added missing var in share.js	2013-10-17 14:39:20 +02:00
Vincent Petry	467f864db4	Fixed sharing status update for new/uploaded files Creating new files, folders or uploading files now have their sharing icon updated accordingly. For this, the global share status list that is cached in OC.Share.statuses is reused for new files. Performance should improve as the sharing list is now only loaded once per navigation session. In OC.Share, split loadIcons into loadIcons + updateIcons. Fixes #4977	2013-10-17 12:55:10 +02:00
Thomas Müller	6e1881dbe4	new console command to generate sql migration scripts	2013-10-17 12:51:30 +02:00
raghunayyar	e7603aa6b4	Updates ownCloud title to Application - ownCloud	2013-10-17 14:10:06 +05:30
Morris Jobke	a132144eca	Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix Fixed conflict dialog in IE8	2013-10-16 12:52:41 -07:00
Morris Jobke	1c4dbaeab1	Fix warning box in IE8 * simulates a black transparent background on a blue pane	2013-10-16 21:45:11 +02:00
Jenkins for ownCloud	630be99ddf	[tx-robot] updated from transifex	2013-10-16 00:31:48 -04:00
Raghu Nayyar	8c25b5a0c1	Merge pull request #5295 from owncloud/show-eye-in-personal Shows The Eye permanently in the Confirm Password field in Personal Settings	2013-10-15 02:59:53 -07:00
raghunayyar	2def1a8853	Removes Bogus showpassword js. thx @PVince81	2013-10-15 14:41:18 +05:30
raghunayyar	4eed240296	Should Display PasswordToggle Eye Everywhere.	2013-10-15 11:36:44 +05:30
Ramiro Aparicio	8ac518bb3e	Show (group) after groups in share dropdown	2013-10-14 20:17:45 +02:00
Jenkins for ownCloud	f3336f8877	[tx-robot] updated from transifex	2013-10-13 20:33:30 -04:00
Morris Jobke	a021a12b3b	Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator Fixed external storage status indicator in admin page	2013-10-13 13:03:02 -07:00
raghunayyar	e961dbaa38	Shows The Eye permanently in the Confirm Password field in Personal Settings - fix #5167	2013-10-12 12:42:23 +02:00
Morris Jobke	e6d034a60b	Merge pull request #5290 from owncloud/fixing-5191-master Installation. Show advanced section on error. Fixes #5191	2013-10-12 03:28:44 -07:00
Thomas Müller	46dd273b9c	Merge pull request #5287 from owncloud/core-layoutviewportdirective Fixed viewport layout using commas instead of semicolons	2013-10-12 01:36:20 -07:00
Victor Dubiniuk	8ce3ae50f0	Improve expand/collapse logic	2013-10-11 16:35:59 +03:00
Victor Dubiniuk	a2445888e8	Show advanced section on error. Fixes #5191	2013-10-11 14:48:31 +03:00
Thomas Tanghus	31714f8871	Merge pull request #5133 from owncloud/js_vcategories_to_tags Js vcategories to tags	2013-10-11 04:17:59 -07:00
Vincent Petry	f8c865993f	Fixed viewport layout using commas instead of semicolons Fixes #5285	2013-10-11 12:52:34 +02:00
Vincent Petry	bced346c3b	Now using smaller spinner image for status indicator To make the status indicator appear smaller, even in IE8 that doesn't support background-size, there is no a smaller animated gif "loading-small" for that purpose.	2013-10-11 12:36:30 +02:00
Jenkins for ownCloud	44a5b0bad0	[tx-robot] updated from transifex	2013-10-10 22:30:58 -04:00
Jake Wilson	5144def99b	Moved Core Theme Logos to CSS In order to make it easier for a user/developer to replace logos in the core theme, I removed the hardcoded `logo.svg` and `logo-wide.svg` from the html, and replaced them with `div`s that use css background-image instead. This has multiple advantages: 1. The user can now use any filename they want for the logo. They are no longer forced to use logo.svg or logo-wide.svg. 2. The user can now easily use a JPG, PNG or GIF logo instead of SVG (SVG's are awesome, but used by an unfortunately small percentage of web developers at the current time. Most probably don't even know how to make an SVG…). 3. The user doesn't have to resort to hacking the core theme template files in order to use a different filename or file type. 4. Greatly simplifies documentation instructions for how to change the logos (http://owncloud.org/theming/). Signed-off-by: Jake Wilson <jakew@huebnerpetersen.com>	2013-10-10 12:29:13 -06:00
Vincent Petry	e2a4417079	Fixed conflict dialog in IE8 - Fixed JS error that prevent the conflict dialog to open #5060 - Fixed JS error that prevented the overwrite case to run	2013-10-10 15:54:00 +02:00
Morris Jobke	cf554fd804	Merge pull request #5182 from owncloud/fix-sharring-with-password-screen Fix password screen for public shares	2013-10-10 04:49:47 -07:00
Morris Jobke	d968843bf6	Merge pull request #5244 from owncloud/more-css-fixes More css fixes	2013-10-10 04:48:11 -07:00
Björn Schießle	6053007768	Merge pull request #5210 from owncloud/sharing_search_users_fix find users which are in the same group	2013-10-10 01:50:51 -07:00
Vincent Petry	599383c8b1	Merge pull request #5183 from owncloud/login-warningstyle Fixed login warning style	2013-10-09 04:18:14 -07:00
Vincent Petry	01371e3187	Fixed login warning style #5065 Removed bold so it takes less space and set alignment to left.	2013-10-09 11:15:54 +02:00
Bjoern Schiessle	835f36cb09	find users which are in the same group	2013-10-08 16:43:23 +02:00
Jenkins for ownCloud	209392587f	[tx-robot] updated from transifex	2013-10-08 07:24:19 -04:00
kondou	c99c3ea9e6	Optimize confirm.[svg\|png] with optipng and scour	2013-10-08 02:40:13 +02:00
Jenkins for ownCloud	c655eec3d1	[tx-robot] updated from transifex	2013-10-07 12:21:38 -04:00
Morris Jobke	4af220d09e	Fix password screen for public shares * Works in IE8, 9, 10, Firefox 24 and Chromium 30 * Credits to Julian Müller @Julian1998	2013-10-07 17:38:27 +02:00
VicDeo	d8b7e42fc1	Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes File conflicts dialog fixes	2013-10-07 08:19:40 -07:00
Thomas Müller	b48dffa9a3	Merge pull request #5072 from owncloud/apache-auth-master OC6 Apache Authentication	2013-10-07 06:29:56 -07:00
Vincent Petry	e97aaee1aa	Prevent share dropdown to close too early with autocomplete When clicking on an autocomplete result in the sharing dropdown, it will mistakenly be detected as being clicked outside and would trigger the sharing dropdown closing. This fix adds a check to detect clicks inside the autocomplete and prevent closing the dropdown in that case. This fixes #4142	2013-10-07 13:26:46 +02:00
Vincent Petry	68fbd7b922	Fixed label for sharing notification to be clickable Fixed the sharing notification checkbox label in the file sharing dropdown, which makes it possible to click on the label directly.	2013-10-07 13:15:25 +02:00
Vincent Petry	27579f36f6	Prevent scroll up when click on links in sharing dropdown When clicking on a link that points to "#" in the sharing dropdown, and the current view is scrolled down, the browser will scroll the page up to the top (anchor behavior). This fix cancels the click event when clicking on "unshare" link or "show crud" link.	2013-10-07 13:11:34 +02:00
Thomas Müller	131d82e41e	move call to print_unescaped() to template	2013-10-07 11:49:43 +02:00
Jörn Friedrich Dreyer	5a174eba83	use correct property for mimetype of existing files	2013-10-07 11:14:11 +02:00
Jenkins for ownCloud	3613e79e10	[tx-robot] updated from transifex	2013-10-06 19:16:10 -04:00
Morris Jobke	09d2ba017e	fix undefined $htaccessWorking	2013-10-07 00:36:42 +02:00
Jan-Christoph Borchardt	94ae66c651	fix web interface showing very small when accessed on smartphone	2013-10-06 22:50:11 +03:00
Jan-Christoph Borchardt	676ded0c63	properly indent contents of folders for app styles, to line up with text	2013-10-06 22:40:29 +03:00
Jan-Christoph Borchardt	c8c83e0e02	improve clickability of footer link	2013-10-06 22:35:24 +03:00
Morris Jobke	1537410a31	Merge pull request #5154 from owncloud/fix-appimages fix mobile and desktop app images looking different	2013-10-06 12:31:54 -07:00
kondou	bf83b1eb90	Optimize images with optipng	2013-10-06 21:20:49 +02:00
raghunayyar	4687d2dd0b	All Core Styles from em->px, apart from styles.css	2013-10-07 00:01:29 +05:30
Owen Winkler	08e1147a6b	Merge pull request #4982 from syncloud/master Automatic config can set some of parameters or all of them	2013-10-05 16:13:46 -07:00
Jan-Christoph Borchardt	11a69fbddf	fix mobile and desktop app images looking different	2013-10-05 15:40:00 +03:00
VicDeo	485bb100b3	Merge pull request #5131 from owncloud/fix-5130 Allow "Finishing..." button on setup page to be translated.	2013-10-05 02:32:28 -07:00
Jan-Christoph Borchardt	2b521327c0	more elegant style for Personal and Admin settings	2013-10-05 11:23:49 +02:00
vsapronov	46ca1eb91b	Moving Advanced button out of datadirField fieldset	2013-10-04 20:46:00 -04:00
Morris Jobke	cc1e69c190	Merge pull request #5136 from owncloud/design-fixes Design fixes	2013-10-04 14:56:09 -07:00
Thomas Tanghus	9c230f8c85	Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vcategories_to_tags	2013-10-04 20:03:31 +02:00
Thomas Tanghus	0e0927a887	It's 'status', not 'result'!	2013-10-04 20:02:33 +02:00
Thomas Tanghus	6d3bbc5eeb	Fix typo	2013-10-04 19:55:03 +02:00
Jan-Christoph Borchardt	1cae6661df	add useful icon from News app to core	2013-10-04 20:27:01 +03:00
Jan-Christoph Borchardt	2166d99b53	prevent hover effect when settings are open	2013-10-04 20:24:07 +03:00
Jan-Christoph Borchardt	0b78db4750	fix disabled buttons not showing icons	2013-10-04 20:21:36 +03:00
Thomas Tanghus	f19a236c8e	Remove obsolete files.	2013-10-04 17:24:28 +02:00
Thomas Tanghus	12bb197028	JS version of the OCP\ITags interface	2013-10-04 17:21:52 +02:00
ringmaster	85f63d4f77	Allow "Finishing..." button on setup page to be translated. Fixes #5130.	2013-10-04 11:09:59 -04:00
Jan-Christoph Borchardt	0c53269b5e	remove specific border-radius for .primary button as it should be specific to log in instead	2013-10-04 17:37:20 +03:00
Jan-Christoph Borchardt	041837de2c	merge master into input-simplify	2013-10-04 17:08:34 +03:00
Vincent Petry	e257c3f27c	Fixed array syntax to work with PHP 5.3 It seems that array brackets are only supported starting with PHP 5.4. Fixed the array brackets to be compatible and not cause a syntax error in PHP 5.3.	2013-10-04 14:28:11 +02:00
Ramiro Aparicio	8b62b2684a	Fix disabled status after sending the email	2013-10-04 13:10:51 +02:00
Bjoern Schiessle	51295e9a6b	Merge branch 'master' into sharing_mail_notification_master Conflicts: apps/files/index.php apps/files/templates/index.php	2013-10-04 12:30:49 +02:00
Bjoern Schiessle	a223cf769a	Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master Conflicts: core/ajax/share.php	2013-10-04 12:27:18 +02:00
Bjoern Schiessle	304803d102	fix array_diff call	2013-10-04 12:23:40 +02:00
Thomas Müller	514d7a884a	Merge pull request #5107 from owncloud/user_skeleton make it possible to prepopulate a new user home with a skeleton	2013-10-04 02:57:17 -07:00
Frank Karlitschek	566d826a9e	add a real examplefile instead of an .gitignore which is a bit stupid here	2013-10-04 10:21:33 +02:00
Morris Jobke	ecd2bf2a55	Merge pull request #5109 from owncloud/controls-bar-height Controls bar height	2013-10-04 01:01:54 -07:00
Jan-Christoph Borchardt	c335169f6d	increase height of controls bar and elements to more clickable 44px	2013-10-04 08:41:16 +03:00
kondou	b0ff10a536	Hide defaultavatar in #header and don't darken proper avatars in #header	2013-10-04 02:27:53 +02:00
Frank Karlitschek	e40afbebc6	make it possible to prepopulate a new user gome with a skeleton	2013-10-03 23:22:11 +02:00
Jan-Christoph Borchardt	3c13afee98	better style and color for warning and success feedback on inputs	2013-10-03 16:58:48 +03:00
Jan-Christoph Borchardt	308d4383a3	simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius	2013-10-03 16:35:42 +03:00
Vincent Petry	d09b1553d0	Fixed syntax error in array	2013-10-03 11:31:21 +02:00
Thomas Müller	9c23c3449b	Merge branch 'master' into sharing_mail_notification_master Conflicts: core/css/share.css	2013-10-02 23:33:50 +02:00
Morris Jobke	99fa4898fd	just fix whitespace stuff	2013-10-02 18:27:55 +02:00
Bart Visscher	a90ea2c069	Merge remote-tracking branch 'origin/master' into setup	2013-10-02 18:23:59 +02:00
Bart Visscher	5db98aadd3	Copyright and small fix	2013-10-02 18:23:47 +02:00
Jan-Christoph Borchardt	5feaa55779	simplify From Link icon in New menu	2013-10-02 18:27:39 +03:00
Jan-Christoph Borchardt	c548edd90f	remove box-shadows for header, navigation and controls bar - looks sharper and less washed out	2013-10-02 17:59:38 +03:00
Jan-Christoph Borchardt	8ce26297b9	reduce rounded corners of Share and Versions dropdown	2013-10-02 17:53:54 +03:00
Bjoern Schiessle	8b08b1b455	Merge branch 'master' into sharing_mail_notification_master Conflicts: lib/private/util.php	2013-10-02 10:11:18 +02:00
Thomas Müller	3e4d56d7bb	adding warning about failed apache module auth	2013-10-02 01:02:46 +02:00
Thomas Müller	493e948146	$defaults is not necessary here - merge artifact	2013-10-02 00:34:13 +02:00
Thomas Müller	173f32e6ef	Revert "use $defaults instead of $theme" This reverts commit `d5038e93db`.	2013-10-02 00:32:11 +02:00
Thomas Müller	d5038e93db	use $defaults instead of $theme	2013-10-01 14:33:56 +02:00
Thomas Müller	d8ada370d7	Squashed commit of the following: commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Thu Aug 22 11:45:27 2013 +0200 fixing undefined variable commit 982f327ca10eea0a2222eae3e74210648591fd8a Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Wed Aug 7 12:00:14 2013 +0200 adding login.php as alternative for index.php/login commit da0d7e1d096fb80789524b01f0f96fe08d147943 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Wed Aug 7 11:36:12 2013 +0200 adding a route for web login commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e Author: Karl Beecher <karl@endocode.com> Date: Tue Aug 6 17:00:28 2013 +0200 Login attempt returns true instead of exiting immediately commit fd89d55de9e71e986e03a0de9aad9407b632e22f Author: Karl Beecher <karl@endocode.com> Date: Mon Aug 5 15:31:30 2013 +0200 Further abstraction. This change introduces the ApacheBackend interface for backends that depend on Apache authentication and session management. There are no longer references to specific backends in OC_User. commit 469cfd98aea5a37985722cf5f9e00ece0ce38178 Author: Karl Beecher <karl@endocode.com> Date: Thu Aug 1 15:46:36 2013 +0200 Make login attempt function protected. commit d803515f19ff086e2028fcaa51afae579685e596 Author: Karl Beecher <karl@endocode.com> Date: Wed Jul 31 16:00:22 2013 +0200 Amends the login link When using a Shibboleth login, clicking logout displays a message to the user instead of ending the session. commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f Author: Karl Beecher <karl@endocode.com> Date: Tue Jul 30 13:15:59 2013 +0200 Abstract Shibboleth authentication into an Apache authentication method commit 69082f2ebcab267f6e8eceb1a252f84c52236546 Author: Karl Beecher <karl@endocode.com> Date: Tue Jul 30 11:22:26 2013 +0200 Convert spaces -> tabs commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2 Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 17:40:48 2013 +0200 Separate the authentication methods SABRE authentication and base authentication have slightly different workings right now. They should be refactored into a common method later, but time pressure requires us to reinvent the wheel slightly. commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65 Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 17:07:07 2013 +0200 Authenicate calls to WebDAV against Shibboleth. When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is normally called without trying the Shibboleth authentication... thus the session is not established. The method now tries Shib authentication, setting up a session if the user has already authenticated. commit 091e4861b2246c4084c9b30e232289fde4ba1abf Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 14:04:54 2013 +0200 Sets up the Shibboleth login attempt. commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5 Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 12:36:44 2013 +0200 Add a method for attempting shibboleth login. If the PHP_AUTH_USER and EPPN environment variables are set, attempt a Shibboleth (passwordless) login. commit 667d0710a7854e58fb109201d9cee6ec064e793a Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 11:38:04 2013 +0200 Revert "Adds the apps2 folder with user_shibboleth backend." This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef. commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef Author: Karl Beecher <karl@endocode.com> Date: Mon Jul 29 11:28:06 2013 +0200 Adds the apps2 folder with user_shibboleth backend. Conflicts: core/templates/layout.user.php lib/base.php	2013-10-01 14:29:01 +02:00
Thomas Müller	b58a464b86	Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled don't remember login if the encrypion app is enabled	2013-09-30 10:53:41 -07:00
Jenkins for ownCloud	a711399e62	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
Bjoern Schiessle	084f76fd14	grammar fixes	2013-09-30 13:33:49 +02:00
Bjoern Schiessle	17aa49a890	fix mail subject; don't show time for expire date	2013-09-30 13:33:02 +02:00
Bjoern Schiessle	b9a1f63344	go back to old template but add expire date as optional content	2013-09-30 10:02:26 +02:00
vsapronov	1efbf7774f	Fixed review issues	2013-09-29 20:16:32 -04:00
Alessandro Cosentino	710d3f139f	followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation	2013-09-29 01:46:23 -04:00
Jenkins for ownCloud	59e4ff7d24	[tx-robot] updated from transifex	2013-09-29 00:03:26 -04:00
kondou	4907685405	Base defaultavatar text on displayname Fix #4876	2013-09-28 16:46:53 +02:00
Jenkins for ownCloud	f31d31844e	[tx-robot] updated from transifex	2013-09-27 00:02:30 -04:00
Björn Schießle	6b1d70f148	Merge pull request #4887 from owncloud/sharing_disable_public_upload check only permission from link-share to decide if public upload is enabled or disabled	2013-09-26 03:16:15 -07:00
Morris Jobke	70dccd28ef	Merge pull request #4987 from owncloud/different_color_placeholder Make it possible to have a different color than the username for placeholder	2013-09-25 10:11:52 -07:00
kondou	5e7a7b3f61	Shorten optional text-argument processing	2013-09-25 17:19:38 +02:00
kondou	24eb41548e	Make it possible to have a different color than the username for placeholder	2013-09-25 12:57:41 +02:00
Bjoern Schiessle	883d1c0df3	use template for txt and html mails to send notification mails	2013-09-25 11:51:28 +02:00
vsapronov	dc382bc9cc	autoconfig.php could have only some of parameters; installation.php generates UI accordingly	2013-09-25 00:13:38 -04:00
Jenkins for ownCloud	2d12e52769	[tx-robot] updated from transifex	2013-09-24 12:59:48 -04:00
Bjoern Schiessle	6d0987bdb4	some small js fixes	2013-09-24 18:32:57 +02:00
Bjoern Schiessle	c486fc7608	introduce OC_Util::rememberLoginAllowed()	2013-09-24 18:01:34 +02:00
Bjoern Schiessle	b693b5085c	don't remember login if the encrypion app is enabled because the user needs to log-in again in order to decrypt his private key with his password	2013-09-24 13:08:55 +02:00
Thomas Müller	071b8033cb	fixing typo on $htaccessWorking - testing own code before pushing is appreciated	2013-09-24 00:44:55 +02:00
Bjoern Schiessle	fc76a13c52	Merge branch 'master' into sharing_mail_notification_master Conflicts: lib/public/share.php	2013-09-23 11:18:00 +02:00
Björn Schießle	9851f0f4f2	Merge pull request #4896 from owncloud/sharing_allow_disable_password sharing, allow user to disable password protection	2013-09-23 01:20:09 -07:00
Jenkins for ownCloud	28918d61d2	[tx-robot] updated from transifex	2013-09-22 12:58:42 -04:00
Jenkins for ownCloud	5b95e7aa0f	[tx-robot] updated from transifex	2013-09-20 10:50:14 -04:00
Bjoern Schiessle	71e129f295	initialize variable	2013-09-20 15:47:33 +02:00
Bjoern Schiessle	12b4e79201	calculate correct permissions while toggle the password protection	2013-09-20 13:11:05 +02:00
Bart Visscher	8e26f291a7	Merge pull request #4684 from owncloud/improved-console Use more object oriented way for console commands	2013-09-19 14:22:32 -07:00
Bart Visscher	f9549a4465	Merge pull request #4908 from owncloud/fix_css_selector css selectors never have a : before []	2013-09-19 10:59:45 -07:00
Bart Visscher	a9ea99e93d	Add copyright, remove starting blank line	2013-09-19 19:12:16 +02:00
Jörn Friedrich Dreyer	7e0631b3b8	Merge branch 'master' into fix_3728_with_file_exists_dialog Conflicts: apps/files/js/filelist.js	2013-09-19 17:00:54 +02:00
Jörn Friedrich Dreyer	9f9eb1b08f	Merge pull request #4263 from owncloud/search_scrollto initial scrollto implementation	2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer	078bf0df25	use {count} instead of 'One' for more versatile translation	2013-09-19 12:05:30 +02:00
Jörn Friedrich Dreyer	a6933efce3	use n to translate title	2013-09-19 11:25:41 +02:00
Jörn Friedrich Dreyer	cda58ae3df	css selectors never have a : before []	2013-09-19 10:14:07 +02:00
Jörn Friedrich Dreyer	0d81a53e12	use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there	2013-09-19 10:00:42 +02:00
Jörn Friedrich Dreyer	f7800cd63e	fix 'event is not defined' error	2013-09-19 09:47:51 +02:00
Jörn Friedrich Dreyer	72d53008cc	indentation	2013-09-18 17:58:15 +02:00
Jenkins for ownCloud	6b1843d91b	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
Jörn Friedrich Dreyer	7bd5e89f8c	simplify conflict template handling, fix reopen after ESC	2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer	64cc13a8d3	allow passing classes to buttons	2013-09-18 17:13:07 +02:00
Jörn Friedrich Dreyer	342a420eba	disable avatar loading on public guest page	2013-09-17 19:25:03 +02:00
Jörn Friedrich Dreyer	e43e961dcb	we cannot load avatar on guest page	2013-09-17 19:20:16 +02:00
Jörn Friedrich Dreyer	3f7f6434d1	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-17 19:11:47 +02:00
Jörn Friedrich Dreyer	b59ce403d8	Merge branch 'master' into fix_3728_with_file_exists_dialog Conflicts: apps/files/css/files.css apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files_sharing/js/public.js core/js/jquery.ocdialog.js core/js/oc-dialogs.js	2013-09-17 19:10:46 +02:00
Jörn Friedrich Dreyer	b40925ae17	initial scrollto implementation: use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present	2013-09-17 18:40:51 +02:00
Bjoern Schiessle	642b064c5b	we can leave the loop if the permission of the link share was checked	2013-09-17 18:18:23 +02:00
Bjoern Schiessle	d6771502f2	check only permission from link-share to decide if public upload is enabled or disabled	2013-09-17 18:11:43 +02:00
Bernhard Posselt	2e79aab0ce	Merge pull request #4871 from owncloud/add_exists_method_to_jquery add exists method to jquery	2013-09-17 06:07:50 -07:00
Jenkins for ownCloud	5cf12888ad	[tx-robot] updated from transifex	2013-09-16 11:38:45 -04:00
Jörn Friedrich Dreyer	afe4f6a794	add exists method to jquery	2013-09-16 13:47:37 +02:00
Bjoern Schiessle	534d93d2d3	Merge branch 'master' into sharing_mail_notification_master Conflicts: apps/files/index.php	2013-09-16 10:40:06 +02:00
Morris Jobke	339c98e5e6	Merge pull request #4835 from owncloud/fix-apps-height use lineheight instead of padding and height	2013-09-15 07:08:50 -07:00
Morris Jobke	58e6582056	Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter Fixes #4465 - Added autoFocus to #shareWith autocomplete options	2013-09-15 03:07:11 -07:00
Thomas Müller	db7e1dd877	Merge pull request #4853 from owncloud/external-shared_mimetype-icons Use external and shared icons in OC.Dialogs.filepicker()	2013-09-15 02:42:14 -07:00
Bernhard Posselt	a58e176852	Merge pull request #4506 from owncloud/oc_avatars OC Avatars	2013-09-14 16:00:36 -07:00
Thomas Müller	a0c2c2473a	Merge pull request #4501 from owncloud/ajaxfilelist Ajax calls for "files" and "files_trashbin" apps	2013-09-14 12:51:16 -07:00
Thomas Tanghus	dcc899d0a0	Merge pull request #4806 from owncloud/oc-dialogs-pageleave Don't popup meaningless alerts when dialog called on page leave	2013-09-14 10:35:39 -07:00
kondou	c117e719da	Use external and shared icons in OC.Dialogs.filepicker()	2013-09-14 14:35:23 +02:00
kondou	86143beb6a	Remove superfluous $	2013-09-14 14:15:52 +02:00
Jenkins for ownCloud	556bd1ef23	[tx-robot] updated from transifex	2013-09-13 21:49:24 -04:00
Vincent Petry	1304b511e9	Ajax calls for "files" and "files_trashbin" apps Frontend: - The files app list now uses ajax calls to refresh the list. - Added support the browser back button (history API). - Added mask + spinner while loading file list Backend: - Added utility function in core JS for parsing query strings. - Moved file list + breadcrumb template data code to helper functions - Fixed some file paths in trashbin app to be similar to the files app	2013-09-13 19:59:14 +02:00
Bart Visscher	666bbbe060	Use appinfo/register_command.php to add commands to the console command	2013-09-13 18:10:04 +02:00
Bernhard Posselt	5633291cef	use lineheight instead of padding and height	2013-09-13 15:53:03 +02:00
Bart Visscher	a3705ce188	Merge branch 'master' into setup Conflicts: lib/util.php	2013-09-12 22:45:11 +02:00
kondou	c9c5e1b97f	Merge branch 'master' into oc_avatars	2013-09-12 07:41:44 +02:00
Thomas Tanghus	b7205d97d7	Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype	2013-09-11 17:18:04 -07:00
Thomas Tanghus	80bf1969f9	Merge pull request #4784 from owncloud/ocdialog_option_setter Fix setting ocdialog options after initialization.	2013-09-11 12:20:17 -07:00
Thomas Tanghus	08225a60c8	Save two lines	2013-09-11 21:15:32 +02:00
Thomas Tanghus	1f8f0e61d8	Remove test error :P	2013-09-11 21:11:35 +02:00
Thomas Tanghus	7a2b23a036	Fix double destroy on escape.	2013-09-11 17:13:39 +02:00
Pete McFarlane	15be3d85b6	no autoFocus if no users returned	2013-09-11 15:59:28 +01:00
kondou	037cf22c51	Add a comment to clear defaultavatar-functionality	2013-09-11 16:04:41 +02:00
Thomas Tanghus	799c5c2c9b	Don't popup meaningless alerts when dialog called on page leave	2013-09-11 16:02:12 +02:00
Jenkins for ownCloud	68015b2761	[tx-robot] updated from transifex	2013-09-11 06:50:06 -04:00
Pete McFarlane	92b57c13c1	Added autoFocus to #shareWith autocomplete options	2013-09-11 11:45:32 +01:00
kondou	bf7f94422f	Bring another enable_avatars to $_ and fix $thus->$this	2013-09-11 07:11:33 +02:00
Bart Visscher	65aab3dc8c	Check for failure in creating htaccessWorking testfile	2013-09-10 22:05:20 +02:00
Bart Visscher	8ae612f693	Move core setup code to controller class	2013-09-10 20:19:42 +02:00
Jörn Friedrich Dreyer	cec932f292	Merge branch 'master' into fix_3728_with_file_exists_dialog Conflicts: apps/files/js/file-upload.js	2013-09-10 16:54:48 +02:00
Jenkins for ownCloud	72689f643b	[tx-robot] updated from transifex	2013-09-10 10:42:16 -04:00
Thomas Tanghus	fdfdd2e4e7	Remove console logging	2013-09-10 00:25:07 +02:00
Thomas Tanghus	51547c3316	Fix setting ocdialog options after initialization.	2013-09-10 00:21:42 +02:00
kondou	1832eb8872	Pass view in \OC_Avatar to constructor and use $_ for enable_avatars	2013-09-09 16:57:46 +02:00
Jenkins for ownCloud	92f6c3bb10	[tx-robot] updated from transifex	2013-09-08 21:37:53 -04:00
Jörn Friedrich Dreyer	e17c40acb7	Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog	2013-09-08 17:31:49 +02:00
Jörn Friedrich Dreyer	bd1d5b69fb	fix ESC for conflicts dialog	2013-09-08 17:31:12 +02:00
kondou	564de4bc3f	Optimize triangle-e.png and triangle-e.svg	2013-09-08 15:18:23 +02:00
Jörn Friedrich Dreyer	0a0410815e	close and destroy dialog on ESC	2013-09-08 10:11:35 +02:00
Robin Appelman	00cc83e3f7	show preview for uploading image files on conflict	2013-09-07 14:58:51 +02:00
Jenkins for ownCloud	e895cf9188	[tx-robot] updated from transifex	2013-09-07 04:46:57 -04:00
Jörn Friedrich Dreyer	ce03501646	fine ie8 compatability	2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer	673e0c01a7	fix page leaving checks	2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer	02d14aee17	completely remove dialog on cancel/continue	2013-09-06 16:50:45 +02:00
kondou	d18a070a03	Have the "notsquare" error as data, not as message	2013-09-06 13:46:50 +02:00
Jörn Friedrich Dreyer	4d04dd9c4c	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-06 13:42:05 +02:00
kondou	c6ca9c1e9d	Use shorter array-conversion	2013-09-06 13:33:17 +02:00
Bart Visscher	4629d6ad67	Merge pull request #4704 from owncloud/rename-lostpassword-controller Use the namespaced variation of the classname.	2013-09-05 14:38:03 -07:00
kondou	3774632ecc	Clean up avatars and preliminary use JSON->rawlist.php	2013-09-05 23:12:52 +02:00
kondou	f84fe479a5	Only use mimetype_list and clean up a bit	2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer	8a7e26b268	cleanup dead code	2013-09-05 17:46:19 +02:00
kondou	992b59f70b	Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype	2013-09-05 16:54:12 +02:00
Bjoern Schiessle	f8563ec583	Merge branch 'master' into sharing_mail_notification_master increased version number to trigger db update Conflicts: lib/util.php	2013-09-05 13:39:45 +02:00
Jenkins for ownCloud	0527fb05ad	[tx-robot] updated from transifex	2013-09-05 07:37:32 -04:00
Jörn Friedrich Dreyer	bbf8acb383	separate uploading code from progress code, add progress capability detection	2013-09-05 10:19:54 +02:00
kondou	6db96603a0	Have login-checks and CSRF checks	2013-09-05 00:04:31 +02:00
kondou	8fd76e39cf	Use proper controller naming	2013-09-04 22:22:56 +02:00
kondou	b643c02bd5	Fix some bugs and remove \OCP\Avatar for now	2013-09-04 22:13:59 +02:00
Thomas Müller	68dce9dde5	fixing style, var name & PHPDoc	2013-09-04 21:22:36 +02:00
Thomas Müller	e43e8b0db8	Merge branch 'master' into rename-lostpassword-controller Conflicts: core/lostpassword/controller.php	2013-09-04 20:46:32 +02:00
Jörn Friedrich Dreyer	49fd7e9f1e	refactor dialog creation	2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer	4af5a8c483	Merge branch 'master' into fix_3728_with_file_exists_dialog Conflicts: apps/files/ajax/upload.php apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files/templates/part.list.php	2013-09-04 14:11:40 +02:00
kondou	820fd42161	Merge branch 'master' into oc_avatars	2013-09-04 12:56:40 +02:00
kondou	a1e7614d73	Clean up oc_avatars	2013-09-04 12:56:14 +02:00
Morris Jobke	09187f3b3b	Merge pull request #4449 from owncloud/clean_up_util Clean up \OC\Util	2013-09-03 22:53:03 -07:00
Morris Jobke	6435e18e95	Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker Add previews to OC.dialogs.filepicker()	2013-09-03 22:35:58 -07:00
kondou	b1d20e0470	Have the header avatar to the left of the user name	2013-09-03 21:44:32 +02:00
kondou	6d42f51d0c	Fix unwanted caching in IE8	2013-09-03 18:34:40 +02:00
kondou	ce263df4c7	Don't use HTML5 <header> to support avatars in IE8	2013-09-03 16:52:15 +02:00
Christopher	c2eaf7589d	Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind use on to add event listener instead of deprecated jquery bind	2013-09-03 06:27:08 -07:00
kondou	d62c5063f4	Add previews to OC.dialogs.filepicker(); Fix #4697	2013-09-03 15:15:20 +02:00
Jörn Friedrich Dreyer	85758f3d7d	Merge pull request #4473 from owncloud/texteditor_polishing Texteditor polishing	2013-09-03 05:38:59 -07:00
Jenkins for ownCloud	fe0b8ac2c0	[tx-robot] updated from transifex	2013-09-03 07:46:55 -04:00
Bjoern Schiessle	fd7469db9e	coding-style fixes	2013-09-03 13:37:06 +02:00
Jörn Friedrich Dreyer	b0c6f990e4	use on to add event listener instead of deprecated jquery bind	2013-09-03 13:12:19 +02:00
Morris Jobke	84aba4542d	Merge pull request #4702 from owncloud/center-utils center utils	2013-09-03 02:27:52 -07:00
Morris Jobke	2da6f6b4ce	Merge pull request #4695 from owncloud/placeholder-hsl RGB -> HSL	2013-09-03 02:18:39 -07:00
kondou	65413a95dc	Merge branch 'master' into oc_avatars Conflicts: config/config.sample.php	2013-09-03 04:43:11 +02:00
Thomas Tanghus	53a7f80ac3	Use provided mimetype on open. Fix #4696	2013-09-02 23:53:45 +02:00
Bart Visscher	5539b9e843	Use the namespaced variation of the classname.	2013-09-02 21:25:32 +02:00
Bernhard Posselt	87035fc478	center utils	2013-09-02 19:38:47 +02:00
Jan-Christoph Borchardt	9eeb27c91a	placeholder.js: fix typo	2013-09-02 18:29:16 +02:00
Jan-Christoph Borchardt	57a1219ca0	placeholder.js: adjust saturation and lightness values	2013-09-02 18:20:18 +02:00
Bart Visscher	44b3e71ed4	Cleanup and more style fixes	2013-09-02 18:20:04 +02:00
kondou	e7e3f1b81a	Fix some of @jancborchardt's complaints in oc_avatars	2013-09-02 17:07:38 +02:00
Morris Jobke	e7a14ea32d	RGB -> HSL	2013-09-02 16:41:18 +02:00
Bjoern Schiessle	b918c06be6	Merge branch 'master' into sharing_mail_notification_master Conflicts: lib/util.php	2013-09-02 14:41:46 +02:00
Morris Jobke	a2f18eabb1	Merge pull request #4657 from owncloud/files-controls-fixes Files controls fixes	2013-09-01 23:08:23 -07:00
Morris Jobke	8a4acf263e	Merge pull request #4674 from owncloud/fit-filepicker-new-icons Fit filesummary for \OC\Preview's new mimetype-icons	2013-09-01 23:06:59 -07:00
Morris Jobke	1e501a8521	IE8 fixes	2013-09-02 08:05:47 +02:00
kondou	e5fc7b9dbe	Merge branch 'master' into clean_up_util Conflicts: lib/base.php	2013-09-02 07:58:06 +02:00
Bernhard Posselt	f038cb9aea	Merge pull request #4671 from owncloud/emptycontent centers text message in empty-content page (files and files_trashbin apps)	2013-09-01 17:47:55 -07:00
kondou	14cc1cd4b8	Pass setLastModifiedHeader() time()	2013-09-01 23:25:50 +02:00
kondou	5c1d64b80e	$image doesn't have data() when a defaultavatar should be used	2013-09-01 23:15:45 +02:00
kondou	91fed38f00	Also set an E-Tag header	2013-09-01 23:07:38 +02:00
kondou	44e141cc6a	Use \OC_Response for cache invalidation	2013-09-01 21:57:28 +02:00
kondou	74c9223281	Properly check for tmpavatar, invalidate cache, fix debug msgs	2013-09-01 21:17:48 +02:00
Jenkins for ownCloud	e68b5f8b0d	[tx-robot] updated from transifex	2013-09-01 13:30:40 -04:00
kondou	c95d4cafa9	Fix @tanghus's complains in avatars and clean up cropper after closing with "x"	2013-09-01 19:12:54 +02:00
kondou	76b1b5b6a3	Provide 'enable_avatars' in config.php, to disable avatars	2013-09-01 18:17:14 +02:00
Bart Visscher	0aba549e7f	Use more object oriented way for console commands	2013-09-01 16:40:50 +02:00
kondou	f44cd944e0	Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoadedCallback()	2013-09-01 16:04:39 +02:00
kondou	8de9e3d85e	Add a description for $.avatar() and remove TODOs @raghunayyar fixed	2013-08-31 23:41:49 +02:00
kondou	ebcd2a6b4d	Fit filesummary for \OC\Preview's ne mimetype-icons	2013-08-31 19:21:51 +02:00
kondou	385de45ed9	Deal with OC.Router.generate()	2013-08-31 19:05:53 +02:00
kondou	aa88eea9cf	Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname	2013-08-31 18:27:28 +02:00
Alessandro Cosentino	b10a646bc8	rename emptyfolder to emptycontent	2013-08-31 11:25:11 -04:00
Alessandro Cosentino	4b32d84314	text centered horizontally and vertically in emptycontent div	2013-08-31 11:12:07 -04:00
kondou	5d653753bd	Merge branch 'master' into oc_avatars	2013-08-31 12:56:36 +02:00
Georg Ehrke	8ef40277b2	Merge master into oc_preview	2013-08-30 18:11:18 +02:00
Jan-Christoph Borchardt	0f5df181a3	Merge pull request #4661 from owncloud/separate-app-styles Move CSS for apps and browser-specific fixes out of main styles.css	2013-08-30 09:08:25 -07:00
Bjoern Schiessle	4bbefdf608	add expiration date if it is already set	2013-08-30 17:20:10 +02:00
Bjoern Schiessle	e7959f4fd2	don't send mail to the user who shared the file	2013-08-30 16:52:06 +02:00
Bjoern Schiessle	65ddefc89d	set sendMail status back to false	2013-08-30 16:29:22 +02:00
Bjoern Schiessle	36574241f8	some clean-up	2013-08-30 16:21:52 +02:00
Bjoern Schiessle	10cf1b3a4e	return mailSend status in getItems()	2013-08-30 15:39:43 +02:00
Jenkins for ownCloud	dbc78b1a58	[tx-robot] updated from transifex	2013-08-30 09:38:20 -04:00
Bjoern Schiessle	77adaee645	enable user to inform recipients about a shared file by mail	2013-08-30 13:53:49 +02:00
kondou	80e10f01c4	Clean up	2013-08-30 13:16:13 +02:00
Morris Jobke	bf6981312a	Merge pull request #4660 from owncloud/apps-management-sticky Apps management as sticky footer and rename to 'Apps', fix #4622	2013-08-30 03:47:15 -07:00
Arthur Schiwon	22e1f73d5e	Use Group methods for searching, fixes #4201	2013-08-30 12:37:46 +02:00
Jan-Christoph Borchardt	9c23ed580a	move CSS for browser-specific fixes out of styles.css into new fixes.css	2013-08-30 11:42:32 +02:00
Jan-Christoph Borchardt	cc8e19ad11	move CSS for apps out of styles.css into new apps.css	2013-08-30 11:38:49 +02:00
Jan-Christoph Borchardt	c9c4ab22a4	Apps management as sticky footer and rename to 'Apps', fix #4622	2013-08-30 11:17:31 +02:00
Jan-Christoph Borchardt	a6c7b210db	adjust right padding of controls bar, fix #4650	2013-08-30 10:26:41 +02:00
Jan-Christoph Borchardt	3a2534d3bd	fix coding style for controls bar	2013-08-30 10:20:39 +02:00
kondou	ecf187393b	Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests	2013-08-30 09:00:37 +02:00
kondou	c533b80682	Use OC_Cache and finish cropper functionality	2013-08-29 16:56:32 +02:00
kondou	0c708be76b	Use defaultavatars	2013-08-29 14:26:11 +02:00
Georg Ehrke	b7758d0f8d	Merge master into oc_preview	2013-08-29 10:50:55 +02:00
Morris Jobke	ea6e74ca95	Merge pull request #4552 from dampfklon/fix4552 Make group suffix in share dialog translatable	2013-08-28 15:46:51 -07:00
kondou	0ba498119c	Merge branch 'master' into oc_avatars Conflicts: 3rdparty	2013-08-28 23:21:26 +02:00
Morris Jobke	f0ea23891a	Merge pull request #4618 from owncloud/visualize-js visualize	2013-08-28 14:17:50 -07:00
Thomas Müller	6502a148ec	fixing typo	2013-08-28 23:04:55 +02:00
Morris Jobke	067815099f	calculate fontsize and line-height	2013-08-28 21:54:20 +02:00
kondou	bdf48a6daa	Use OC.Router.generate, TODO use cache, prepare for defaultavatars	2013-08-28 21:20:28 +02:00
Morris Jobke	584857de69	Merge pull request #4627 from owncloud/trashbin-tipsy change orientation for delete tooltip to left, fix #4589	2013-08-28 09:09:40 -07:00
Jan-Christoph Borchardt	e7b40983e4	change orientation for delete tooltip to left, fix #4589	2013-08-28 17:58:23 +02:00
Morris Jobke	ed2fa06a26	reviewers comments	2013-08-28 16:52:12 +02:00
kondou	67c5be9f19	Merge branch 'master' into oc_avatars Conflicts: 3rdparty	2013-08-28 16:44:11 +02:00
kondou	8d8a57de7f	Continue work on cropper	2013-08-28 16:39:00 +02:00
Morris Jobke	4a00b26029	add visualize	2013-08-28 16:29:27 +02:00
Jan-Christoph Borchardt	0c8ac241df	fix shadow style of username input box	2013-08-28 13:59:23 +02:00
Jan-Christoph Borchardt	c6eda25d50	remove show password toggle from log in page, ref #4577 #4580	2013-08-28 13:58:49 +02:00
Thomas Tanghus	9843c8e838	Merge pull request #4434 from owncloud/fix_octemplate_escaping Fix octemplate string escaping.	2013-08-28 03:59:43 -07:00
Thomas Tanghus	776d64f804	Cache Object.keys(this.vars)	2013-08-28 12:50:05 +02:00
Jenkins for ownCloud	3e7ddbc9d9	[tx-robot] updated from transifex	2013-08-28 06:24:14 -04:00
Jenkins for ownCloud	d5062b9e0e	[tx-robot] updated from transifex	2013-08-27 11:23:18 -04:00

... 11 12 13 14 15 ...

3161 commits