summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* get all display names from users in a given groupBjörn Schießle2013-01-255-6/+53
|
* get all display namesBjörn Schießle2013-01-253-0/+43
|
* add display name to title instead if login-IDBjörn Schießle2013-01-241-1/+1
|
* new branch which introduces display namesBjörn Schießle2013-01-243-2/+60
| | | | first commit with some infrastructure code
* Merge pull request #1265 from j-ed/masterLukas Reschke2013-01-241-2/+8
|\ | | | | add additional mail_smtp.. parameters to fix possible SMTP connection problems.
| * Update lib/mail.phpj-ed2013-01-221-2/+8
| | | | | | | | | | | | | | | | Added three additional mail_smtp.. parameters. - mail_smtpdebug - enable debug messages to analyse SMTP problems. - mail_smtptimeout - set SMTP timeout which is set to 10s by default and this is sometimes to short especially if a malware/ spam scanner is used. - mail_smtpsecure - force secure SMTP connections.
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-242-6/+8
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-234-0/+4
| |
* | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-223-15/+23
|\ \ | | | | | | Fix rendering of database connection error page
| * | Make database connection error messages less verboseMichael Gapczynski2013-01-211-2/+3
| | |
| * | returning http status code 503 in case connecting to the database failedThomas Mueller2013-01-211-0/+8
| | |
| * | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-073-15/+14
| | |
* | | Merge pull request #1259 from TheSFReader/masterThomas Müller2013-01-221-0/+2
|\ \ \ | | | | | | | | Add two specific mimetype extensions (ebooks): for epub and mobi files
| * | | Add ebook specific mimetypesTheSFReader2013-01-171-1/+0
| | | |
| * | | Add ebook specific mimetypesTheSFReader2013-01-171-0/+3
| | | |
* | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-2260-935/+984
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: apps/files_encryption/templates/settings.php
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-213-0/+3
| | | |
| * | | cached queries need to be reset on schema change because they become invalidThomas Mueller2013-01-201-0/+3
| | | | | | | | | | | | | | | | fixes: https://github.com/owncloud/apps/issues/468
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-202-1/+3
| | | |
| * | | Also replace the backslash with a minusLukas Reschke2013-01-191-1/+2
| | | | | | | | | | | | | | | | For Windows systems
| * | | Merge pull request #1214 from Raydiation/masterBernhard Posselt2013-01-191-0/+17
| |\ \ \ | | | | | | | | | | Load Classpaths of apps before appinfo/routes.php
| | * | | spaces to tabsBernhard Posselt2013-01-171-12/+12
| | | | |
| | * | | load classpaths of apps before routesBernhard Posselt2013-01-171-0/+17
| | | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-192-0/+2
| | | | |
| * | | | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-182-2/+29
| |\ \ \ \ | | | | | | | | | | | | the maximum upload size is now part of the response of the upload and de...
| | * | | | fixing indentThomas Mueller2013-01-182-26/+26
| | | | | |
| | * | | | Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-116-277/+611
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| | * \ \ \ \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-0630-732/+1063
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php
| | * | | | | the maximum upload size is now part of the response of the upload and delete ↵Thomas Müller2012-12-202-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation. the maximum upload size is updated within the browser once an upload or delete operation has been finished
| * | | | | | Typo fix (comment) /lib/base.phpdavidgumberg2013-01-181-1/+1
| | | | | | |
| * | | | | | Fix wrong word in commentBart Visscher2013-01-181-1/+1
| | | | | | |
| * | | | | | fix error message, add "appid" to the output to know which app caused the ↵Björn Schießle2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error if OC_App::getStorage() fails. Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
| * | | | | | Merge pull request #1205 from owncloud/ocs_apiThomas Müller2013-01-181-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Return 401 headers when trying to access a restricted api call
| | * | | | | | Correct spelling of 'Authorization'tomneedham2013-01-171-1/+1
| | | | | | | |
| | * | | | | | Fix incorrect indentationTom Needham2013-01-161-2/+2
| | | | | | | |
| | * | | | | | Return 401 headers when authentication is required for the api callTom Needham2013-01-161-0/+2
| | | | | | | |
| * | | | | | | Merge pull request #1181 from owncloud/return-503-in-maintenanceThomas Müller2013-01-181-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | in case of maintenance the error page returns http status 503.
| | * | | | | | | in case of maintenance the error page returns http status 503.Thomas Mueller2013-01-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to enable the desktop sync client to react properly. Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1810-0/+10
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #1148 from seancomeau/topic/setupFrank Karlitschek2013-01-161-5/+35
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix issue #108
| | * | | | | | | Rename TestException to DatabaseSetupExceptionSean Comeau2013-01-141-5/+5
| | | | | | | | |
| | * | | | | | | Use a custom exception instead of adding a delimiter to the error messageSean Comeau2013-01-141-8/+31
| | | | | | | | |
| | * | | | | | | Throw an exception when creating a MySQL user fails and display exception ↵Sean Comeau2013-01-101-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error text to user
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-171-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Whitespace cleanupBart Visscher2013-01-1626-80/+78
| | | | | | | |
| * | | | | | | Spaces to tabsBart Visscher2013-01-166-696/+696
| | | | | | | |
| * | | | | | | Merge pull request #1185 from owncloud/fixing-1162-masterJan-Christoph Borchardt2013-01-162-5/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | handling proper display of files/folders with negative size
| | * | | | | | | handling proper display of files/folders with negative sizeThomas Mueller2013-01-142-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #1162
| * | | | | | | | Merge pull request #1195 from owncloud/cache_preparedThomas Müller2013-01-151-2/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Cache prepared statements in OC_DB
| | * | | | | | | | Clear cached prepared statements when switching between mdb2 and pdoRobin Appelman2013-01-161-2/+4
| | | | | | | | | |