aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | stray debug statements, forgot to filter pending contactsfriendica2012-04-121-5/+5
* | bug #369 - show contacts who are not in any groupsfriendica2012-04-125-4/+101
* | extended the "interesting" profile attributesfriendica2012-04-121-1/+8
* | send link directly to profile tabfriendica2012-04-121-3/+3
* | stray log statementsfriendica2012-04-121-2/+0
* | profile change activitiesfriendica2012-04-124-7/+104
* | allow setting default new friend notifyfriendica2012-04-123-2/+17
* | turn off new friend activity by defaultfriendica2012-04-121-1/+1
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-1261-10753/+560
|\ \
| * | diabook-themes: fixed css for settings aside-linkstommy tomson2012-04-1220-10546/+194
| * | diabook-themes: css-fixes in asidetommy tomson2012-04-1234-140/+261
| * | Merge pull request #229 from tomtom84/mastertomtom842012-04-1212-68/+106
| |\ \
| | * | fix css in asidetommy tomson2012-04-1212-68/+106
| |/ /
* / / rev updatefriendica2012-04-122-214/+198
|/ /
* / query to find un-grouped contactsfriendica2012-04-121-1/+12
|/
* reverting recent db driver changes - won't install cleanly, won't update clea...friendica2012-04-123-736/+825
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-1217-130/+143
|\
| * Merge pull request #228 from fabrixxm/masterfriendica2012-04-1217-130/+143
| |\
| | * quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons i...Fabio Comuni2012-04-125-39/+54
| | * main.js: set notifications icon "on" with new unread notifcations. Show "Noth...Fabio Comuni2012-04-121-9/+10
| | * settings: remove call to profile_load()Fabio Comuni2012-04-121-4/+0
| | * 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
|\|
| * diabook-themes: small fixtommy tomson2012-04-114-11/+11
* | extensible item_id table for managing all the different message-ids generated...friendica2012-04-114-421/+494
|/
* 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