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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow "Finishing..." button on setup page to be translated.	ringmaster	2013-10-04	2	-2/+2
\| \| \| \|	Fixes #5130.
*	Fixed array syntax to work with PHP 5.3	Vincent Petry	2013-10-04	1	-1/+1
\| \| \| \| \| \|	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.
*	Merge branch 'master' into sharing_mail_notification_master	Bjoern Schiessle	2013-10-04	8	-27/+84
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files/index.php apps/files/templates/index.php
\| *	Merge pull request #5107 from owncloud/user_skeleton	Thomas Müller	2013-10-04	1	-0/+5
\| \|\ \| \| \| \| \| \|	make it possible to prepopulate a new user home with a skeleton
\| \| *	add a real examplefile instead of an .gitignore which is a bit stupid here	Frank Karlitschek	2013-10-04	2	-4/+5
\| \| \|
\| \| *	make it possible to prepopulate a new user gome with a skeleton	Frank Karlitschek	2013-10-03	1	-0/+4
\| \| \|
\| * \|	Merge pull request #5109 from owncloud/controls-bar-height	Morris Jobke	2013-10-04	5	-21/+59
\| \|\ \ \| \| \| \| \| \| \| \|	Controls bar height
\| \| * \|	increase height of controls bar and elements to more clickable 44px	Jan-Christoph Borchardt	2013-10-04	5	-21/+59
\| \| \|/
\| * /	Hide defaultavatar in #header and don't darken proper avatars in #header	kondou	2013-10-04	3	-6/+20
\| \|/
* \|	Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core ↵	Bjoern Schiessle	2013-10-04	4	-72/+81
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sharing_mail_notification_master Conflicts: core/ajax/share.php
\| * \|	Fixed syntax error in array	Vincent Petry	2013-10-03	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' into sharing_mail_notification_master	Thomas Müller	2013-10-02	4	-72/+81
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: core/css/share.css
\| \| *	just fix whitespace stuff	Morris Jobke	2013-10-02	1	-64/+66
\| \| \|
\| \| *	simplify From Link icon in New menu	Jan-Christoph Borchardt	2013-10-02	2	-0/+12
\| \| \|
\| \| *	remove box-shadows for header, navigation and controls bar - looks sharper ↵	Jan-Christoph Borchardt	2013-10-02	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|	and less washed out
\| \| *	reduce rounded corners of Share and Versions dropdown	Jan-Christoph Borchardt	2013-10-02	1	-3/+3
\| \| \|
* \| \|	fix array_diff call	Bjoern Schiessle	2013-10-04	1	-1/+1
\|/ /
* \|	Merge branch 'master' into sharing_mail_notification_master	Bjoern Schiessle	2013-10-02	18	-21/+136
\|\\| \| \| \| \| \| \| \| \|	Conflicts: lib/private/util.php
\| *	Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled	Thomas Müller	2013-09-30	1	-1/+2
\| \|\ \| \| \| \| \| \|	don't remember login if the encrypion app is enabled
\| \| *	introduce OC_Util::rememberLoginAllowed()	Bjoern Schiessle	2013-09-24	1	-1/+1
\| \| \|
\| \| *	don't remember login if the encrypion app is enabled because the user	Bjoern Schiessle	2013-09-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	needs to log-in again in order to decrypt his private key with his password
\| * \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-09-30	5	-3/+47
\| \| \|
\| * \|	followup of #4032 - makes the settings-button bigger and adds again padding ↵	Alessandro Cosentino	2013-09-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	at bottom of app-navigation
\| * \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-09-29	2	-6/+20
\| \| \|
\| * \|	Base defaultavatar text on displayname	kondou	2013-09-28	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Fix #4876
\| * \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-09-27	3	-0/+8
\| \| \|
\| * \|	Merge pull request #4887 from owncloud/sharing_disable_public_upload	Björn Schießle	2013-09-26	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \|	check only permission from link-share to decide if public upload is enabled or disabled
\| \| * \|	we can leave the loop if the permission of the link share was checked	Bjoern Schiessle	2013-09-17	1	-3/+1
\| \| \| \|
\| \| * \|	check only permission from link-share to decide if public upload is enabled ↵	Bjoern Schiessle	2013-09-17	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	or disabled
\| * \| \|	Merge pull request #4987 from owncloud/different_color_placeholder	Morris Jobke	2013-09-25	1	-2/+13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Make it possible to have a different color than the username for placeholder
\| \| * \| \|	Shorten optional text-argument processing	kondou	2013-09-25	1	-3/+2
\| \| \| \| \|
\| \| * \| \|	Make it possible to have a different color than the username for placeholder	kondou	2013-09-25	1	-2/+14
\| \| \| \|/ \| \| \|/\|
\| * / \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-09-24	4	-4/+36
\| \|/ /
* \| \|	grammar fixes	Bjoern Schiessle	2013-09-30	2	-2/+2
\| \| \|
* \| \|	fix mail subject; don't show time for expire date	Bjoern Schiessle	2013-09-30	1	-2/+3
\| \| \|
* \| \|	go back to old template but add expire date as optional content	Bjoern Schiessle	2013-09-30	2	-6/+15
\| \| \|
* \| \|	use template for txt and html mails to send notification mails	Bjoern Schiessle	2013-09-25	3	-26/+29
\| \| \|
* \| \|	some small js fixes	Bjoern Schiessle	2013-09-24	1	-4/+5
\| \| \|
* \| \|	Merge branch 'master' into sharing_mail_notification_master	Bjoern Schiessle	2013-09-23	92	-60/+795
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/public/share.php
\| * \|	Merge pull request #4896 from owncloud/sharing_allow_disable_password	Björn Schießle	2013-09-23	1	-1/+12
\| \|\ \ \| \| \| \| \| \| \| \|	sharing, allow user to disable password protection
\| \| * \|	initialize variable	Bjoern Schiessle	2013-09-20	1	-0/+1
\| \| \| \|
\| \| * \|	calculate correct permissions while toggle the password protection	Bjoern Schiessle	2013-09-20	1	-1/+11
\| \| \|/
\| * \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-09-22	65	-12/+139
\| \| \|
\| * \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-09-20	83	-18/+183
\| \| \|
\| * \|	Merge pull request #4684 from owncloud/improved-console	Bart Visscher	2013-09-19	2	-0/+43
\| \|\ \ \| \| \| \| \| \| \| \|	Use more object oriented way for console commands
\| \| * \|	Add copyright, remove starting blank line	Bart Visscher	2013-09-19	1	-0/+6
\| \| \| \|
\| \| * \|	Use appinfo/register_command.php to add commands to the console command	Bart Visscher	2013-09-13	1	-0/+9
\| \| \| \|
\| \| * \|	Cleanup and more style fixes	Bart Visscher	2013-09-02	1	-7/+5
\| \| \| \|
\| \| * \|	Use more object oriented way for console commands	Bart Visscher	2013-09-01	1	-0/+30
\| \| \| \|
\| * \| \|	Merge pull request #4908 from owncloud/fix_css_selector	Bart Visscher	2013-09-19	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	css selectors never have a : before []