aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #233 from simonlnu/masterSimon2012-04-131-1/+1
|\
| * lighten wrapper shadow a bit on dispySimon L'nu2012-04-131-1/+1
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-130-0/+0
|/
* Merge pull request #232 from simonlnu/masterSimon2012-04-1314-22/+128
|\
| * neat little changes. hopefully the shadow will be well recievedSimon L'nu2012-04-1314-22/+128
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-1374-830/+2077
| |\ | |/ |/|
* | well that was a silly mistake...friendica2012-04-132-3/+3
* | setting wasn't being appliedfriendica2012-04-131-2/+2
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-1348-115/+1085
|\ \
| * | diabook-themes: theme-settings: users can set font-size and line-height for p...tommy tomson2012-04-1322-31/+628
| * | Merge pull request #231 from tomtom84/mastertomtom842012-04-137-10/+209
| |\ \
| | * | diabook: theme-settings: users can set font-size and line-height for posts an...tommy tomson2012-04-137-10/+209
| |/ /
| * | diabook-themes: small fixestommy tomson2012-04-1328-75/+249
* | | rev updatefriendica2012-04-132-511/+579
|/ /
* | Merge pull request #230 from fabrixxm/masterfriendica2012-04-1322-201/+410
|\ \
| * \ Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-04-1372-10973/+989
| |\ \ | |/ / |/| |
| * | quattro: language icon in navbarFabio Comuni2012-04-137-6/+44
| * | move html out of lang_selector() and new template lang_selector.tplFabio Comuni2012-04-132-9/+26
| * | display settings: show theme screenshot on page loadFabio Comuni2012-04-131-1/+1
| * | quattro: add admin theme settigs. darker items background with a bottom border.Fabio Comuni2012-04-138-126/+79
| * | admin: change global theme settingsFabio Comuni2012-04-133-10/+74
| * | quattro: work onFabio Comuni2012-04-139-52/+188
| * | validate_url allow naked subdomain if is "localhost"Fabio Comuni2012-04-131-3/+4
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-130-0/+0
| |/ |/|
* | 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