mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity
5,164 Commits 2 Branches 42 Tags
Commit Graph

5164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garvin Hicking
e23fed0a47 Merge branch 'master' of https://github.com/s9y/Serendipity 2018-04-23 11:58:54 +02:00
Garvin Hicking
775b71134c * Fixed bug in pull request #392 which overwrote user specified 
input for logged in authors with an empty realname (wrong array
      key name) and deleted all existing text input
 2018-04-23 11:58:32 +02:00
Matthias Mees
fcb8b3e72b bootstrap4: Update to Bootstrap 4.1.0 2018-04-20 17:15:32 +02:00
Matthias Mees
d0a23274b4 bootstrap4: Remove modernizr reference 2018-04-19 22:23:59 +02:00
Matthias Mees
575ec3f165 Merge branch 'master' of github.com:s9y/Serendipity 2018-04-10 08:14:36 +02:00
Matthias Mees
a699623ada Skeleton: used the wrong lang constant 2018-04-10 08:14:25 +02:00
Don Chambers
f5d13f3263 Timeline: add theme option to disable Google webfonts 2018-04-09 18:48:04 -05:00
Don Chambers
c22653e001 Clean Blog: add theme option to disable Google webfonts 2018-04-09 18:12:47 -05:00
Matthias Mees
5ba0c006ab Oops, forgot something for Skeleton 2018-04-09 23:59:33 +02:00
Matthias Mees
b6d06e16c0 Skeleton: add theme option to disable Google webfonts 2018-04-09 20:47:46 +02:00
onli
0bdae3b18c Merge branch 'master' of github.com:s9y/Serendipity 2018-04-06 17:14:13 +02:00
onli
40993037b2 init media gallery insert 2018-04-06 17:09:51 +02:00
Garvin Hicking
5f5d809b10 upport 2018-04-03 11:21:25 +02:00
Garvin Hicking
c40aafcd1a Backport 2018-04-03 11:19:25 +02:00
Garvin Hicking
d10aaf8ffd Add new "legal" properties for affected plugins. 
Disable subtome by default.
 2018-04-03 11:17:22 +02:00
Thomas Hochstein
02b70e2266 Another fix to Spartacus after dropping netmirror. 
See #548.

Expands b0fb8d2d126bc8c6e2745c466eb5429c18615738
by adding the necessary fix at another code point.

Fixes a whitespace issue (tabs -> spaces).

Add Changelog entries.

Needs to be backported to 2.1 after tests and review.

Signed-off-by: Thomas Hochstein <thh@inter.net>
 2018-03-30 13:17:51 +02:00
mariohommel
dcb693ba54 Generating token for comment moderation in a global function now. 2018-03-30 11:04:21 +02:00
onli
b0fb8d2d12 Sync: Drop netmirror from spartacus 2018-03-28 21:09:53 +02:00
Garvin Hicking
270c370c2a Fixed SQL statement for creation of serendipity_groupconfig DB table (did not work in my MySQL 5.7.17) 2018-03-28 10:41:18 +02:00
Matthias Mees
1ae46203c3 Replace idea theme with bootstrap4 theme 
- Add new bootstrap4 theme
- Move idea theme to spartacus
 2018-03-25 10:57:21 +02:00
Thomas Hochstein
84b0cecfa3 Update RELEASE and NEWS for 2.1.2. 
Signed-off-by: Thomas Hochstein <thh@inter.net>
 2018-03-25 08:45:12 +02:00
Mario Hommel
0d8cdd59fa
Fix variable name in hook backend_sendcomment 2018-03-24 18:31:14 +01:00
Guillaume Zin
493ddde07a Remove old call on the onclick event of submit button 2018-03-23 20:48:32 +01:00
Guillaume Zin
7994bda7b5 Use event listener on submit for check save 2018-03-23 20:48:32 +01:00
Guillaume Zin
d459d54271 Add functions for entry check 2018-03-23 18:12:21 +01:00
onli
eafc4dd625 Move from SHA1 to bcrypt 
SHA1 is not an ideal password hash, even when salted, because it is cheap to compute. Since version 5.5 PHP offers bcrypt built in, which is a more expensive and secure hash function specifically suited for passwords
 2018-03-23 18:02:02 +01:00
onli
52a41b37d5 Rework autologin to use a token approach 
The prior code stored encrypted user data in the cookie that was then checked. This new approach is cleaner, as it only stores a token, and it does not use problematic crypto functions deprecated in PHP 7.2
 2018-03-23 18:01:32 +01:00
Garvin Hicking
4a43761e72 Assume uninitialized charset constant (https://board.s9y.org/viewtopic.php?f=3&t=22365) 2018-03-12 12:39:06 +01:00
Garvin Hicking
b2eecb9a3d backport constant check 2018-01-10 11:21:59 +01:00
Stephan Brunker
7bc9067674 allowed nested lists, svg XML elements and fixed bugs in tag_clean 2018-01-02 14:46:45 +01:00
Stephan Brunker
bac3e5fb41 added iframe to allowed singleton tags 2017-12-20 00:06:57 +01:00
onli
4d30cf3b07 resp imgs: don't insert original image if too small 2017-12-16 22:21:45 +01:00
Stephan Brunker
967935195c Fixed a small bug in isolation feature 2017-12-14 21:25:12 +01:00
Stephan Brunker
43b9f607d3 NL2P operation completely new written, works now from front to back according to tags 2017-12-14 21:25:12 +01:00
Stephan Brunker
b837adde3c Changed behavior between body and extended part of article. 
The body part now has never a whiteline at the bottom, the extended part has one at the top if it begins with a newline or the body ends with a newline.
 2017-12-14 21:25:12 +01:00
onli
0ee37818f2 Let themes override responsive images breakpoint (#474) 2017-11-01 20:12:18 +01:00
onli
d9db68ac5f minor: remove debugging output when adding image 2017-10-29 03:05:01 +01:00
Garvin Hicking
cacf778480 Merge pull request #533 from erAck/master 
Add xml inc svg as 'text' file extensions to serendipity_FTPChecksum()
 2017-09-25 09:32:17 +02:00
Eike Rathke
be3df87b97 Add xml inc svg as 'text' file extensions 
To prevent situations like in
https://board.s9y.org/viewtopic.php?f=10&t=21591
where the following files were modified by FTP text transfer type but
not handled as such in serendipity_FTPChecksum()

bundled-libs/katzgrau/klogger/phpunit.xml
bundled-libs/simplepie/simplepie.inc
templates/2k11/admin/font/fontello.svg
templates/next/font/fontello.svg

All these *are* text files.

Maybe simplepie.inc should rather be renamed to simplepie.inc.php as well.
 2017-09-21 18:48:10 +02:00
Eike Rathke
e2a35c3694 Merge remote-tracking branch 'upstream/master' 2017-09-21 02:49:08 +02:00
onli
440b189372 Merge pull request #526 from th-h/thh-comment-messages 
Fix display of messages for comment editing.
 2017-08-07 23:18:04 +02:00
Thomas Hochstein
0f9bfe3fda Fix display of messages for comment editing. 
All messages and errors were appended to $msg
and $errormsg, respectively, creating one long
unformatted string - mostly unreadable.

So we make $msg and $errormsg arrays instead
and iterate over those arrays in the template,
displaying each message separately.

Fixes #525.

Signed-off-by: Thomas Hochstein <thh@inter.net>
 2017-08-07 23:11:13 +02:00
onli
d3e6a3ee3a Fix non-variable matches class (#522) 2017-07-11 14:06:32 +02:00
Garvin Hicking
30b57a1e42 wrong function call 2017-07-11 12:33:01 +02:00
Garvin Hicking
8b1ae7cee8 Once more without parse errors 2017-07-10 13:54:00 +02:00
Garvin Hicking
59f8837ab2 Add upgrader task, Issue #521 2017-07-10 13:53:33 +02:00
Garvin Hicking
07d75a6d65 Fixes Issue #521 2017-07-10 13:49:27 +02:00
onli
405fa77e3f Merge pull request #520 from th-h/thh-plugin-changelog 
Display ChangeLog in plugin lists (if available).
 2017-07-09 19:26:23 +02:00
Thomas Hochstein
b7f479e9fc Display ChangeLog in plugin lists (if available). 
Code was using wrong file path variable for checking
the presence of a ChangeLog file.

Signed-off-by: Thomas Hochstein <thh@inter.net>
 2017-07-09 15:07:47 +02:00
onli
93c95407aa Merge pull request #517 from igoltz/Issues_331_516 
add template path as first entry to template_dirs array
 2017-06-13 11:09:32 +02:00