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 pull request #7409 from owncloud/issue/5361	Thomas Müller	2014-02-26	1	-2/+4
\|\ \| \| \| \|	Add owncloud version to JS scope
\| *	Add owncloud version to JS scope	Joas Schilling	2014-02-26	1	-2/+4
\| \| \| \| \| \| \| \|	Fix #5361
* \|	Merge pull request #7174 from owncloud/issue/7166	Jan-Christoph Borchardt	2014-02-26	1	-0/+28
\|\ \ \| \|/ \|/\|	Add option to change email settings in admin section
\| *	Remove unused variables, add doc blocks and break lines	Joas Schilling	2014-02-26	1	-2/+2
\| \| \| \| \| \| \| \|	Fix #7166
\| *	Remove duplicated definition and move OC.msg to js/js.js	Joas Schilling	2014-02-19	1	-0/+28
\| \| \| \| \| \| \| \|	Fix issue #7166
* \|	Merge pull request #7285 from owncloud/mimeicons-svg	Morris Jobke	2014-02-24	1	-13/+18
\|\ \ \| \| \| \| \| \|	Show svg mime icons when no preview is available
\| * \|	rename url parameter	Robin Appelman	2014-02-24	1	-1/+1
\| \| \|
\| * \|	Add url parameter to control whether previews should return 404 when the ↵	Robin Appelman	2014-02-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	mimetype is unsupported
\| * \|	Merge branch 'master' into mimeicons-svg	Robin Appelman	2014-02-21	7	-15/+62
\| \|\ \
\| * \ \	Merge branch 'master' into mimeicons-svg	Robin Appelman	2014-02-20	186	-3152/+1264
\| \|\ \ \
\| * \| \| \|	Show svg mime icons when no preview is available	Robin Appelman	2014-02-19	1	-13/+17
\| \| \| \| \|
* \| \| \| \|	Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1	Morris Jobke	2014-02-24	2	-0/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update page title when navigating through directories (local)
\| * \| \| \| \|	Added oc_defaults stub in specHelper.js	Vincent Petry	2014-02-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is needed for JS Unit tests to run properly as they are expecting the new "oc_default" map to exist.
\| * \| \| \| \|	Merge branch 'master' into GuillaumeAmat-patch-1	Robin Appelman	2014-02-21	16	-24/+109
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'patch-1' of github.com:GuillaumeAmat/core into ↵	Vincent Petry	2014-02-20	1	-0/+17
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GuillaumeAmat-patch-1
\| \| * \| \| \| \| \|	Adds OC_Defaults values in javascript config	Guillaume AMAT	2014-02-13	1	-0/+17
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7344 from owncloud/add-js-config-vars	icewind1991	2014-02-24	1	-3/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow apps to add/modify config js output via hook.
\| * \ \ \ \ \ \	Merge branch 'master' into add-js-config-vars	Robin Appelman	2014-02-21	6	-15/+67
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Allow apps to add/modify config js output via hook.	ringmaster	2014-02-20	1	-3/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7310 from owncloud/no-css-js-delivery-via-php	Morris Jobke	2014-02-21	3	-21/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No css js delivery via php
\| * \ \ \ \ \ \ \	Merge branch 'master' into no-css-js-delivery-via-php	Thomas Müller	2014-02-21	6	-15/+56
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	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 branch 'master' into no-css-js-delivery-via-php	Thomas Müller	2014-02-20	180	-3081/+1159
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	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 #7355 from owncloud/new-menu-svg	icewind1991	2014-02-21	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use SVG icons in New file menu
\| * \| \| \| \| \| \| \| \|	use SVG icons from icons.css for New file menu	Jan-Christoph Borchardt	2014-02-21	1	-0/+6
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs	Morris Jobke	2014-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	fix thumbnail generation for subdirectories in the conflicts dialog
\| * \| \| \| \| \| \| \|	use directory from original instead of current dir	Jörn Friedrich Dreyer	2014-02-21	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #7336 from owncloud/IE-wipho-viewport	icewind1991	2014-02-21	1	-0/+11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	fix viewport size on windows phone
\| * \| \| \| \| \| \|	fix viewport size on windows phone	Robin Appelman	2014-02-20	1	-0/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into mobile-header	Robin Appelman	2014-02-21	14	-114/+76
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	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 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