| Commit message (Expand) | Author | Age | Files | Lines |
* | bug in check for private email comment to public conversation prevents authen... | friendica | 2012-03-09 | 2 | -23/+9 |
* | keep tony from talking to himself | friendica | 2012-03-08 | 1 | -1/+1 |
* | still getting parent relays on remote systems | friendica | 2012-03-07 | 2 | -3/+3 |
* | revup | friendica | 2012-03-07 | 1 | -1/+1 |
* | fix photos after permissions_sql change | friendica | 2012-03-06 | 1 | -4/+76 |
* | Merge branch 'pull' | friendica | 2012-03-06 | 1 | -2/+2 |
|\ |
|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-06 | 1 | -2/+2 |
* | | [privacy] rework latest fix | friendica | 2012-03-06 | 1 | -1/+3 |
|/ |
|
* | Merge pull request #94 from beardy-unixer/master | Simon | 2012-03-06 | 1 | -1/+5 |
|\ |
|
| * | Fixed...merged with mainline THEN added beards. | Thomas | 2012-03-06 | 1 | -5/+36 |
| * | added beard smileys | Thomas | 2012-03-06 | 1 | -35/+8 |
* | | Merge pull request #99 from tomtom84/master | Simon | 2012-03-06 | 1 | -0/+3 |
|\ \ |
|
| * | | messages-menu translation, add scroll-to-top and theme-bug-report in theme | tommy tomson | 2012-03-07 | 1 | -0/+3 |
| |/ |
|
* / | bugs #312, #313 | friendica | 2012-03-06 | 1 | -1/+1 |
|/ |
|
* | remove "smilie" expansion for Diaspora logo | friendica | 2012-03-06 | 1 | -2/+2 |
* | prevent duplicate likes | friendica | 2012-03-06 | 1 | -0/+25 |
* | can_write_wall documentation | friendica | 2012-03-05 | 1 | -1/+6 |
* | correct owner info from misconfigured installs, duepuntozero title block misp... | friendica | 2012-03-04 | 1 | -0/+24 |
* | unused replacement variable displays %1 in all html2bbcode 'code' blocks | friendica | 2012-03-04 | 1 | -1/+1 |
* | template proc: fix variables regexp | Fabio Comuni | 2012-03-03 | 1 | -1/+10 |
* | template proc: allow isolation of var name between [ and ] | Fabio Comuni | 2012-03-02 | 1 | -2/+4 |
* | template proc: remove unused function and commented out code | Fabio Comuni | 2012-03-02 | 1 | -44/+1 |
* | template proc: first optimization | Fabio Comuni | 2012-03-02 | 2 | -10/+29 |
* | expand multiple heart smilies e.g. <3333 | friendica | 2012-03-02 | 1 | -0/+12 |
* | Merge pull request #55 from fabrixxm/master | fabrixxm | 2012-03-02 | 2 | -95/+112 |
|\ |
|
| * | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-03-01 | 3 | -27/+79 |
| |\ |
|
| * | | conversation: remove templating items in code and move it to template. | Fabio Comuni | 2012-03-01 | 1 | -94/+103 |
| * | | template proc: avoid a notice and allow template name to include to be passed... | Fabio Comuni | 2012-03-01 | 1 | -1/+9 |
* | | | Merge branch 'pull' | friendica | 2012-03-01 | 1 | -1/+6 |
|\ \ \ |
|
| * \ \ | Merge remote-tracking branch 'upstream/master' | Alexander Kampmann | 2012-03-01 | 20 | -251/+914 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Enabled automated doc building. Changes: | Alexander Kampmann | 2012-03-01 | 1 | -1/+6 |
* | | | | probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic conten... | friendica | 2012-03-01 | 1 | -0/+5 |
| |/ /
|/| | |
|
* | | | yet more work on notifications | friendica | 2012-02-29 | 3 | -29/+54 |
* | | | notification enhancements | friendica | 2012-02-29 | 1 | -3/+30 |
| |/
|/| |
|
* | | call time pass by reference deprecated | friendica | 2012-02-28 | 1 | -1/+1 |
* | | From Tobias H - catch some irregularities caused by cut/paste code | friendica | 2012-02-28 | 1 | -1/+1 |
* | | Merge branch 'pull' | friendica | 2012-02-27 | 1 | -3/+5 |
|\ \ |
|
| * | | revert 01a2791e3a to avoid random preg internal errors. fix contact_template | Fabio Comuni | 2012-02-27 | 1 | -3/+5 |
* | | | cleanup notify subject lines | friendica | 2012-02-27 | 1 | -8/+17 |
|/ / |
|
* | | add plugin hooks to enotify | friendica | 2012-02-26 | 1 | -42/+80 |
* | | tagging missing from wallwall and a couple of themes, star missing from dispy | friendica | 2012-02-26 | 1 | -2/+12 |
* | | Merge pull request #50 from annando/master | friendica | 2012-02-26 | 9 | -99/+573 |
|\ \ |
|
| * | | Mail: New options for actions after importing mails. | Michael | 2012-02-26 | 1 | -10/+36 |
| * | | Merge remote branch 'upstream/master' | Michael | 2012-02-26 | 8 | -64/+222 |
| |\ \ |
|
| * | | | poller.php: Test for moving to archive, vier-style: notifications fixed | Michael | 2012-02-25 | 1 | -1/+11 |
| * | | | "vier": The contacts are now working again. Line break before closing bbcodes... | Michael | 2012-02-25 | 1 | -2/+2 |
| * | | | Bug fixed where mails where nearly empty. HTML mails can now be received. | Michael | 2012-02-25 | 1 | -62/+78 |
| * | | | multipart messages complete, message-id conversion done. | Michael | 2012-02-25 | 4 | -20/+29 |
| * | | | Sending mail as multipart/alternative (html and plain text) (very basic by now) | Michael | 2012-02-24 | 3 | -27/+51 |
| * | | | Encoding for incoming mails. Fixed invalid message id (with side effect at th... | Michael | 2012-02-24 | 7 | -23/+411 |