| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| | |
Test cases
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
view/de/strings.php
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \ |
|
| |\ \ \ \ |
|
| | | | | | |
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | | |
slack-NS
|
| | | | | | | |
|
|\ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | | |
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
mod/item.php on line 630
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | | | | | | | | |
|
|\| | | | | | | | |
|
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
massive work done to both dispys, mostly -dark
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
| | |\ \ \ \ \ \ \
| | | | |/ / / / /
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* remotes/upstream/master:
sort inbox by recently replied conversations first
file as widget and basic filing implementation for duepuntozero,slackr much more work needed - this is just for test/evaluation currently
don't count self in number of contatcs
invite potential connectees to the free social web
In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
Some security against XSRF-attacks
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
Avoid notices
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
wasn't actually changed before
Avoid a notice
Avoid a Notice
Avoid a Notice
Avoid a Notice
* master:
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* remotes/upstream/master:
initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.
* master:
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* remotes/upstream/master:
click anywhere to close notifications -> zeros and bubbles
revup
fix css
use fancybox instead of lightbox
fixes
* master:
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* remotes/upstream/master:
add lightbox, fixex in css
more save to file backend
backend for "save to file" feature
* master:
|
|/ / / / / / / / / / |
|
| |_|_|/ / / / / /
|/| | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
much more work needed - this is just for test/evaluation currently
|
|\ \ \ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | | |
HTML2BBCode with [EMBED]: Compute in JS instead of PHP
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
|
| | |\ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / /
| | | |/| | | | | | | |
|
|/ / / / / / / / / / |
|
|\ \ \ \ \ \ \ \ \ \ |
|
| |\| | | | | | | | |
| | |/ / / / / / / /
| |/| | | | | | | | |
CSRF-Protection and minor changes
|
| | | | | | | | | | |
|
| | |\ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
|
| | | | | | | | | | | | | | |
|