server/lib
Henrik Kjölhede b1b2eafa50 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
..
archive Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
backgroundjob Merged branch 'master' 2012-10-16 16:57:07 +01:00
cache initialize $result 2013-01-06 23:43:02 +01:00
connector/sabre Whitespace cleanup 2013-01-16 18:09:16 +01:00
filecache Merge branch 'master' into files_encryption 2012-12-12 17:39:43 +00:00
fileproxy Whitespace cleanup 2013-01-16 18:09:16 +01:00
filestorage Merge remote-tracking branch 'upstream/master' 2013-01-26 21:51:18 +01:00
group Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
l10n [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
log Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826 2012-12-29 19:30:31 +00:00
MDB2/Driver Whitespace cleanup 2013-01-16 18:09:16 +01:00
migration fixing undefined variable $result - should be $query I assume 2013-01-06 23:45:12 +01:00
minimizer Merged branch 'master' 2012-10-16 16:57:07 +01:00
ocs Whitespace cleanup 2013-01-16 18:09:16 +01:00
public Merge pull request #986 from owncloud/fixing-784-master 2013-01-18 14:06:00 -08:00
search Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
user Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
api.php Merge pull request #1286 from owncloud/ocs_api 2013-01-24 02:37:40 -08:00
app.php Move to OC_App 2013-01-21 22:18:11 +01:00
appconfig.php Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
archive.php Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
backgroundjob.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
base.php lookup for OCA classes in all apps folders 2013-01-26 12:45:50 +01:00
cache.php Move generating cache key from files from OC_Minimizer to OC_Cache 2012-10-29 15:04:55 +01:00
config.php Merged branch 'master' 2012-10-16 16:57:07 +01:00
db.php Merge pull request #1113 from owncloud/fix-issue-1085 2013-01-22 14:38:44 -08:00
eventsource.php Merge branch 'master' into files_encryption 2012-12-12 17:39:43 +00:00
filecache.php Merge branch 'master' into files_encryption 2013-01-22 17:31:05 +00:00
filechunking.php Make Jenkins more happy. 2012-10-23 00:28:12 +02:00
fileproxy.php Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
files.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
filestorage.php workaround for 32-bit systems to handle filesizes bigger than 2GB 2013-01-03 00:38:44 +01:00
filesystem.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
filesystemview.php Merge branch 'master' into files_encryption 2013-01-22 17:31:05 +00:00
geo.php Merged branch 'master' 2012-10-16 16:57:07 +01:00
group.php Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
helper.php Merge pull request #1059 from owncloud/fixing-998-master 2013-01-26 04:15:40 -08:00
hook.php wrap hooks into a try, catch to prevent a faulty app from crashing the request 2012-12-16 20:29:36 +01:00
image.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
installer.php Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
json.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
l10n.php Spaces to tabs 2013-01-16 18:09:16 +01:00
log.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
mail.php Update lib/mail.php 2013-01-22 14:13:24 +01:00
migrate.php Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
mimetypes.list.php Add ebook specific mimetypes 2013-01-17 22:20:57 +01:00
minimizer.php really check if mod_deflate is loaded 2012-11-15 10:35:53 +01:00
ocs.php Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
ocsclient.php Spaces to tabs 2013-01-16 18:09:16 +01:00
preferences.php Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
request.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
response.php Merged branch 'master' 2012-10-16 16:57:07 +01:00
route.php Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
router.php added cleanup recommendations by including ocs in the cachedKey method and moving the ocs routes stuff at the end of the loadRoutes method 2013-01-07 21:57:13 +01:00
search.php Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
setup.php Merge pull request #1113 from owncloud/fix-issue-1085 2013-01-22 14:38:44 -08:00
streamwrappers.php Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
subadmin.php Check if user is admin - bool 2013-01-14 19:45:17 +01:00
template.php Remove the CSP header for Firefox 2013-01-25 21:57:51 +01:00
templatelayout.php Move template parameters around so database error page is properly rendered 2013-01-07 14:15:51 -05:00
updater.php Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
user.php Merge pull request #1178 from owncloud/return_true_because_of_ponies 2013-01-15 14:01:48 -08:00
util.php Move { to same line 2013-01-14 22:04:31 +01:00
vcategories.php Whitespace cleanup 2013-01-16 18:09:16 +01:00
vobject.php Checkstyle: many fixes 2012-11-02 19:53:02 +01:00