aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | splitted test cases.Alexander Kampmann2012-03-093-192/+255
| | | | | | | | | | |
| * | | | | | | | | | changed a test stringAlexander Kampmann2012-03-091-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-09102-224/+11487
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | added some testsAlexander Kampmann2012-03-093-44/+102
| | | | | | | | | | | |
| * | | | | | | | | | | added library and include to .htaccessAlexander Kampmann2012-03-081-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | excludes reports from gitAlexander Kampmann2012-03-081-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | better testsAlexander Kampmann2012-03-083-144/+265
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0759-661/+1213
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ mergedAlexander Kampmann2012-03-07112-2723/+7901
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | added test blueprints, fixed? encoding issuesAlexander Kampmann2012-03-052-10/+150
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #133 from tonybaldwin/masterfriendica2012-03-142-0/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slack-NS
| * | | | | | | | | | | | | | added slack-NS, non-scrolly, slackr-based theme.Tony Baldwin2012-03-132-0/+102
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'pull'friendica2012-03-148-8/+190
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge https://github.com/friendica/friendica into pullfriendica2012-03-148-8/+190
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge pull request #134 from simonlnu/masterSimon2012-03-1454-321/+740
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
| | | * | | | | | | | | | | | | PHP Fatal error: Call-time pass-by-reference has been removed in ↵Simon L'nu2012-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod/item.php on line 630 Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | | | | | | | | | | | fix in navtommy tomson2012-03-141-4/+0
| | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | add links to home, profile, photos, events, notes to aside in network-streamtommy tomson2012-03-146-3/+189
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'pull'friendica2012-03-139-128/+247
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #131 from simonlnu/masterSimon2012-03-139-128/+247
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | massive work done to both dispys, mostly -dark
| | * | | | | | | | | | | | | massive work done to both dispys, mostly -darkSimon L'nu2012-03-149-128/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1336-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'nu2012-03-131-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'nu2012-03-1358-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'nu2012-03-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add lightbox, fixex in css more save to file backend backend for "save to file" feature * master:
* | | | | | | | | | | | | | | | | addon settings form errorfriendica2012-03-132-2/+2
|/ / / / / / / / / / / / / / / /
* | | | / / / / / / / / / / / / more work on filer, comment level and file tag removalfriendica2012-03-137-24/+58
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | sort inbox by recently replied conversations firstfriendica2012-03-131-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | file as widget and basic filing implementation for duepuntozero,slackrfriendica2012-03-1311-4/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently
* | | | | | | | | | | | | | | Merge branch 'pull'friendica2012-03-131-122/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #130 from CatoTH/masterfriendica2012-03-131-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ößl2012-03-131-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/friendicaTobias Hößl2012-03-1328-51/+319
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | / | | | | | | | | | | | | | don't count self in number of contatcsfriendica2012-03-131-4/+2
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'pull'friendica2012-03-1323-59/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Merge pull request #129 from CatoTH/masterfriendica2012-03-1323-59/+163
| |\| | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | CSRF-Protection and minor changes
| | * | | | | | | | | | | | | | Some security against XSRF-attacksTobias Hößl2012-03-1213-39/+132
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-1212-157/+255
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-112-7/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-1162-559/+7162
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-09252-3416/+20704
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a ↵Tobias Hößl2012-03-031-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.phpTobias Hößl2012-02-284-11/+19
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge remote branch 'upstream/master'Tobias Hößl2012-02-2857-1256/+2380
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Avoid noticesTobias Hößl2012-02-282-2/+2
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | contact.network is used later to check if a direct link or a redirect by ↵Tobias Hößl2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /redir/contactid should be used
| | * | | | | | | | | | | | | | | | | wasn't actually changed beforeTobias Hößl2012-02-281-2/+2
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Avoid a noticeTobias Hößl2012-02-281-0/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+3
| | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 05:59:13 +0000