mirror of
https://github.com/claudehohl/Stikked.git
synced 2025-04-25 04:21:17 -05:00
Merge branch 'dev'
This commit is contained in:
Claude
commit
773a21d33b
11
AUTHORS.md
11
AUTHORS.md
@ -1,4 +1,4 @@
|
||||
* Ben McRedmond https://github.com/benofsky (Original author; left stikked inactive)
|
||||
* Ben McRedmond https://github.com/benofsky (Original author of Stikked)
|
||||
* Claude Hohl https://github.com/claudehohl (Fixed some bugs, added some features; revived the project)
|
||||
* Daniel https://github.com/lightswitch05 (Added LDAP authentication)
|
||||
* Jens Willmer https://github.com/jwillmer (Bugfixing)
|
||||
@ -55,8 +55,15 @@
|
||||
* Shen-Ta Hsiea https://github.com/ibmibmibm (updated traditional chinese translation)
|
||||
* haliphax https://github.com/haliphax (Fixed cssmin library)
|
||||
* YangJun https://github.com/yangjun1994 (Fix language.php small mistakes of chinese-simplified)
|
||||
* Justin Massey https://github.com/Th3R3p0 (LDAP improvements, xss security fixes, Dockerfiles)
|
||||
* Justin Massey https://github.com/Th3R3p0 (LDAP improvements, xss security fixes, Dockerfiles, captcha-issue fixed)
|
||||
* Nilpferd (Shorturl is now shown for 'burn' pastes after creation)
|
||||
* Pascal Briehl (add support for polr url shortener)
|
||||
* Simon Sickle https://github.com/SimonSickle (Protect the langs api call with the apiKey)
|
||||
* John Walker https://github.com/techjwalker (some minor additions)
|
||||
* Deni https://github.com/b4d (Letsencrypt support)
|
||||
* Rob Thomas https://github.com/xrobau (Docker-setup improvements, Spamadmin fixes)
|
||||
* Razvan Rosca https://github.com/Razva (Fix Geshi for PHP7.2+)
|
||||
* Tim White https://github.com/timwhite (Fix docker bug when setting DB_PASSWORD)
|
||||
* Vasya Pupkin https://github.com/shadowlmd (Lighttpd improvements)
|
||||
* John Poole https://github.com/jlpoolen (investigating Log.php path issue)
|
||||
* CompuRoot https://github.com/CompuRoot (Better burn on read page)
|
||||
|
||||
33
README.md
33
README.md
@ -24,9 +24,9 @@ Here are some features:
|
||||
Try it out
|
||||
----------
|
||||
|
||||
http://paste.scratchbook.ch/
|
||||
https://paste.scratchbook.ch/
|
||||
|
||||
See an encrypted paste: http://paste.scratchbook.ch/view/1427473f#iP7p05DRH0BC72qQjxv01BjUeOmNV073
|
||||
See an encrypted paste: https://paste.scratchbook.ch/view/1427473f#iP7p05DRH0BC72qQjxv01BjUeOmNV073
|
||||
|
||||
|
||||
Prerequisites
|
||||
@ -81,6 +81,35 @@ In the folder doc/, you will find:
|
||||
Changelog
|
||||
---------
|
||||
|
||||
### Version 0.13.0:
|
||||
|
||||
* Updated CodeIgniter to 3.1.9
|
||||
* Various improvements in the Docker setup
|
||||
* An automated Docker-build: https://hub.docker.com/r/claudehohl/stikked/
|
||||
* Reverted the "intelligent language switcher" back to a fixed language setting because of too many side-effects
|
||||
* Fixed encodings and decryption functionality in various themes
|
||||
* Various bugfixes and improvements
|
||||
|
||||
#### Upgrade instructions
|
||||
|
||||
Copy your htdocs/application/stikked.php config file away. Upload the new version. Copy it back.
|
||||
|
||||
The language setting in config/stikked.php is back, you can set a fixed language:
|
||||
|
||||
```php
|
||||
$config['language'] = 'english';
|
||||
```
|
||||
|
||||
New config option: Content expiration.
|
||||
Sets the "Expires:"-header to make use of browser-caching
|
||||
Format: http://php.net/manual/en/function.strtotime.php
|
||||
Examples: '+10 seconds', '+1 year', '-1 week'
|
||||
Browser-caching is disabled when this option is not set.
|
||||
|
||||
```php
|
||||
$config['content_expiration'] = '+1 week';
|
||||
```
|
||||
|
||||
### Version 0.12.0:
|
||||
|
||||
* Updates ensuring the compatibility with PHP7:
|
||||
|
||||
@ -24,7 +24,7 @@ $config['base_url'] = '';
|
||||
| So that we can track your version.
|
||||
|
|
||||
*/
|
||||
$config['stikked_version'] = '0.12.0';
|
||||
$config['stikked_version'] = '0.13.0';
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
||||
@ -1,132 +0,0 @@
|
||||
<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
/**
|
||||
* Language
|
||||
*
|
||||
* Which language to use
|
||||
* Translate Stikked to your own language, see htdocs/application/language files
|
||||
* Currently: english, german, swissgerman, spanish, norwegian, danish, portuguese, turkish, french, japanese, polish, russian, chinese-simplified, chinese-traditional, indonesia
|
||||
*
|
||||
*/
|
||||
|
||||
$config['supported_languages'] = array(
|
||||
'en' => array(
|
||||
'name' => 'English',
|
||||
'folder' => 'english',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('en', 'english', 'en-US'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'de' => array(
|
||||
'name' => 'Deutsch',
|
||||
'folder' => 'german',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('de', 'german', 'de'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'sw' => array(
|
||||
'name' => 'Schweizerdeutsch',
|
||||
'folder' => 'swissgerman',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('sw', 'swissgerman', 'de-CH'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'es' => array(
|
||||
'name' => 'Español',
|
||||
'folder' => 'spanish',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('esp', 'spanish', 'es-ES'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'no' => array(
|
||||
'name' => 'norsk',
|
||||
'folder' => 'norwegian',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('no', 'norwegian', 'no-NO'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'da' => array(
|
||||
'name' => 'dansk',
|
||||
'folder' => 'danish',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('da', 'danish', 'da-DA'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'pt' => array(
|
||||
'name' => 'Português de Portugal',
|
||||
'folder' => 'portuguese',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('ptb', 'portuguese-portugal', 'pt-PT'),
|
||||
'ckeditor' => 'pt-pt'
|
||||
),
|
||||
'tr' => array(
|
||||
'name' => 'Türkçe',
|
||||
'folder' => 'turkish',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('tr', 'turkish', 'tr-TR'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'fr' => array(
|
||||
'name' => 'Français',
|
||||
'folder' => 'french',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('fra', 'french', 'fr-FR'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'jp' => array(
|
||||
'name' => '日本語',
|
||||
'folder' => 'japanese',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('jp', 'japanese', 'jp-JP'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'pl' => array(
|
||||
'name' => 'Polski',
|
||||
'folder' => 'polish',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('plk', 'polish', 'pl-PL'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'ru' => array(
|
||||
'name' => 'Русский',
|
||||
'folder' => 'russian',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('rus', 'russian', 'ru-RU'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'cn' => array(
|
||||
'name' => '简体中文',
|
||||
'folder' => 'chinese-simplified',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('chs', 'chinese-simplified', 'zh-CN'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'zh' => array(
|
||||
'name' => '繁體中文',
|
||||
'folder' => 'chinese-traditional',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('cht', 'chinese-traditional', 'zh-TW'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
'id' => array(
|
||||
'name' => 'Indonesia',
|
||||
'folder' => 'indonesia',
|
||||
'direction' => 'ltr',
|
||||
'codes' => array('id', 'indonesia', 'id-ID'),
|
||||
'ckeditor' => NULL
|
||||
),
|
||||
);
|
||||
|
||||
/*
|
||||
* Default Language
|
||||
*
|
||||
* If no language is specified, which one to use?
|
||||
* Currently: english (en) | german (de) | swissgerman (sw)
|
||||
* spanish (es) | norwegian (no) | portuguese (pt)
|
||||
* turkish (tr) | french (fr) | japanese (jp)
|
||||
* polish (pl) | russian (ru) | bahasa indonesia (id)
|
||||
* chinese-simplified (cn) | chinese-traditional (zh)
|
||||
*
|
||||
*/
|
||||
$config['language'] = 'en';
|
||||
|
||||
@ -30,10 +30,8 @@ $config['db_password'] = 'stikked';
|
||||
|
||||
// If you are using sqlite:
|
||||
// uncomment the configuration lines below.
|
||||
//$config['db_database'] = 'db/stikked';
|
||||
//$config['db_database'] = 'db/stikked'; // you need to create a directory "db" and give the webserver write access. sqlite needs a writable folder to work properly!
|
||||
//$config['db_driver'] = 'sqlite';
|
||||
// you need to create a directory "db" and give the webserver write access.
|
||||
// sqlite needs a writable folder to work properly!
|
||||
|
||||
/**
|
||||
* Table prefix
|
||||
@ -78,9 +76,12 @@ $config['js_editor'] = ''; // codemirror, ace, ''
|
||||
/**
|
||||
* Language
|
||||
*
|
||||
* New Language settings in application/config/language.php
|
||||
* Which language to use
|
||||
* Translate Stikked to your own language, see htdocs/application/language files
|
||||
* Currently: english, german, swissgerman, spanish, norwegian, danish, portuguese, turkish, french, japanese, polish, russian, chinese-simplified, chinese-traditional, indonesia
|
||||
*
|
||||
*/
|
||||
$config['language'] = 'english';
|
||||
|
||||
/**
|
||||
* Combine JS & CSS files (recommended)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user