| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-14 | 47 | -338/+752 |
| |\ | |||||
| | * | Merge pull request #131 from simonlnu/master | Simon | 2012-03-13 | 9 | -128/+247 |
| | |\ | | | | | | | massive work done to both dispys, mostly -dark | ||||
| | | * | massive work done to both dispys, mostly -dark | Simon L'nu | 2012-03-14 | 9 | -128/+247 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-13 | 36 | -192/+426 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: | ||||
| | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-13 | 1 | -0/+27 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: | ||||
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-13 | 58 | -1496/+115 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: click anywhere to close notifications -> zeros and bubbles revup fix css use fancybox instead of lightbox fixes * master: | ||||
| | | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-12 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add lightbox, fixex in css more save to file backend backend for "save to file" feature * master: | ||||
| | * | | | | | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 7 | -24/+58 |
| | | |_|_|/ | |/| | | | |||||
| | * | | | | sort inbox by recently replied conversations first | friendica | 2012-03-13 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 11 | -4/+101 |
| | | | | | | | | | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently | ||||
| | * | | | | Merge branch 'pull' | friendica | 2012-03-13 | 1 | -122/+140 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge pull request #130 from CatoTH/master | friendica | 2012-03-13 | 1 | -122/+140 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | HTML2BBCode with [EMBED]: Compute in JS instead of PHP | ||||
| | | | * | | | | In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ↵ | Tobias Hößl | 2012-03-13 | 1 | -122/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | | * | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-13 | 28 | -51/+319 |
| | | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | * | | / | | | don't count self in number of contatcs | friendica | 2012-03-13 | 1 | -4/+2 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch 'pull' | friendica | 2012-03-13 | 23 | -59/+163 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Merge pull request #129 from CatoTH/master | friendica | 2012-03-13 | 23 | -59/+163 |
| | | |\| | | | | | | |/ / / | | |/| | | | CSRF-Protection and minor changes | ||||
| | | | * | | | Some security against XSRF-attacks | Tobias Hößl | 2012-03-12 | 13 | -39/+132 |
| | | | | | | | |||||
| | | | * | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-12 | 12 | -157/+255 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 2 | -7/+29 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 62 | -559/+7162 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 252 | -3416/+20704 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a ↵ | Tobias Hößl | 2012-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | Tobias Hößl | 2012-02-28 | 4 | -11/+19 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Merge remote branch 'upstream/master' | Tobias Hößl | 2012-02-28 | 57 | -1256/+2380 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Avoid notices | Tobias Hößl | 2012-02-28 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | contact.network is used later to check if a direct link or a redirect by ↵ | Tobias Hößl | 2012-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /redir/contactid should be used | ||||
| | | | * | | | | | | | | wasn't actually changed before | Tobias Hößl | 2012-02-28 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Avoid a notice | Tobias Hößl | 2012-02-28 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Avoid a Notice | Tobias Hößl | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | invite potential connectees to the free social web | friendica | 2012-03-13 | 4 | -2/+19 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | / | initial tag display for categories and save-to-file - suitable for testing ↵ | friendica | 2012-03-13 | 1 | -0/+27 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | but needs cleanup, links to delete term, and theming. | ||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-13 | 29 | -58/+379 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | click anywhere to close notifications -> zeros and bubbles | friendica | 2012-03-12 | 8 | -0/+39 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'pull' | friendica | 2012-03-12 | 18 | -50/+252 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge pull request #128 from tomtom84/master | tomtom84 | 2012-03-12 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates | ||||
| | | | * | | | | | | | | fix css | tommy tomson | 2012-03-13 | 1 | -1/+1 |
| | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Merge pull request #127 from tomtom84/master | tomtom84 | 2012-03-12 | 44 | -1490/+2 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates | ||||
| | | | * | | | | | | | | use fancybox instead of lightbox | tommy tomson | 2012-03-13 | 44 | -1490/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge pull request #126 from tomtom84/master | tomtom84 | 2012-03-12 | 6 | -4/+72 |
| | | |\| | | | | | | | | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | fixes in diabook-derivates | ||||
| | | | * | | | | | | | fixes | tommy tomson | 2012-03-12 | 6 | -4/+72 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge pull request #125 from tomtom84/master | tomtom84 | 2012-03-12 | 59 | -45/+1667 |
| | | |\| | | | | | | | | | |_|_|_|_|_|/ | | |/| | | | | | | fixes in diabook-derivates | ||||
| | | | * | | | | | | add lightbox, fixex in css | tommy tomson | 2012-03-12 | 59 | -45/+1667 |
| | | | | | | | | | | |||||
| | * | | | | | | | | revup | friendica | 2012-03-12 | 1 | -1/+1 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'pull' | friendica | 2012-03-12 | 1 | -17/+18 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | more save to file backend | friendica | 2012-03-11 | 1 | -1/+55 |
| | | | | | | | | | | |||||
| | * | | | | | | | | backend for "save to file" feature | friendica | 2012-03-11 | 2 | -7/+33 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-12 | 10 | -156/+196 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |