899 Commits

Author SHA1 Message Date
Kyle Laker
83f954a33f (REAMDE.md) Remove Android app link 2017-09-15 22:36:24 -04:00
Claude
30068ae7f0 Merge pull request #440 from Th3R3p0/encrypted-bootstrap
fixed encrypted paste on bootstrap theme
2017-08-28 15:15:44 +02:00
Claude
d1e27e4de0 Merge pull request #437 from Th3R3p0/docker
Docker
2017-08-28 15:11:01 +02:00
Claude
bdba48ca13 Merge pull request #420 from ColdSphinX/master
add support for polr url shortener
2017-08-28 15:09:23 +02:00
Claude
085de303e0 Merge pull request #439 from Th3R3p0/CSRF-Fix
fixed CSRF issue
2017-08-28 15:08:14 +02:00
Th3R3p0
d550535b61 fixed js error '.selectable is not a function 2017-08-25 21:57:32 -04:00
Th3R3p0
3d901017fe forgot to uncomment some lines from debugging. - however, this code may not be working anywqy and could potentially be removed 2017-08-24 09:57:48 -04:00
Th3R3p0
554ae543b5 fixed encrypted paste on bootstrap theme - https://github.com/claudehohl/Stikked/issues/433 2017-08-24 09:53:36 -04:00
Th3R3p0
335cebd4fd fixed CSRF issue as mentioned in https://github.com/claudehohl/Stikked/issues/435 2017-08-23 18:30:19 -04:00
Th3R3p0
17b8bfa90c initial docker commit - working 2017-08-22 21:30:42 -04:00
Pascal Briehl
4f359384a2 Merge branch 'master' of github.com:ColdSphinX/Stikked 2017-05-30 10:12:39 +02:00
Pascal Briehl
d7be2b8855 add missing example 2017-05-30 10:11:35 +02:00
ColdSphinX
aa0ed6aae0 fix spaces 2017-05-29 18:39:21 +02:00
Pascal Briehl
85833dbfc9 add support for polr url shortener (https://github.com/cydrobolt/polr, https://docs.polrproject.org/en/latest/developer-guide/api/) 2017-05-29 18:34:53 +02:00
Claude
bd34454758 Merge pull request #418 from Nilpferd/master
Shorturl are now shown for 'burn' pastes after creation
2017-05-21 12:07:34 +02:00
Nilpferd
7ce90a574b spaces to tabs 2017-05-21 10:36:43 +02:00
Nilpferd
85f42f2f92 Shorturl are now shown for 'burn' pastes after creation 2017-05-21 10:33:31 +02:00
Claude
8f1e516cb6 Merge pull request #413 from Th3R3p0/master
Security + Bug Fix
2017-03-22 08:17:56 +01:00
Th3R3p0
e92895c7ca fixed a regex issue causing a WARNING which was breaking ldap 2017-03-21 20:45:20 -04:00
Th3R3p0
e5afab8429 fixed security bug when ldap is enabled, the api was still accessible without auth 2017-03-21 20:14:07 -04:00
Claude
8db301b87d Merge pull request #412 from techjwalker/master
Some Minor Additions
2017-03-18 00:04:05 +01:00
John Walker
bbb43288a9 Quick link fix 2017-03-17 15:28:00 -07:00
John Walker
4824a15895 Added prereq. mention & links 2017-03-17 15:22:00 -07:00
John Walker
e44cb23adb Quick Rephrase 2017-03-17 15:13:19 -07:00
John Walker
f3dd760deb Update DEVELOPMENT.md with optional formatter 2017-03-16 15:54:14 -07:00
Claude
a016780a6c Merge pull request #405 from yangjun1994/master
Fix language.php small mistakes of chinese-simplified.
2017-02-05 23:40:32 +01:00
YangJun
04516e725c Fix language.php small mistakes of chinese-simplified. 2017-02-06 06:26:52 +08:00
Claude
22f72245b0 updated readme for v0.11.0 0.11.0 2016-09-25 12:07:59 +02:00
Claude
896509b11a say thanks 2016-09-25 11:48:43 +02:00
Claude
9d76c78ef2 Merge pull request #379 from haliphax/patch-1
use __construct in cssmin library
2016-09-07 23:39:26 +02:00
haliphax
8e669ce994 use __construct in cssmin library
This will avoid a PHP error stating that methods with the same name as their class will not be treated as constructors in future versions of PHP.
2016-09-07 09:54:48 -05:00
Claude
e51bcb4509 nonmin for asset-combination 2016-09-04 21:11:40 +02:00
Claude
2a8f3e7017 Merge branch 'dev' 2016-09-04 20:59:03 +02:00
Claude
e86cc62b2b show a small preview of the paste content 2016-09-04 20:53:03 +02:00
Claude
b28a6de63f +tooltip 2016-09-04 20:04:16 +02:00
Claude
82d46e5b02 Merge branch 'dev' 2016-09-04 16:44:26 +02:00
Claude
4cf85b1a21 Merge branch 'spamadmin' into dev 2016-09-04 16:43:41 +02:00
Claude
0a088ea08e spamadmin for bootstrap 2016-09-04 16:43:13 +02:00
Claude
6d00897ed1 make login work for php-fastcgi 2016-09-04 14:09:12 +02:00
Claude
15ad0457e5 sigh 2016-09-04 13:42:53 +02:00
Claude
5e85f4c960 delete selected pastes. fixes 2016-09-04 13:40:50 +02:00
Claude
3feb215379 delete hide-show 2016-09-04 13:30:47 +02:00
Claude
122dd6ec04 select rect 2016-09-04 13:20:02 +02:00
Claude
f2e794ae92 whitespace removal 2016-09-04 11:56:21 +02:00
Claude
b1eef47fbe parse ids 2016-09-03 20:39:54 +02:00
Claude
eb1f629a15 selectable table 2016-09-03 20:30:09 +02:00
Claude
090ce7dcd8 fixing style issue 2016-09-03 16:15:43 +02:00
Claude
79027f8c8a Merge branch 'dev' 2016-09-03 15:05:07 +02:00
Claude
d6e7f977b2 linkify for cleanwhite 2016-09-03 15:04:58 +02:00
Claude
9d768b9e8c damn. assets need to be present. 2016-09-03 14:45:12 +02:00