| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | reverting recent db driver changes - won't install cleanly, won't update clea... | friendica | 2012-04-12 | 3 | -736/+825 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-12 | 17 | -130/+143 |
|\ |
|
| * | Merge pull request #228 from fabrixxm/master | friendica | 2012-04-12 | 17 | -130/+143 |
| |\ |
|
| | * | quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons i... | Fabio Comuni | 2012-04-12 | 5 | -39/+54 |
| | * | main.js: set notifications icon "on" with new unread notifcations. Show "Noth... | Fabio Comuni | 2012-04-12 | 1 | -9/+10 |
| | * | settings: remove call to profile_load() | Fabio Comuni | 2012-04-12 | 1 | -4/+0 |
| | * | quattro: move center css to style.php. add tpl for generic_links_widget | Fabio Comuni | 2012-04-12 | 3 | -21/+26 |
| | * | settings: move tabs to aside. add a new template "generic_links_widget.tpl" | Fabio Comuni | 2012-04-12 | 8 | -57/+53 |
| |/ |
|
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-12 | 2 | -6/+6 |
|\| |
|
| * | Merge pull request #227 from simonlnu/master | Simon | 2012-04-11 | 2 | -6/+6 |
| |\ |
|
| | * | fix the icons a bit | Simon L'nu | 2012-04-12 | 2 | -6/+6 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-12 | 0 | -0/+0 |
| |/ |
|
* | | turn off update transactions until we figure out how to do them safely. | friendica | 2012-04-12 | 1 | -23/+23 |
* | | table cleanup | friendica | 2012-04-12 | 2 | -0/+19 |
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-11 | 4 | -11/+11 |
|\| |
|
| * | diabook-themes: small fix | tommy tomson | 2012-04-11 | 4 | -11/+11 |
* | | extensible item_id table for managing all the different message-ids generated... | friendica | 2012-04-11 | 4 | -421/+494 |
|/ |
|
* | Merge pull request #226 from simonlnu/master | Simon | 2012-04-10 | 4 | -71/+108 |
|\ |
|
| * | major refactor. step 1 | Simon L'nu | 2012-04-11 | 4 | -71/+108 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-11 | 0 | -0/+0 |
|/ |
|
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 10 | -34/+38 |
|\ |
|
| * | Merge pull request #225 from simonlnu/master | Simon | 2012-04-10 | 10 | -34/+38 |
| |\ |
|
| | * | more ' = ' spacing fixes | Simon L'nu | 2012-04-10 | 6 | -17/+17 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+4 |
| | |\
| | |/
| |/| |
|
| | * | [fix] absolute links in docs and newmember.php; breaks sub-dir installs | Simon L'nu | 2012-04-10 | 8 | -25/+29 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 0 | -0/+0 |
* | | | visit "random profile" feature | friendica | 2012-04-10 | 5 | -1/+22 |
|/ / |
|
* / | profile redir - goto correct profile page even if contact blocked, you just c... | friendica | 2012-04-10 | 1 | -2/+4 |
|/ |
|
* | cleanup photo menus | friendica | 2012-04-10 | 2 | -11/+11 |
* | more backend work on mail2 followers | friendica | 2012-04-10 | 2 | -9/+57 |
* | make editplain work everywhere | friendica | 2012-04-10 | 5 | -9/+25 |
* | move all fix_mce to one function so it can easily be undone | friendica | 2012-04-10 | 2 | -4/+2 |
* | duplicate community posts | friendica | 2012-04-10 | 1 | -4/+4 |
* | fix_mce_lf contact edit page | friendica | 2012-04-10 | 1 | -1/+1 |
* | fix_mce_lf on profiles | friendica | 2012-04-10 | 2 | -10/+16 |
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 34 | -278/+352 |
|\ |
|
| * | Merge pull request #222 from CatoTH/master | friendica | 2012-04-10 | 2 | -2/+2 |
| |\ |
|
| | * | Incorrect tranlation (one negation too much) | Tobias Hößl | 2012-04-10 | 2 | -2/+2 |
| * | | Merge pull request #223 from campino/master | friendica | 2012-04-10 | 1 | -3/+2 |
| |\ \
| | |/
| |/| |
|
| | * | fixed install bug | Alexander Kampmann | 2012-04-10 | 1 | -3/+2 |
| * | | diabook-themes: smal fix in bbcode-js | tommy tomson | 2012-04-10 | 4 | -1/+25 |
| * | | diabook-themes: added url and quote to bbcode toolbar under comment box | tommy tomson | 2012-04-10 | 16 | -4/+45 |
| * | | Merge pull request #221 from simonlnu/master | Simon | 2012-04-10 | 11 | -268/+278 |
| |\ \ |
|
| | * | | aaah, nice asides ;). we'll be updating these soon | Simon L'nu | 2012-04-10 | 11 | -268/+278 |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+2 |
| | |\ \
| | |/ /
| |/| | |
|
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 6 | -1067/+1227 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-09 | 70 | -415/+947 |
| | |\ \ \ |
|
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-08 | 0 | -0/+0 |
* | | | | | | set default on get_avatar | friendica | 2012-04-10 | 1 | -1/+8 |
* | | | | | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull | friendica | 2012-04-10 | 7 | -40/+24 |
|\ \ \ \ \ \ |
|