aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * fix url and network displayfabrixxm2012-02-281-1/+2
| |
| * update globaldir when page-type changes, add spam date fieldfriendica2012-02-275-55/+13
| |
| * clicking contact on contacts page broken linkfriendica2012-02-271-0/+1
| |
| * Merge branch 'pull'friendica2012-02-274-10/+12
| |\
| | * Merge pull request #53 from fabrixxm/masterfabrixxm2012-02-273-7/+9
| | |\ | | | | | | | | remove template filters support
| | | * revert 01a2791e3a to avoid random preg internal errors. fix contact_templateFabio Comuni2012-02-273-7/+9
| | |/
| | * Merge pull request #52 from campino/masterSimon2012-02-271-3/+3
| | |\ | | | | | | | | Corrected syntax error
| | | * fixed syntax errorsAlexander Kampmann2012-02-271-3/+3
| | | |
| * | | cleanup notify subject linesfriendica2012-02-272-9/+18
| |/ /
| * | add plugin hooks to enotifyfriendica2012-02-264-45/+83
| | |
| * | Merge pull request #51 from simonlnu/masterSimon2012-02-262-3/+2
| |\ \ | | | | | | | | RFC, request for comments: about the https for html5shiv
| | * | minor typographical fixes. need to do something about the http on https ↵Simon L'nu2012-02-272-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | sites for html5shiv. changed to https on mine Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: (29 commits) spam db fix tag icon size typo in css tagging missing from wallwall and a couple of themes, star missing from dispy Mail: New options for actions after importing mails. relative link redirects Avoid some notices Bugfix is not always defined; but if defined, then always of type integer 1 Bugfix (missing $ character) and avoid some notices necessare fields not loaded from DB should probably be a->user['hidewall'] instead of profile['hidewall'] "Vier-Theme" Some more design stuff. some revision to the German strings German strings Wrong variable name show experimental and unsupported theme status on theme admin page jumping divs with no scrolling imrpove contrast on darkzero blockquotes darkzero-NS theme ... * master:
| * | spam dbfriendica2012-02-263-2/+29
| | |
| * | fix tag icon sizefriendica2012-02-261-0/+0
| | |
| * | typo in cssfriendica2012-02-261-1/+1
| | |
| * | tagging missing from wallwall and a couple of themes, star missing from dispyfriendica2012-02-2613-2/+37
| | |
| * | Merge pull request #50 from annando/masterfriendica2012-02-2621-474/+1238
| |\ \ | | | | | | | | massive changes in mail and design updates in "vier"
| | * | Mail: New options for actions after importing mails.Michael2012-02-267-41/+84
| | | |
| | * | Merge remote branch 'upstream/master'Michael2012-02-2648-1659/+3227
| | |\ \
| | * | | "Vier-Theme" Some more design stuff.Michael2012-02-264-336/+315
| | | | |
| | * | | poller.php: Test for moving to archive, vier-style: notifications fixedMichael2012-02-252-4/+33
| | | | |
| | * | | "vier" popup menu looks nicer now (more like quattro again)Michael2012-02-251-6/+14
| | | | |
| | * | | "vier": The contacts are now working again. Line break before closing ↵Michael2012-02-255-22/+289
| | | | | | | | | | | | | | | | | | | | bbcodes removed.
| | * | | Bug fixed where mails where nearly empty. HTML mails can now be received.Michael2012-02-251-62/+78
| | | | |
| | * | | multipart messages complete, message-id conversion done.Michael2012-02-254-20/+29
| | | | |
| | * | | Sending mail as multipart/alternative (html and plain text) (very basic by now)Michael2012-02-243-27/+51
| | | | |
| | * | | Encoding for incoming mails. Fixed invalid message id (with side effect at ↵Michael2012-02-247-23/+411
| | | | | | | | | | | | | | | | | | | | the moment). Sending mail as text mail. Encoding name when importing mail contact.
| | * | | GIT problems ...Michael2012-02-231-8/+1
| | | | |
| | * | | Merge remote branch 'upstream/master'Michael2012-02-2367-286/+871
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bbcode.php
| | * | | | bbcode.php: A list or quote at the beginning wasn't detectedMichael2012-02-231-3/+3
| | | | | |
| * | | | | Merge pull request #49 from CatoTH/masterfriendica2012-02-2610-23/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | Bugfix for del_config
| * \ \ \ \ \ Merge branch 'pull'friendica2012-02-262-645/+912
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | some revision to the German stringsTobias Diekershoff2012-02-262-18/+20
| | | | | | |
| | * | | | | German stringsTobias Diekershoff2012-02-262-630/+895
| | | | | | |
| * | | | | | relative link redirectsfriendica2012-02-263-13/+25
| |/ / / / /
| * | | | | show experimental and unsupported theme status on theme admin pagefriendica2012-02-2611-3/+14
| | | | | |
* | | | | | 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
| | | | | |
* | | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+1
| |/ / / / |/| | | |
* | | | | Avoid some noticesTobias Hößl2012-02-263-11/+12
| | | | |
* | | | | BugfixTobias Hößl2012-02-261-1/+1
| | | | |
* | | | | is not always defined; but if defined, then always of type integerTobias Hößl2012-02-261-1/+1
| | | | |