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 #4627 from owncloud/trashbin-tipsy	Morris Jobke	2013-08-28	1	-0/+1
\|\ \| \| \| \|	change orientation for delete tooltip to left, fix #4589
\| *	change orientation for delete tooltip to left, fix #4589	Jan-Christoph Borchardt	2013-08-28	1	-0/+1
\| \|
* \|	Merge pull request #4563 from owncloud/use_personal-password	Jan-Christoph Borchardt	2013-08-28	2	-2/+2
\|\ \ \| \| \| \| \| \|	Use personal-password for the password name in personal.php
\| * \|	Use personal-password for the password name in personal.php	kondou	2013-08-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Fix #4491
* \| \|	Merge pull request #4489 from owncloud/clean-3rdparty-mess-master	Bart Visscher	2013-08-28	16	-2/+1506
\|\ \ \ \| \| \| \| \| \| \| \|	Clean 3rdparty mess master
\| * \| \|	fixing require path	Thomas Müller	2013-08-18	2	-2/+2
\| \| \| \|
\| * \| \|	update 3rdparty submodule - timepicker removed	Thomas Müller	2013-08-17	1	-0/+0
\| \| \| \|
\| * \| \|	update 3rdparty submodule	Thomas Müller	2013-08-17	1	-0/+0
\| \| \| \|
\| * \| \|	3rdparty submodule update: getid3 removed	Thomas Müller	2013-08-17	1	-0/+0
\| \| \| \|
\| * \| \|	update 3rdparty - openid moved	Thomas Müller	2013-08-17	1	-0/+0
\| \| \| \|
\| * \| \|	moving Dropbox and smb4php 3rdparty code over to the apps	Thomas Müller	2013-08-17	15	-2/+1506
\| \| \| \|
\| * \| \|	update 3rdparty submodule	Thomas Müller	2013-08-17	1	-0/+0
\| \| \| \|
* \| \| \|	Merge pull request #3891 from owncloud/fix_loadAppScriptFile	Bart Visscher	2013-08-28	1	-5/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Check if the app is enabled and the app path is found before trying to l...
\| * \| \| \|	Check if the app is enabled and the app path is found before trying to load ↵	Bart Visscher	2013-06-28	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the script file
* \| \| \| \|	Merge pull request #4610 from owncloud/password-toggle-login	Morris Jobke	2013-08-28	3	-7/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Password toggle login
\| * \| \| \|	fix shadow style of username input box	Jan-Christoph Borchardt	2013-08-28	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	remove show password toggle from log in page, ref #4577 #4580	Jan-Christoph Borchardt	2013-08-28	2	-4/+1
\|/ / / /
* \| \| \|	Merge pull request #4601 from owncloud/fixing-4341-master	Morris Jobke	2013-08-28	3	-27/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	backport of #4357 to master
\| * \| \| \|	backport of #4357 to master	Thomas Müller	2013-08-27	3	-27/+33
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4434 from owncloud/fix_octemplate_escaping	Thomas Tanghus	2013-08-28	2	-5/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix octemplate string escaping.
\| * \| \| \| \|	Cache Object.keys(this.vars)	Thomas Tanghus	2013-08-28	1	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix octemplate string escaping.	Thomas Tanghus	2013-08-14	2	-5/+5
\| \| \| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-08-28	88	-230/+301
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement	Morris Jobke	2013-08-27	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix "select all" checkbox displacement when checked, fix #4571
\| * \| \| \| \|	Fix "select all" checkbox displacement when checked	Pellaeon Lin	2013-08-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	LDAP: case insensitive replace for more robustness	Arthur Schiwon	2013-08-27	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2013-08-27	275	-2289/+4008
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3208 from owncloud/api_capabilities_quota	Morris Jobke	2013-08-27	2	-6/+49
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the quota to the external API for use with the mobile and desktop clients
\| * \| \| \| \| \|	add documentation	Morris Jobke	2013-08-27	1	-0/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Code style	Tom Needham	2013-08-27	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add quota to core api	Tom Needham	2013-08-27	2	-6/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4596 from owncloud/fix_isEmpty_trash	Björn Schießle	2013-08-27	1	-4/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	trash bin: fix isEmpty() function
\| * \| \| \| \| \|	the trash bin can also contain empty files. Don't use the trash bin size as ↵	Bjoern Schiessle	2013-08-27	1	-4/+5
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	indicator to decide if the trash bin is empty or not
* \| \| \| \| \|	Merge pull request #4348 from owncloud/fixing-4343-master	Jörn Friedrich Dreyer	2013-08-27	2	-27/+165
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #4343
\| * \| \| \| \| \|	lacy initialization of fileView - in case basic auth is used FileSystem is ↵	Thomas Müller	2013-08-26	1	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not yet initialized during the initialize() call
\| * \| \| \| \| \|	Merge branch 'master' into fixing-4343-master	Thomas Müller	2013-08-22	1613	-29093/+28175
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/connector/sabre/quotaplugin.php
\| * \| \| \| \| \| \|	adding unit tests for quota checks	Thomas Müller	2013-08-08	2	-33/+98
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	adding unit tests to determine length	Thomas Müller	2013-08-08	2	-1/+48
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixes #4343	Thomas Müller	2013-08-08	1	-2/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4507 from owncloud/existingusersfromgroup	blizzz	2013-08-27	2	-19/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	return only existing users in group
\| * \| \| \| \| \| \| \|	consolidate validity check for users in group class	Arthur Schiwon	2013-08-26	2	-28/+29
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	no assoc index here, makes tests pass again	Arthur Schiwon	2013-08-19	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	return only existing users in group	Arthur Schiwon	2013-08-19	1	-3/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4586 from owncloud/fixing-3431-master	Morris Jobke	2013-08-27	21	-3253/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kill zh_CN.GB2312
\| * \| \| \| \| \| \| \| \|	revert debugging code which accidentially entered this pull request	Thomas Müller	2013-08-27	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	kill zh_CN.GB2312	Thomas Müller	2013-08-27	22	-3253/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4585 from owncloud/fixing-4385-master	Morris Jobke	2013-08-27	5	-10/+13
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing 4385 master
\| * \| \| \| \| \| \| \| \| \|	storage information is path specific	Thomas Müller	2013-08-27	4	-5/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	webdav quota now displays the same values as the web interface does	Thomas Müller	2013-08-27	2	-6/+6
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4584 from owncloud/fixing-4575-master	Morris Jobke	2013-08-27	1	-12/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	adding translations to update events