d21946fdce
Merge pull request #1258 from owncloud/no-inline-js
...
No inline JS - Work in progress
2013-01-25 08:20:26 -08:00
d8c4e620af
Use black background images
2013-01-25 16:23:03 +01:00
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
688fe0baa8
Merge pull request #1307 from owncloud/js_linkToRemote
...
Add js linkToRemote and linkToRemoteBase
2013-01-25 07:10:35 -08:00
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
ff4d62132a
This breaks the installation
...
@bartv2 This JS part is breaking the installation (POST parameters are
not transferred), could you please take a look? THX.
JS console says:
uncaught exception: cannot call methods on button prior to
initialization; attempted to call method 'disable'
2013-01-25 15:47:57 +01:00
0d2a58bc5d
Initialize router also if ownCloud isn't installed
2013-01-25 14:57:52 +01:00
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
48e6ce7c56
Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master
...
drop SimpleTest compatibility
2013-01-24 08:06:39 -08:00
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
1dac2ba496
Merge pull request #1286 from owncloud/ocs_api
...
Check that external api methods return instances of OC_OCS_Result
2013-01-24 02:37:40 -08:00
f9a9fc5670
Merge pull request #1265 from j-ed/master
...
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
2013-01-24 00:11:03 -08:00
8f9d3cd01d
Code style update
2013-01-23 23:39:29 +00:00
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
293e7bdcf0
Notice about changing the standard policy
2013-01-23 13:44:43 +01:00
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
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
fe56e4df7d
Fix merge conflict
2013-01-23 11:32:14 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
48949ba04a
Move appid to external file
2013-01-23 11:21:34 +01:00
5fadd53088
missing renames of publicListView to disableSharing
2013-01-23 09:18:26 +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
dcda792fbc
Update config/config.sample.php
...
fixed an other typo.
2013-01-22 21:42:39 +01:00
dfa5f2de4d
Update config/config.sample.php
...
Fixed type in line 70. Thank you for pointing me to that typo.
2013-01-22 21:33:01 +01:00
12e286b21c
Merge pull request #1237 from owncloud/fix-template-tests
...
Remove unnecessary ob_end_clean() from template tests
2013-01-22 11:12:40 -08:00
c18aec56e2
Merge pull request #1105 from owncloud/files_encryption
...
Files encryption
2013-01-22 09:51:19 -08:00
367aadb3b7
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
2013-01-22 18:34:59 +01:00
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
ca454f0228
Removed depreciated file
2013-01-22 17:15:51 +00:00
47592657d7
Added localisation for encryption settings
2013-01-22 17:15:03 +00:00
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
9c069530cb
Update config/config.sample.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:24:00 +01: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
8907bdaf7f
Remove uneeded JS
2013-01-22 12:15:46 +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
dd40b691ee
Merge pull request #1255 from owncloud/leftcontent_fix
...
Fix scrolling of leftcontent
2013-01-21 15:18:38 -08:00
d8d812a91e
enable unittesting on appframework and apptemplateadvanced
2013-01-21 23:19:17 +01:00
8223117569
Remove closing tag
2013-01-21 22:29:27 +01:00
d2383338de
External JSON for the Apps
2013-01-21 22:18:42 +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
3ed7d5d521
Move isadmin to external file
2013-01-21 21:25:38 +01:00
39da6f8166
Move timezone check to external JS
2013-01-21 21:10:44 +01:00
Lukas Reschke
Thomas Tanghus
Jenkins for ownCloud
Tom Needham
Michael Gapczynski
j-ed
icewind1991
Sam Tuke
Björn Schießle
Sam Tuke