| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'upstream/master' | Michael | 2012-04-13 | 92 | -12077/+2089 |
| |\ | |||||
| | * | 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 |
| | |/ | |||||
| | * | 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 remote branch 'upstream/master' | Michael | 2012-04-11 | 133 | -1946/+2921 |
| |\| | |||||
| | * | 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 |
| | | | |||||
| | * | fix_mce_lf on profiles | friendica | 2012-04-10 | 2 | -10/+16 |
| | | | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 34 | -278/+352 |
| | |\ | |||||
| | | * | Merge pull request #222 from CatoTH/master | friendica | 2012-04-10 | 2 | -2/+2 |
| | | |\ | | | | | | | | | Translation bugfix | ||||
| | | | * | Incorrect tranlation (one negation too much) | Tobias Hößl | 2012-04-10 | 2 | -2/+2 |
| | | | | | |||||
| | | * | | Merge pull request #223 from campino/master | friendica | 2012-04-10 | 1 | -3/+2 |
| | | |\ \ | | | |/ | | |/| | bug fix | ||||
| | | | * | fixed install bug | Alexander Kampmann | 2012-04-10 | 1 | -3/+2 |
| | | | | | |||||
| | | * | | diabook-themes: smal fix in bbcode-js | tommy tomson | 2012-04-10 | 4 | -1/+25 |
| | | | | | |||||
| | | * | | diabook-themes: added url and quote to bbcode toolbar under comment box | tommy tomson | 2012-04-10 | 16 | -4/+45 |
| | | | | | |||||
| | | * | | Merge pull request #221 from simonlnu/master | Simon | 2012-04-10 | 11 | -268/+278 |
| | | |\ \ | | | | | | | | | | | aaah, nice asides ;). we'll be updating these soon | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |