0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
ec8609fa21
Merge pull request #1259 from TheSFReader/master
...
Add two specific mimetype extensions (ebooks): for epub and mobi files
2013-01-22 14:06:50 -08:00
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
df6ba6955d
Update lib/mail.php
...
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.
2013-01-22 14:13:24 +01:00
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
351d206dd3
Allow eval() and send headers for legacy browsers
...
The blocking of eval() seems to have problems with JQuery 1.7.2 - let's allow it for now and disable it in the future.
2013-01-22 08:09:01 +01:00
5136f6d818
Make database connection error messages less verbose
2013-01-21 22:53:32 -05:00
3ffbaf4795
Allow iframes to external domains
2013-01-22 00:30:09 +01:00
30274ee33e
Move to OC_App
2013-01-21 22:18:11 +01:00
a29f9f90ab
Indentation
2013-01-21 22:17:48 +01:00
0c59074eeb
Correct copy paste fail
2013-01-21 20:46:42 +01:00
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
d58cee2f76
returning http status code 503 in case connecting to the database failed
2013-01-21 14:57:33 +01:00
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
af8c193605
Disallow inline JS
2013-01-20 23:30:16 +01:00
dea77b7610
cached queries need to be reset on schema change because they become invalid
...
fixes: https://github.com/owncloud/apps/issues/468
2013-01-20 22:46:26 +01:00
967b7947a1
Add the default-src
2013-01-20 12:19:09 +01:00
c82d6e5153
Add CSP header
2013-01-20 12:06:33 +01:00
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
42b924da0e
Also replace the backslash with a minus
...
For Windows systems
2013-01-19 19:47:26 +01:00
f1939866f3
Merge pull request #1214 from Raydiation/master
...
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
487e401361
Typo fix (comment) /lib/base.php
2013-01-18 10:52:29 -08:00
9ffd4197ae
Fix wrong word in comment
2013-01-18 16:38:40 +01:00
d2c5f9bec7
fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails.
...
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
2013-01-18 15:14:42 +01:00
0ed635240a
Merge pull request #1205 from owncloud/ocs_api
...
Return 401 headers when trying to access a restricted api call
2013-01-18 05:52:51 -08:00
5df57e4ada
Merge pull request #1181 from owncloud/return-503-in-maintenance
...
in case of maintenance the error page returns http status 503.
2013-01-18 04:02:03 -08:00
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
73522fe189
Add ebook specific mimetypes
2013-01-17 22:20:57 +01:00
eb9cd0858e
Add ebook specific mimetypes
2013-01-17 21:57:04 +01:00
2b95ae1e6d
spaces to tabs
2013-01-17 21:44:40 +01:00
a8094abac7
load classpaths of apps before routes
2013-01-17 21:42:46 +01:00
b4954c0c89
Correct spelling of 'Authorization'
2013-01-17 16:30:14 +00:00
d85e440aa1
Merge pull request #1148 from seancomeau/topic/setup
...
Fix issue #108
2013-01-16 22:38:57 -08:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
9dc668740a
Check that api methods return the correct result type
2013-01-16 21:46:00 +00:00
358671ac1d
Fix incorrect indentation
2013-01-16 20:29:29 +00:00
098c84a29c
Return 401 headers when authentication is required for the api call
2013-01-16 20:27:43 +00:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
cb0fd30458
Merge pull request #1185 from owncloud/fixing-1162-master
...
handling proper display of files/folders with negative size
2013-01-16 05:18:53 -08:00
1f7bf57ece
Merge pull request #1195 from owncloud/cache_prepared
...
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
f18fc1c510
Clear cached prepared statements when switching between mdb2 and pdo
2013-01-16 01:12:13 +01:00
4668f8c86e
Merge pull request #1178 from owncloud/return_true_because_of_ponies
...
Remove uneeded return
2013-01-15 14:01:48 -08:00
a08490364d
Cache prepared statements in OC_DB
2013-01-15 20:21:06 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +01:00
53ca0db434
Merge pull request #1177 from owncloud/OC_User--isAdminUser()
...
Check if user is admin - bool
2013-01-14 12:53:18 -08:00
31ce320c52
in case of maintenance the error page returns http status 503.
...
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
2013-01-14 21:39:55 +01:00
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
0132a0b2cf
Rename TestException to DatabaseSetupException
2013-01-14 12:36:50 -08:00
8b2307ce4b
Merge pull request #1172 from owncloud/isSubDirectory
...
Simplify the isSubDirectory() function
2013-01-14 12:36:38 -08:00
42cd99626e
Use a custom exception instead of adding a delimiter to the error message
2013-01-14 11:57:40 -08:00
cc00c54f6a
Remove uneeded returns
2013-01-14 20:18:08 +01:00
e8b45caa51
Remove uneeded return
...
Thx @Raydiation
2013-01-14 19:57:28 +01:00
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
99adfbdb86
Check for string position instead of string existence
...
otherwise /foo/bar would be detected as a subfolder of /bar
THX @icewind1991
2013-01-14 16:51:35 +01:00
fa78fbe0c3
Merge pull request #1112 from Raydiation/master
...
This fixes a problem that prevented app routes from being loaded after ocs_api merge
2013-01-14 07:35:14 -08:00
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
b7db967dc5
Commentblocks should begin with two *
2013-01-13 14:54:18 +01:00
c27833b143
Add @brief to description
2013-01-13 14:50:31 +01:00
e151210a62
Simplify the isSubDirectory() function
...
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.
Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.
The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php ) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.
Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
2013-01-13 14:33:19 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
ba9c967435
Throw an exception when creating a MySQL user fails and display exception error text to user
2013-01-10 14:43:08 -08:00
3e83023bf6
Removed unnecessary line
2013-01-10 18:16:56 +00:00
9ca9124dc1
Merge branch 'master' into files_encryption
2013-01-10 18:07:15 +00:00
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
75dbe88664
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
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
5ccbfd9079
readded ocs routes
2013-01-07 15:48:45 +01:00
f80bc4ed53
fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge
2013-01-07 15:34:42 +01:00
a21da9f9fd
fixing returns
2013-01-06 23:59:02 +01:00
1093cdd823
fixing returns
2013-01-06 23:57:27 +01:00
19edb29cc3
add missing return
2013-01-06 23:54:18 +01:00
cdd28fcc46
fixing undefined variable $where
2013-01-06 23:48:04 +01:00
408b2cba58
fixing undefined variable $result - should be $query I assume
2013-01-06 23:45:12 +01:00
01cecc9522
initialize $result
2013-01-06 23:43:02 +01:00
19e604c104
fixing call of OC_Log::write() - missing parameter
2013-01-06 23:30:17 +01:00
a143e77ee4
removing unused parameter $parameters
...
fixing undefined variable $useDir
2013-01-06 23:29:43 +01:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
a68b597e83
Merge branch 'master' into files_encryption
2013-01-06 18:53:32 +00:00
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
Lukas Reschke
Thomas Mueller
Michael Gapczynski
Sam Tuke
j-ed
Bernhard Posselt
davidgumberg
Bart Visscher
Björn Schießle
TheSFReader
tomneedham
Frank Karlitschek
Jan-Christoph Borchardt
Robin Appelman
Sean Comeau
Jörn Friedrich Dreyer