| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-13 | 0 | -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 contacts | friendica | 2012-04-12 | 1 | -5/+5 |
| | | |||||
| * | bug #369 - show contacts who are not in any groups | friendica | 2012-04-12 | 5 | -4/+101 |
| | | |||||
| * | extended the "interesting" profile attributes | friendica | 2012-04-12 | 1 | -1/+8 |
| | | |||||
| * | send link directly to profile tab | friendica | 2012-04-12 | 1 | -3/+3 |
| | | |||||
| * | stray log statements | friendica | 2012-04-12 | 1 | -2/+0 |
| | | |||||
| * | profile change activities | friendica | 2012-04-12 | 4 | -7/+104 |
| | | |||||
| * | allow setting default new friend notify | friendica | 2012-04-12 | 3 | -2/+17 |
| | | |||||
| * | turn off new friend activity by default | friendica | 2012-04-12 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-12 | 61 | -10753/+560 |
| |\ | |||||
| | * | diabook-themes: fixed css for settings aside-links | tommy tomson | 2012-04-12 | 20 | -10546/+194 |
| | | | |||||
| | * | diabook-themes: css-fixes in aside | tommy tomson | 2012-04-12 | 34 | -140/+261 |
| | | | |||||
| | * | Merge pull request #229 from tomtom84/master | tomtom84 | 2012-04-12 | 12 | -68/+106 |
| | |\ | | | | | | | fixes in theme diabook | ||||
| | | * | fix css in aside | tommy tomson | 2012-04-12 | 12 | -68/+106 |
| | |/ | |||||
| * / | rev update | friendica | 2012-04-12 | 2 | -214/+198 |
| |/ | |||||
| * | query to find un-grouped contacts | friendica | 2012-04-12 | 1 | -1/+12 |
| | | |||||
| * | reverting recent db driver changes - won't install cleanly, won't update ↵ | friendica | 2012-04-12 | 3 | -736/+825 |
| | | | | | cleanly, and leaks DB credentials over the web if there's a connection problem | ||||
| * | 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 |
| | |\ | | | | | | | settings tabs, notifications js and quattro | ||||
| | | * | quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons ↵ | Fabio Comuni | 2012-04-12 | 5 | -39/+54 |
| | | | | | | | | | | | | | in a toolbar in notifications menu | ||||
| | | * | main.js: set notifications icon "on" with new unread notifcations. Show ↵ | Fabio Comuni | 2012-04-12 | 1 | -9/+10 |
| | | | | | | | | | | | | | "Nothing new here" with no notifications at all | ||||
| | | * | 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 |
| | |\ | | | | | | | minor css fixes | ||||
| | | * | fix the icons a bit | Simon L'nu | 2012-04-12 | 2 | -6/+6 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-12 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: small fix * master: | ||||
| * | | 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 ↵ | friendica | 2012-04-11 | 4 | -421/+494 |
| |/ | | | | generated by multiple services | ||||
| * | Merge pull request #226 from simonlnu/master | Simon | 2012-04-10 | 4 | -71/+108 |
| |\ | | | | | re-factor default.php | ||||
| | * | major refactor. step 1 | Simon L'nu | 2012-04-11 | 4 | -71/+108 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-11 | 0 | -0/+0 |
| |/ | | | | | | | * remotes/upstream/master: visit "random profile" feature * master: | ||||
| * | 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 |
| | |\ | | | | | | | [fixes] absolute links in docs and newmember.php; breaks sub-dir installs | ||||
| | | * | more ' = ' spacing fixes | Simon L'nu | 2012-04-10 | 6 | -17/+17 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+4 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | * remotes/upstream/master: profile redir - goto correct profile page even if contact blocked, you just can't do anything. * master: | ||||
| | | * | [fix] absolute links in docs and newmember.php; breaks sub-dir installs | Simon L'nu | 2012-04-10 | 8 | -25/+29 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: cleanup photo menus more backend work on mail2 followers make editplain work everywhere move all fix_mce to one function so it can easily be undone duplicate community posts fix_mce_lf contact edit page fix_mce_lf on profiles set default on get_avatar rev update Incorrect tranlation (one negation too much) fixed install bug diabook-themes: smal fix in bbcode-js diabook-themes: added url and quote to bbcode toolbar under comment box Remove Gravatar from core and add new hook avatar_lookup. Rename gravatar_img() more generic to avatar_img(). * master: | ||||
| * | | | visit "random profile" feature | friendica | 2012-04-10 | 5 | -1/+22 |
| |/ / | |||||
| * / | profile redir - goto correct profile page even if contact blocked, you just ↵ | friendica | 2012-04-10 | 1 | -2/+4 |
| |/ | | | | can't do anything. | ||||
| * | 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 |
| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |