nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into no-css-js-delivery-via-php	Thomas Müller	2014-02-21	12	-9/+42
\|\ \| \| \| \| \| \| \| \|	Conflicts: config/config.sample.php
\| *	Merge pull request #7291 from owncloud/adminess-raghu	Lukas Reschke	2014-02-20	1	-0/+1
\| \|\ \| \| \| \| \| \|	Move isadmin to template and rename it to oc_isadmin
\| \| *	Fix typo	Lukas Reschke	2014-02-20	1	-1/+1
\| \| \|
\| \| *	Variable value is expected and not an echoed output	Lukas Reschke	2014-02-20	1	-1/+1
\| \| \|
\| \| *	Move oc_isadmin to the config JS script	Lukas Reschke	2014-02-20	3	-2/+2
\| \| \|
\| \| *	Move isadmin to template and rename it to oc_isadmin	Lukas Reschke	2014-02-19	2	-1/+2
\| \| \|
\| * \|	fix IE10 viewport sizeing	Robin Appelman	2014-02-20	1	-0/+5
\| \| \|
\| * \|	Merge pull request #7056 from owncloud/users-scrollperformance	Jan-Christoph Borchardt	2014-02-20	2	-1/+19
\| \|\ \ \| \| \| \| \| \| \| \|	Improve users list scrolling performance
\| \| * \|	Improve users list scrolling performance	Vincent Petry	2014-02-17	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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)
\| * \| \|	Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix	Jan-Christoph Borchardt	2014-02-20	1	-5/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	remove fix for IE9 nav bar width
\| \| * \| \|	remove fix for IE9 nav bar width	Konstantin.Popov	2014-01-17	1	-5/+0
\| \| \| \| \|
\| * \| \| \|	Merge pull request #7289 from owncloud/fix-filetype-icons	Lukas Reschke	2014-02-20	6	-0/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix filetype icons
\| \| * \ \ \	merge master	Jan-Christoph Borchardt	2014-02-20	168	-2847/+1017
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Optimize images	kondou	2014-02-19	6	-122/+108
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	fix lots of file type icons for archives, js, flash, ics, fonts, code, ...	Jan-Christoph Borchardt	2014-02-19	6	-0/+0
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core	Jörn Friedrich Dreyer	2014-02-20	3	-3/+17
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: core/css/styles.css
\| \| * \| \| \| \|	Moved Core Theme Logos to CSS	Jake Wilson	2013-10-10	3	-3/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \| \|	Merge branch 'master' into no-css-js-delivery-via-php	Thomas Müller	2014-02-20	180	-3081/+1159
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #7247 from owncloud/sharing_cleanup_step1	Björn Schießle	2014-02-20	1	-99/+13
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clean up the sharing ajax calls, add mail notification class
\| \| * \| \| \| \| \|	clean up the sharing ajax calls, add mail notification class	Bjoern Schiessle	2014-02-19	1	-99/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #7255 from owncloud/fix-admin-remote	Lukas Reschke	2014-02-20	1	-6/+21
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|	An admin should not be able to add remote and public services on its own
\| \| * \| \| \| \| \|	Check whether the app is set	Lukas Reschke	2014-02-18	1	-1/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Check whether the Key is set	Lukas Reschke	2014-02-18	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	An admin should not be able to add remote and public services on its own. ↵	Lukas Reschke	2014-02-18	1	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \|	Optimize some images	kondou	2014-02-19	174	-2969/+1125
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and strip metadata from png images with optipng in image_optimization.sh
\| * \| \| \| \| \|	Scrutinizer Auto-Fixes	Scrutinizer Auto-Fixer	2014-02-19	4	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \|	kill references to core.js and core.css	Thomas Müller	2014-02-20	1	-15/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	kill old minimizer code	Thomas Müller	2014-02-20	1	-3/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fixing js syntax error	Thomas Müller	2014-02-20	1	-3/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #7114 from owncloud/scrutinizer_documentation_patches	Thomas Müller	2014-02-19	1	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	polish documentation based on scrutinizer patches
\| * \| \| \| \| \|	Merge branch 'master' into scrutinizer_documentation_patches	Thomas Müller	2014-02-18	4	-5/+772
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/private/migration/content.php
\| * \| \| \| \| \|	Merge branch 'master' into scrutinizer_documentation_patches	Thomas Müller	2014-02-14	3	-2/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/private/appconfig.php
\| * \| \| \| \| \| \|	polish documentation based on scrutinizer patches	Jörn Friedrich Dreyer	2014-02-06	1	-0/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect	Tom Needham	2014-02-18	2	-12/+22
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	do not autocapitalize fields on mobile, fix user name input
\| * \| \| \| \| \| \|	do not autocapitalize fields on mobile, fix user name input. Also disable ↵	Jan-Christoph Borchardt	2014-02-18	2	-12/+22
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	autocorrect and specify autocomplete
* \| \| \| \| \| \|	Merge pull request #7243 from owncloud/core-sessionlifetimedefault	Thomas Müller	2014-02-18	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now using PHP session lifetime as default value for the JS config
\| * \| \| \| \| \| \|	Now using PHP session lifetime as default value for the JS config	Vincent Petry	2014-02-17	1	-1/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will fix the heartbeat when the session_lifetime config parameter hasn't been set explicitly.
* \| \| \| \| \| \|	add cbr/cbz file type icon, fix #6953	Jan-Christoph Borchardt	2014-02-17	2	-0/+771
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #7132 from owncloud/issue/6920	Jan-Christoph Borchardt	2014-02-17	1	-4/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Do not select input for all text input fields
\| * \| \| \| \|	Do not select input for all text input fields	Joas Schilling	2014-02-07	1	-4/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue #6920
* \| \| \| \|	Merge pull request #6726 from owncloud/fix_6630	Vincent Petry	2014-02-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	don't urldecode get var, php does this automatically
\| * \| \| \| \|	remove empty line	Georg Ehrke	2014-01-30	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	don't urldecode get var, php does this automatically	Georg Ehrke	2014-01-30	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	fix DI	Arthur Schiwon	2014-02-11	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	move sorter into a class	Arthur Schiwon	2014-02-11	1	-24/+3
\| \| \| \| \| \|
* \| \| \| \| \|	respect coding guidelines	Arthur Schiwon	2014-02-11	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	on filtering the share box users and groups whose name begins with the ↵	Arthur Schiwon	2014-02-11	1	-0/+24
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	search term shall appear on top, fixes #6430
* \| \| \| \|	Change MySQL to MySQL/MariaDB in the frontend	Joas Schilling	2014-02-07	1	-1/+1
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix issue #6269
* \| \| \|	fixing autoconfig handling	Thomas Müller	2014-02-05	1	-4/+5
\| \| \| \|
* \| \| \|	Merge pull request #7067 from owncloud/core-sessionheartbeatconfig	Vincent Petry	2014-02-05	4	-16/+135
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Core sessionheartbeatconfig