mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,757 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

8757 Commits

Author SHA1 Message Date
Lukas Reschke 293e7bdcf0 Notice about changing the standard policy 2013-01-23 13:44:43 +01:00
Lukas Reschke 0517465f4d Allow admins to change the CSP policy in the config file 2013-01-23 13:42:52 +01:00
Thomas Mueller b4c3dd84b4 update to jquery-ui 1.10.0 2013-01-23 11:37:52 +01:00
Lukas Reschke 846971ec11 Fix merge conflict 2013-01-23 11:33:25 +01:00
Lukas Reschke fe56e4df7d Fix merge conflict 2013-01-23 11:32:14 +01:00
Lukas Reschke c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Lukas Reschke 48949ba04a Move appid to external file 2013-01-23 11:21:34 +01:00
Thomas Mueller 5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Michael Gapczynski 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
Thomas Müller 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
j-ed dcda792fbc Update config/config.sample.php 
fixed an other typo.
 2013-01-22 21:42:39 +01:00
j-ed 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
icewind1991 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
Sam Tuke c18aec56e2 Merge pull request #1105 from owncloud/files_encryption 
Files encryption
 2013-01-22 09:51:19 -08:00
Björn Schießle 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
Sam Tuke aa648fca75 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_encryption/templates/settings.php
 2013-01-22 17:31:05 +00:00
Sam Tuke ca454f0228 Removed depreciated file 2013-01-22 17:15:51 +00:00
Sam Tuke 47592657d7 Added localisation for encryption settings 2013-01-22 17:15:03 +00:00
Sam Tuke 619780a67d Merge branch 'master' into files_encryption 2013-01-22 16:50:20 +00:00
j-ed 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
j-ed 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
Lukas Reschke 8907bdaf7f Remove uneeded JS 2013-01-22 12:15:46 +01:00
Lukas Reschke bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Lukas Reschke 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
Michael Gapczynski 5136f6d818 Make database connection error messages less verbose 2013-01-21 22:53:32 -05:00
Lukas Reschke 3ffbaf4795 Allow iframes to external domains 2013-01-22 00:30:09 +01:00
icewind1991 dd40b691ee Merge pull request #1255 from owncloud/leftcontent_fix 
Fix scrolling of leftcontent
 2013-01-21 15:18:38 -08:00
Thomas Mueller d8d812a91e enable unittesting on appframework and apptemplateadvanced 2013-01-21 23:19:17 +01:00
Lukas Reschke 8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Lukas Reschke d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke 30274ee33e Move to OC_App 2013-01-21 22:18:11 +01:00
Lukas Reschke a29f9f90ab Indentation 2013-01-21 22:17:48 +01:00
Lukas Reschke 3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Lukas Reschke 39da6f8166 Move timezone check to external JS 2013-01-21 21:10:44 +01:00
Lukas Reschke 0c59074eeb Correct copy paste fail 2013-01-21 20:46:42 +01:00
Lukas Reschke 9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Lukas Reschke 0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Lukas Reschke 8ca78fcf3f Move requesttoken to oc-requesttoken.js 2013-01-21 20:24:18 +01:00
Robin Appelman 8817b603d7 Fix scrolling of leftcontent 2013-01-21 18:29:18 +01:00
Thomas Mueller d58cee2f76 returning http status code 503 in case connecting to the database failed 2013-01-21 14:57:33 +01:00
Lukas Reschke 5fff57339f Move config to core/js/config.php 2013-01-21 00:10:47 +01:00
Jenkins for ownCloud aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Lukas Reschke 68025ac43c Add a route to the JS config 2013-01-20 23:46:46 +01:00
Lukas Reschke af8c193605 Disallow inline JS 2013-01-20 23:30:16 +01:00
Thomas Müller b0716ba0e0 Merge pull request #1247 from owncloud/clear-queries-cache-on-schema-change-master 
cached queries need to be reset on schema change because they become inv...
 2013-01-20 14:00:15 -08:00
Thomas Mueller 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
Lukas Reschke 967b7947a1 Add the default-src 2013-01-20 12:19:09 +01:00
Lukas Reschke c82d6e5153 Add CSP header 2013-01-20 12:06:33 +01:00
Michael Gapczynski 68272fa253 Remove unnecessary ob_end_clean() from template tests 2013-01-19 20:28:45 -05:00