aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lighten wrapper shadow a bit on dispySimon L'nu2012-04-131-1/+1
| | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-130-0/+0
| | | | | | * remotes/upstream/master: * master:
* Merge pull request #232 from simonlnu/masterSimon2012-04-1314-22/+128
|\ | | | | neat little changes. hopefully the shadow will be well recieved
| * neat little changes. hopefully the shadow will be well recievedSimon L'nu2012-04-1314-22/+128
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-1374-830/+2077
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: well that was a silly mistake... setting wasn't being applied rev update diabook-themes: theme-settings: users can set font-size and line-height for posts and comments diabook: theme-settings: users can set font-size and line-height for posts and comments diabook-themes: small fixes quattro: language icon in navbar move html out of lang_selector() and new template lang_selector.tpl display settings: show theme screenshot on page load quattro: add admin theme settigs. darker items background with a bottom border. admin: change global theme settings quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot validate_url allow naked subdomain if is "localhost" * master:
* | 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 ↵tommy tomson2012-04-1322-31/+628
| | | | | | | | | | | | posts and comments
| * | Merge pull request #231 from tomtom84/mastertomtom842012-04-137-10/+209
| |\ \ | | | | | | | | fixes in theme diabook
| | * | diabook: theme-settings: users can set font-size and line-height for posts ↵tommy tomson2012-04-137-10/+209
| |/ / | | | | | | | | | and comments
| * | 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
|\ \ | | | | | | some work, mainly on quattro
| * \ 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
| | | | | | | | | | | | | | | | | | | | | "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
| * | 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
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: (22 commits) stray debug statements, forgot to filter pending contacts bug #369 - show contacts who are not in any groups extended the "interesting" profile attributes send link directly to profile tab stray log statements profile change activities allow setting default new friend notify turn off new friend activity by default rev update diabook-themes: fixed css for settings aside-links diabook-themes: css-fixes in aside fix css in aside query to find un-grouped contacts reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem turn off update transactions until we figure out how to do them safely. table cleanup quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all settings: remove call to profile_load() quattro: move center css to style.php. add tpl for generic_links_widget ... * master:
* | 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
| |\ \ | | | | | | | | fixes in theme diabook
| | * | 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 ↵friendica2012-04-123-736/+825
| | | | cleanly, and leaks DB credentials over the web if there's a connection problem
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-1217-130/+143
|\
| * Merge pull request #228 from fabrixxm/masterfriendica2012-04-1217-130/+143
| |\ | | | | | | settings tabs, notifications js and quattro
| | * quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons ↵Fabio Comuni2012-04-125-39/+54
| | | | | | | | | | | | in a toolbar in notifications menu
| | * main.js: set notifications icon "on" with new unread notifcations. Show ↵Fabio Comuni2012-04-121-9/+10
| | | | | | | | | | | | "Nothing new here" with no notifications at all
| | * 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
| |\ | | | | | | minor css fixes
| | * fix the icons a bitSimon L'nu2012-04-122-6/+6
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-120-0/+0
| |/ | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: small fix * master: