aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * quattro: move center css to style.php. add tpl for generic_links_widgetFabio Comuni2012-04-123-21/+26
| | | * settings: move tabs to aside. add a new template "generic_links_widget.tpl"Fabio Comuni2012-04-128-57/+53
| | |/
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-04-122-6/+6
| |\|
| | * Merge pull request #227 from simonlnu/masterSimon2012-04-112-6/+6
| | |\
| | | * fix the icons a bitSimon L'nu2012-04-122-6/+6
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-120-0/+0
| | |/
| * | turn off update transactions until we figure out how to do them safely.friendica2012-04-121-23/+23
| * | table cleanupfriendica2012-04-122-0/+19
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-04-114-11/+11
| |\|
| * | extensible item_id table for managing all the different message-ids generated...friendica2012-04-114-421/+494
* | | DBA: Deactivation of the mysqli-class for testing purposes.Michael Vogel2012-04-131-30/+31
* | | Merge commit 'upstream/master'Michael Vogel2012-04-11133-1946/+2921
|\ \ \ | | |/ | |/|
| * | diabook-themes: small fixtommy tomson2012-04-114-11/+11
| |/
| * Merge pull request #226 from simonlnu/masterSimon2012-04-104-71/+108
| |\
| | * major refactor. step 1Simon L'nu2012-04-114-71/+108
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-110-0/+0
| |/
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-1010-34/+38
| |\
| | * Merge pull request #225 from simonlnu/masterSimon2012-04-1010-34/+38
| | |\
| | | * more ' = ' spacing fixesSimon L'nu2012-04-106-17/+17
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+4
| | | |\ | | | |/ | | |/|
| | | * [fix] absolute links in docs and newmember.php; breaks sub-dir installsSimon L'nu2012-04-108-25/+29
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-100-0/+0
| * | | visit "random profile" featurefriendica2012-04-105-1/+22
| |/ /
| * / profile redir - goto correct profile page even if contact blocked, you just c...friendica2012-04-101-2/+4
| |/
| * cleanup photo menusfriendica2012-04-102-11/+11
| * more backend work on mail2 followersfriendica2012-04-102-9/+57
| * make editplain work everywherefriendica2012-04-105-9/+25
| * move all fix_mce to one function so it can easily be undonefriendica2012-04-102-4/+2
| * duplicate community postsfriendica2012-04-101-4/+4
| * fix_mce_lf contact edit pagefriendica2012-04-101-1/+1
| * fix_mce_lf on profilesfriendica2012-04-102-10/+16
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-1034-278/+352
| |\
| | * Merge pull request #222 from CatoTH/masterfriendica2012-04-102-2/+2
| | |\
| | | * Incorrect tranlation (one negation too much)Tobias Hößl2012-04-102-2/+2
| | * | Merge pull request #223 from campino/masterfriendica2012-04-101-3/+2
| | |\ \ | | | |/ | | |/|
| | | * fixed install bugAlexander Kampmann2012-04-101-3/+2
| | * | diabook-themes: smal fix in bbcode-jstommy tomson2012-04-104-1/+25
| | * | diabook-themes: added url and quote to bbcode toolbar under comment boxtommy tomson2012-04-1016-4/+45
| | * | Merge pull request #221 from simonlnu/masterSimon2012-04-1011-268/+278
| | |\ \
| | | * | aaah, nice asides ;). we'll be updating these soonSimon L'nu2012-04-1011-268/+278
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+2
| | | |\ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-106-1067/+1227
| | | |\ \
| | | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0970-415/+947
| | | |\ \ \
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-080-0/+0
| * | | | | | set default on get_avatarfriendica2012-04-101-1/+8
| * | | | | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pullfriendica2012-04-107-40/+24
| |\ \ \ \ \ \
| | * | | | | | Remove Gravatar from core and add new hook avatar_lookup.Klaus Weidenbach2012-04-096-34/+18
| | * | | | | | Rename gravatar_img() more generic to avatar_img().Klaus Weidenbach2012-04-093-7/+7
| * | | | | | | rev updatefriendica2012-04-102-42/+101
| | |/ / / / / | |/| | | | |
| * | | | | | path to default.php in theme dir was incorrectfriendica2012-04-101-2/+2
| | |_|_|/ / | |/| | | |