aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1511-22/+75
|\ | | | | | | | | | | | | | | | | * remotes/upstream/master: more recycle fixes for plaintext fix recycle symbol when using plaintext editor add links to wall, photos, events, etc to aside on networkpage, fixes in css * master:
| * more recycle fixes for plaintextfriendica2012-03-151-1/+1
| |
| * fix recycle symbol when using plaintext editorfriendica2012-03-151-1/+1
| |
| * Merge branch 'pull'friendica2012-03-1510-21/+74
| |\
| | * Merge https://github.com/friendica/friendica into pullfriendica2012-03-1510-21/+74
| | |\
| | | * add links to wall, photos, events, etc to aside on networkpage, fixes in csstommy tomson2012-03-1510-21/+74
| | | |
* | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1537-300/+1266
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts roll protocol version due to ssl_policy settings force login to ssl on SSL_POLICY_SELFSIGN basic ssl_policy for important modules ssl_policy stuff revup splitted tests into several files removed done TODO get_tags tests corrected. They test for the right things now. addon settings form error more work on filer, comment level and file tag removal added slack-NS, non-scrolly, slackr-based theme. get tags test improved splitted test cases. changed a test string added some tests added library and include to .htaccess excludes reports from git better tests added test blueprints, fixed? encoding issues * master:
| * | | don't allow multiple friends with http/https same person, don't show mail2 ↵friendica2012-03-141-3/+18
| | | | | | | | | | | | | | | | coming soon unless person is allowed to have email contacts
| * | | roll protocol version due to ssl_policy settingsfriendica2012-03-141-1/+1
| | | |
| * | | force login to ssl on SSL_POLICY_SELFSIGNfriendica2012-03-143-9/+13
| | | |
| * | | basic ssl_policy for important modulesfriendica2012-03-1411-130/+140
| | | |
| * | | ssl_policy stufffriendica2012-03-145-11/+103
| | | |
| * | | revupfriendica2012-03-141-1/+1
| |/ /
| * | Merge pull request #132 from campino/masterfriendica2012-03-1411-119/+828
| |\ \ | | | | | | | | Test cases
| | * \ Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-1481-708/+7818
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: view/de/strings.php
| | * | | splitted tests into several filesAlexander Kampmann2012-03-144-146/+269
| | | | |
| | * | | removed done TODOAlexander Kampmann2012-03-141-2/+1
| | | | |
| | * | | get_tags tests corrected. They test for the right things now. Alexander Kampmann2012-03-142-61/+195
| | | | |
| | * | | get tags test improvedAlexander Kampmann2012-03-122-27/+92
| | | | |
| | * | | 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 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
| * | | | | | | | | | | addon settings form errorfriendica2012-03-132-2/+2
| |/ / / / / / / / / /
| * | | / / / / / / / more work on filer, comment level and file tag removalfriendica2012-03-137-24/+58
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-140-0/+0
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix in nav add links to home, profile, photos, events, notes to aside in network-stream * master:
* | | | | | | | | 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>
| * | | | | | | 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:
| | * | | | | | 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
| | |\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 09:30:48 +0000