| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-29 | 8 | -35/+115 |
| |\ | | | | | | | | | | | | | | | | | * remotes/upstream/master: yet more work on notifications notification enhancements better handling of multiple notifications for same item, and old notifications * master: | ||||
| | * | yet more work on notifications | friendica | 2012-02-29 | 3 | -29/+54 |
| | | | |||||
| | * | notification enhancements | friendica | 2012-02-29 | 5 | -7/+43 |
| | | | |||||
| | * | better handling of multiple notifications for same item, and old notifications | friendica | 2012-02-29 | 3 | -5/+24 |
| | | | |||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-29 | 8 | -10/+24 |
| |\| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Update LICENSE Update README cleaned up mess created when both people request friendship and one approves as duplex call time pass by reference deprecated From Tobias H - catch some irregularities caused by cut/paste code * master: | ||||
| | * | Update LICENSE | friendica | 2012-02-29 | 1 | -1/+1 |
| | | | |||||
| | * | Update README | friendica | 2012-02-29 | 1 | -0/+4 |
| | | | |||||
| | * | cleaned up mess created when both people request friendship and one approves ↵ | friendica | 2012-02-28 | 1 | -1/+11 |
| | | | | | | | | | as duplex | ||||
| | * | call time pass by reference deprecated | friendica | 2012-02-28 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'pull' | friendica | 2012-02-28 | 1 | -1/+2 |
| | |\ | |||||
| | * | | From Tobias H - catch some irregularities caused by cut/paste code | friendica | 2012-02-28 | 4 | -7/+7 |
| | | | | |||||
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-28 | 1 | -1/+2 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | * remotes/upstream/master: fix url and network display * master: | ||||
| | * | | fix url and network display | fabrixxm | 2012-02-28 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-28 | 6 | -55/+14 |
| |\| | | | | | | | | | | | | | | | * remotes/upstream/master: update globaldir when page-type changes, add spam date field clicking contact on contacts page broken link * master: | ||||
| | * | update globaldir when page-type changes, add spam date field | friendica | 2012-02-27 | 5 | -55/+13 |
| | | | |||||
| | * | clicking contact on contacts page broken link | friendica | 2012-02-27 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 2 | -9/+18 |
| |\| | | | | | | | | | | | | | * remotes/upstream/master: cleanup notify subject lines * master: | ||||
| | * | Merge branch 'pull' | friendica | 2012-02-27 | 4 | -10/+12 |
| | |\ | |||||
| | * | | cleanup notify subject lines | friendica | 2012-02-27 | 2 | -9/+18 |
| | | | | |||||
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 3 | -7/+9 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | * remotes/upstream/master: revert 01a2791e3a to avoid random preg internal errors. fix contact_template * master: | ||||
| | * | | Merge pull request #53 from fabrixxm/master | fabrixxm | 2012-02-27 | 3 | -7/+9 |
| | |\ \ | | | | | | | | | remove template filters support | ||||
| | | * | | revert 01a2791e3a to avoid random preg internal errors. fix contact_template | Fabio Comuni | 2012-02-27 | 3 | -7/+9 |
| | |/ / | |||||
| * / / | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 0 | -0/+0 |
| |/ / | | | | | | | | | | | | | | | * remotes/upstream/master: fixed syntax errors add plugin hooks to enotify * master: | ||||
| * | | Merge pull request #52 from campino/master | Simon | 2012-02-27 | 1 | -3/+3 |
| |\ \ | |/ |/| | Corrected syntax error | ||||
| | * | fixed syntax errors | Alexander Kampmann | 2012-02-27 | 1 | -3/+3 |
| | | | |||||
| * | | add plugin hooks to enotify | friendica | 2012-02-26 | 4 | -45/+83 |
| | | | |||||
| * | | Merge pull request #51 from simonlnu/master | Simon | 2012-02-26 | 2 | -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'nu | 2012-02-27 | 2 | -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'nu | 2012-02-27 | 0 | -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 db | friendica | 2012-02-26 | 3 | -2/+29 |
| | | | |||||
| * | | fix tag icon size | friendica | 2012-02-26 | 1 | -0/+0 |
| | | | |||||
| * | | typo in css | friendica | 2012-02-26 | 1 | -1/+1 |
| | | | |||||
| * | | tagging missing from wallwall and a couple of themes, star missing from dispy | friendica | 2012-02-26 | 13 | -2/+37 |
| | | | |||||
| * | | Merge pull request #50 from annando/master | friendica | 2012-02-26 | 21 | -474/+1238 |
| |\ \ | | | | | | | massive changes in mail and design updates in "vier" | ||||
| | * | | Mail: New options for actions after importing mails. | Michael | 2012-02-26 | 7 | -41/+84 |
| | | | | |||||
| | * | | Merge remote branch 'upstream/master' | Michael | 2012-02-26 | 48 | -1659/+3227 |
| | |\ \ | |||||
| | * | | | "Vier-Theme" Some more design stuff. | Michael | 2012-02-26 | 4 | -336/+315 |
| | | | | | |||||
| | * | | | poller.php: Test for moving to archive, vier-style: notifications fixed | Michael | 2012-02-25 | 2 | -4/+33 |
| | | | | | |||||
| | * | | | "vier" popup menu looks nicer now (more like quattro again) | Michael | 2012-02-25 | 1 | -6/+14 |
| | | | | | |||||
| | * | | | "vier": The contacts are now working again. Line break before closing ↵ | Michael | 2012-02-25 | 5 | -22/+289 |
| | | | | | | | | | | | | | | | | | bbcodes removed. | ||||
| | * | | | 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 ↵ | Michael | 2012-02-24 | 7 | -23/+411 |
| | | | | | | | | | | | | | | | | | the moment). Sending mail as text mail. Encoding name when importing mail contact. | ||||
| | * | | | GIT problems ... | Michael | 2012-02-23 | 1 | -8/+1 |
| | | | | | |||||
| | * | | | Merge remote branch 'upstream/master' | Michael | 2012-02-23 | 67 | -286/+871 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bbcode.php | ||||
| | * | | | | bbcode.php: A list or quote at the beginning wasn't detected | Michael | 2012-02-23 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #49 from CatoTH/master | friendica | 2012-02-26 | 10 | -23/+29 |
| |\ \ \ \ \ | | | | | | | | | | | | | Bugfix for del_config | ||||
| | * | | | | | Avoid some notices | Tobias Hößl | 2012-02-26 | 3 | -11/+12 |
| | | | | | | | |||||
| | * | | | | | Bugfix | Tobias Hößl | 2012-02-26 | 1 | -1/+1 |
| | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |