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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Nextcloud bot	2017-07-13	42	-182/+190
\|
*	Merge pull request #5567 from nextcloud/public-capabilities	Roeland Jago Douma	2017-07-12	1	-2/+2
\|\ \| \| \| \|	Public capabilities API
\| *	Expose theming capabilities to public	Julius Härtl	2017-06-30	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Julius Härtl <jus@bitgrid.net>
* \|	Merge pull request #5685 from nextcloud/jail-propagator	Roeland Jago Douma	2017-07-12	2	-56/+0
\|\ \ \| \| \| \| \| \|	Fix propagating changes within jail wrapper
\| * \|	Fix propagating changes within jail wrapper	Robin Appelman	2017-07-11	2	-56/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
* \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-07-12	50	-298/+304
\| \| \|
* \| \|	Merge pull request #5681 from nextcloud/upstream-fix-circles	Morris Jobke	2017-07-11	2	-3/+3
\|\ \ \ \| \|/ / \|/\| \|	upstream fix circles
\| * \|	upstream	Maxence Lange	2017-07-11	2	-3/+3
\| \| \| \| \| \| \| \| \|	Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* \| \|	Merge pull request #5672 from nextcloud/upload-hidden-filelist	Morris Jobke	2017-07-11	2	-9/+13
\|\ \ \ \| \|/ / \|/\| \|	properly block file upload to non-active filelist
\| * \|	fix test	Robin Appelman	2017-07-11	1	-9/+11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \|	properly block file upload to non-active filelist	Robin Appelman	2017-07-10	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
* \| \|	Merge pull request #5656 from ↵	Morris Jobke	2017-07-10	2	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nextcloud/fix-unselecting-items-on-multi-select-dropdowns Fix unselecting items on multi select dropdowns
\| * \| \|	Enable the toggleSelect extension in multi-select dropdowns	Daniel Calviño Sánchez	2017-07-10	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The toggleSelect extension for Select2 makes possible to unselect items in a multi-select dropdown by clicking on them; this behaviour should be enabled in all the multi-select dropdowns used in the server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* \| \| \|	Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails	Morris Jobke	2017-07-10	2	-8/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix remote share activity emails
\| * \| \| \|	Fix owner cloud id in unshare activity	Joas Schilling	2017-07-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
\| * \| \| \|	Fix activity emails for accept/decline of remote shares	Joas Schilling	2017-07-10	2	-7/+13
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
* / \| \|	Rectify variable $uid->$user	Roger Szabo	2017-07-10	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Roger Szabo <roger.szabo@web.de>
* \| \|	Merge pull request #5649 from nextcloud/fix-5611	Morris Jobke	2017-07-10	1	-8/+10
\|\ \ \ \| \| \| \| \| \| \| \|	fix alignment of radio button and its label in encryption settings
\| * \| \|	fix alignment of radio button and its label in encryption settings	Arthur Schiwon	2017-07-07	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-07-10	14	-16/+18
\| \| \| \|
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-07-09	12	-6/+20
\| \| \| \|
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-07-08	28	-74/+98
\|/ / /
* \| \|	Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails	Morris Jobke	2017-07-07	19	-67/+251
\|\ \ \ \| \| \| \| \| \| \| \|	Use PNGs for icons in activity emails
\| * \| \|	Fix tests	Joas Schilling	2017-06-20	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
\| * \| \|	Use PNG version of the icons for shipped activities	Joas Schilling	2017-06-20	18	-61/+245
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-07-07	12	-78/+90
\| \| \| \|
* \| \| \|	adjust encryption tests to the new master key default	Bjoern Schiessle	2017-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	update sharing test to new master key default	Bjoern Schiessle	2017-07-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	fix and extend dav test to also test the master-key setup	Bjoern Schiessle	2017-07-06	2	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	since the default for the master key changed we need to write the setting ↵	Bjoern Schiessle	2017-07-06	2	-1/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	explicitely to the database if we migrate from a older version Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	add occ command to disable the master key again	Bjoern Schiessle	2017-07-06	1	-0/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	improve status messages	Bjoern Schiessle	2017-07-06	4	-7/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	after the master key was loaded we are ready to go, no re-login needed	Bjoern Schiessle	2017-07-06	3	-4/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	only collect detailed access list if it is really needed	Bjoern Schiessle	2017-07-06	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	make master key the new default	Bjoern Schiessle	2017-07-06	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-07-06	8	-0/+8
\| \|/ / \|/\| \|
* \| \|	Merge pull request #5231 from nextcloud/migrations	Morris Jobke	2017-07-05	4	-86/+100
\|\ \ \ \| \| \| \| \| \| \| \|	Migrations
\| * \| \|	Fix dropping tables and handle the prefix automatically	Joas Schilling	2017-07-05	2	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
\| * \| \|	Move twofactor_backupcodes to migrations	Joas Schilling	2017-07-05	4	-86/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
* \| \| \|	Merge pull request #5621 from ↵	Morris Jobke	2017-07-05	2	-2/+121
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nextcloud/fix-sorting-of-favorite-files-in-file-list Fix sorting of favorite files in file list
\| * \| \| \|	Fix sorting of favorite files	Daniel Calviño Sánchez	2017-07-05	2	-2/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The sort comparator checks the "isFavorite" property of the FileInfo objects to compare. That property is set when the file list is loaded and the response from the server is parsed, and thus a freshly loaded file list has the proper sorting for favorite files. However, the property is not set in other cases, like when the FileInfo objects are derived from FileInfoModels due to a file being marked as a favorite or a text editor being closed, which causes the file to be sorted in the wrong position. There is no need to add the property in those situations, though; in all cases the TagsPlugin adds a "tags" array property that contains an OC.TAG_FAVORITE tag, so that tag can be checked instead of "isFavorite". Moreover, although "isFavorite" was added by the main "_parseFileInfo" function it did not really belong there but to the "FileInfoParser" from the TagsPlugin; however, as that property now is not used anywhere it was removed altogether. A cleaner solution would have been to make the sort comparator extensible by plugins like other behaviours of the file list and then add the sorting logic related to favorite files to the TagsPlugin. However, right now only the TagsPlugin would need to alter the main sorting logic, and it seems like a corner case anyway. Even if it is implemented as a plugin, favorite files is a core feature, so for the time being it will be taken into account directly in the main sorting logic; making the sort comparator extensible by plugins is defered until there are other use cases for that. Fixes #5410 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* \| \| \| \|	Merge pull request #5580 from nextcloud/admin-audit-update	Morris Jobke	2017-07-05	14	-238/+346
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Admin audit update
\| * \| \| \|	Log console commands	Joas Schilling	2017-07-01	2	-0/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
\| * \| \| \|	Listen to app enable/disable events	Joas Schilling	2017-07-01	2	-1/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
\| * \| \| \|	Move logic to Application class	Joas Schilling	2017-07-01	3	-223/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
\| * \| \| \|	Move to PSR-4	Joas Schilling	2017-07-01	12	-26/+66
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
* \| \| \|	Merge pull request #5557 from ↵	blizzz	2017-07-05	2	-24/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nextcloud/dont-log-passwords-on-dav-exceptions-either Don't log passwords on dav exceptions
\| * \| \| \|	Don't log passwords on dav exceptions	Joas Schilling	2017-06-29	2	-24/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
* \| \| \| \|	Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fix	Morris Jobke	2017-07-05	4	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Ldap password renewal fixes for NC12
\| * \| \| \| \|	suppress superflous php error on rejected password change	Roger Szabo	2017-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roger Szabo <roger.szabo@web.de>