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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge pull request #9662 from owncloud/enc_error_handling_master	Björn Schießle	2014-07-16	5	-25/+74
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	introduce some encryption exceptions and catch additional error cases	Bjoern Schiessle	2014-07-16	4	-25/+73
\| * \| \| \| \| \| \|	make sure that the crypt library is loaded	Bjoern Schiessle	2014-07-16	1	-0/+1
* \| \| \| \| \| \| \|	Merge pull request #9647 from owncloud/files_external_multiuser_tests	Robin McCorkell	2014-07-16	1	-0/+37
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add unit test for multi-user configuration loading	Robin McCorkell	2014-07-15	1	-0/+37
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #9664 from owncloud/enc-removelegacytests	Morris Jobke	2014-07-16	1	-84/+0
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Removed legacy encryption tests	Vincent Petry	2014-07-16	1	-84/+0
* \| \| \| \| \| \| \| \|	Merge pull request #9661 from owncloud/share-ownerdisplaynamefix	Morris Jobke	2014-07-16	2	-1/+20
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Correctly return the owner display name for children of shares	Vincent Petry	2014-07-16	2	-1/+20
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* / \| \| \| \| \| \|	Port of #9584	Stephan Peijnik	2014-07-16	2	-2/+23
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #9640 from owncloud/fix_9627	Björn Schießle	2014-07-16	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	make sure that 'OC_Theme' exists before checking if the method exists	Bjoern Schiessle	2014-07-15	1	-1/+1
* \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-16	473	-3097/+2186
* \| \| \| \| \| \| \|	Merge pull request #9644 from owncloud/fix_user_api	Thomas Müller	2014-07-15	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	use UserSession service to resolve user id	Jörn Friedrich Dreyer	2014-07-15	1	-1/+1
\| * \| \| \| \| \| \|	use correct IUser in interface	Jörn Friedrich Dreyer	2014-07-15	1	-2/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9540 from owncloud/use_fileinfo_in_search_results	blizzz	2014-07-15	1	-33/+22
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	mkae getRelativePath of file search results overwriteable in subclasses	Jörn Friedrich Dreyer	2014-07-14	1	-2/+1
\| * \| \| \| \| \| \|	return relative path	Jörn Friedrich Dreyer	2014-07-14	1	-27/+15
\| * \| \| \| \| \| \|	use fileinfo object in search results	Jörn Friedrich Dreyer	2014-07-09	1	-9/+11
* \| \| \| \| \| \| \|	Merge pull request #9628 from edozzo/master	blizzz	2014-07-15	1	-2/+12
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Strinct comparsion fix	DeLtAfOx	2014-07-15	1	-2/+2
\| * \| \| \| \| \| \|	Userlist: async load doesnt fill checked group/subadmin array	DeLtAfOx	2014-07-15	1	-2/+12
* \| \| \| \| \| \| \|	Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-this	icewind1991	2014-07-15	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Update info.xml	Lukas Reschke	2014-07-15	1	-1/+1
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #8987 from owncloud/lastindexid-debug	Vincent Petry	2014-07-15	3	-8/+51
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	- Added test to trigger index id error	Vincent Petry	2014-07-14	3	-8/+51
* \| \| \| \| \| \| \| \|	Merge pull request #9561 from libasys/patch-3	icewind1991	2014-07-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Update share.php	libasys	2014-07-10	1	-1/+1
\| * \| \| \| \| \| \| \| \|	Update share.php	libasys	2014-07-10	1	-1/+1
* \| \| \| \| \| \| \| \| \|	Merge pull request #9621 from owncloud/fix_logger_implementation	Thomas Müller	2014-07-15	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix logger implementation and test	Jörn Friedrich Dreyer	2014-07-15	2	-2/+2
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	throw exception if file is to large for trash bin	Bjoern Schiessle	2014-07-15	3	-6/+46
* \| \| \| \| \| \| \| \|	Merge pull request #9633 from owncloud/correct-icon-license	Thomas Müller	2014-07-15	7	-38/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	remove unused 3rdparty clock and lock icons	Jan-Christoph Borchardt	2014-07-15	6	-37/+0
\| * \| \| \| \| \| \| \| \|	correct icon license, we use Elementary icons, not Silk anymore	Jan-Christoph Borchardt	2014-07-15	1	-1/+1
* \| \| \| \| \| \| \| \| \|	Merge pull request #9570 from PhilJung/master	blizzz	2014-07-15	2	-1/+153
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	File written by blizzz	Philippe Jung	2014-07-14	1	-0/+151
\| * \| \| \| \| \| \| \| \|	[Issue #9559] identifiers uid=xxx must be considered as user DN and not as ow...	Philippe Jung	2014-07-10	1	-1/+2
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9596 from owncloud/fixing-9503-master	Morris Jobke	2014-07-15	4	-14/+14
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	reduce share action text to the user name only	Thomas Müller	2014-07-14	4	-14/+14
* \| \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-07-15	181	-2735/+3649
* \| \| \| \| \| \| \| \| \|	Merge pull request #9562 from owncloud/users-groupfilter	Thomas Müller	2014-07-15	5	-59/+153
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fixing PHPDoc	Thomas Müller	2014-07-14	1	-16/+16
\| * \| \| \| \| \| \| \| \|	remove dead code	Arthur Schiwon	2014-07-14	5	-43/+137
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #9620 from owncloud/search-fileinfo-path	icewind1991	2014-07-14	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use the correct path when building the FileInfo for the search result	Robin Appelman	2014-07-14	1	-1/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #9228 from owncloud/remove-routing-singular-issues	Morris Jobke	2014-07-14	2	-16/+6
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	use id instead of resourceId	Bernhard Posselt	2014-06-26	2	-13/+3
\| * \| \| \| \| \| \| \|	dont strip the s from the resource	Bernhard Posselt	2014-06-26	2	-6/+6