| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-04-13 | 2 | -1/+27 |
|\ |
|
| * | 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 | 2 | -4/+19 |
| * | query to find un-grouped contacts | friendica | 2012-04-12 | 1 | -1/+12 |
* | | move html out of lang_selector() and new template lang_selector.tpl | Fabio Comuni | 2012-04-13 | 1 | -9/+16 |
* | | validate_url allow naked subdomain if is "localhost" | Fabio Comuni | 2012-04-13 | 1 | -3/+4 |
|/ |
|
* | reverting recent db driver changes - won't install cleanly, won't update clea... | friendica | 2012-04-12 | 1 | -274/+186 |
* | table cleanup | friendica | 2012-04-12 | 2 | -0/+19 |
* | visit "random profile" feature | friendica | 2012-04-10 | 2 | -0/+10 |
* | cleanup photo menus | friendica | 2012-04-10 | 2 | -11/+11 |
* | more backend work on mail2 followers | friendica | 2012-04-10 | 1 | -0/+3 |
* | fix_mce_lf on profiles | friendica | 2012-04-10 | 1 | -0/+5 |
* | set default on get_avatar | friendica | 2012-04-10 | 1 | -1/+8 |
* | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull | friendica | 2012-04-10 | 2 | -13/+11 |
|\ |
|
| * | Remove Gravatar from core and add new hook avatar_lookup. | Klaus Weidenbach | 2012-04-09 | 1 | -8/+6 |
| * | Rename gravatar_img() more generic to avatar_img(). | Klaus Weidenbach | 2012-04-09 | 2 | -5/+5 |
* | | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-09 | 1 | -0/+10 |
|\| |
|
| * | more sane defaults datetime_convert | friendica | 2012-04-08 | 1 | -3/+6 |
| * | fix empty string timezone | friendica | 2012-04-08 | 1 | -0/+7 |
* | | fixed some typos | Alexander Kampmann | 2012-04-09 | 1 | -4/+4 |
* | | made exceptions from the db optional | Alexander Kampmann | 2012-04-09 | 1 | -2/+30 |
* | | added exceptions to dba class | Alexander Kampmann | 2012-04-09 | 1 | -188/+248 |
|/ |
|
* | API: API is now enhanced. mentions, repeat and destroy now works. | Michael Vogel | 2012-04-08 | 1 | -9/+142 |
* | Merge commit 'upstream/master' | Michael Vogel | 2012-04-07 | 50 | -2/+14 |
|\ |
|
| * | ignore utf8 offset error for unit tests | friendica | 2012-04-07 | 1 | -1/+3 |
| * | some work on tests | friendica | 2012-04-07 | 1 | -1/+1 |
| * | ignore removed plugins | friendica | 2012-04-06 | 1 | -2/+9 |
| * | fix messed up config tables w/ duplicate entries | friendica | 2012-04-06 | 1 | -1/+1 |
| * | revert config changes, we're getting duplicate keys | friendica | 2012-04-06 | 1 | -151/+147 |
| * | Merge branch 'pull' | friendica | 2012-04-05 | 50 | -147/+151 |
| |\ |
|
| | * | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 55 | -150/+837 |
| | |\ |
|
| | * | | added index to config and pconfig table | Alexander Kampmann | 2012-04-05 | 1 | -152/+154 |
| * | | | pass autoname(0) test | friendica | 2012-04-05 | 1 | -0/+3 |
| | |/
| |/| |
|
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-06 | 5 | -0/+82 |
|\| | |
|
| * | | also block outbound | friendica | 2012-04-04 | 1 | -0/+5 |
| * | | log disabled requests | friendica | 2012-04-04 | 1 | -2/+6 |
| * | | fix config storage of booleans | friendica | 2012-04-04 | 1 | -0/+1 |
| * | | bug: diaspora_enabled setting turns it on but doesn't fully turn it off. | friendica | 2012-04-04 | 1 | -0/+8 |
| * | | make contact ssl_policy change a function since it is used in a few places | friendica | 2012-04-02 | 3 | -86/+50 |
| * | | more ssl policy fixes and prevent delivery to soapbox when using local delivery | friendica | 2012-04-02 | 2 | -0/+100 |
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-02 | 5 | -2/+162 |
|\| | |
|
| * | | remove zrl from query string | friendica | 2012-04-02 | 1 | -0/+3 |
| * | | catch a couple more Oo smilies | friendica | 2012-04-01 | 1 | -0/+4 |
| * | | add title to D* posts | friendica | 2012-04-01 | 1 | -1/+5 |
| * | | allow users to set categories on their posts | Michael Johnston | 2012-04-01 | 3 | -0/+142 |
| * | | slight improvement in handling of plaintext feeds | friendica | 2012-04-01 | 1 | -2/+9 |
| * | | that didn't quite work out | friendica | 2012-04-01 | 1 | -2/+2 |
* | | | New script that checks if a script is running | Michael Vogel | 2012-04-01 | 1 | -0/+32 |
* | | | poller: An optional lockfile is used to check if the poller is already running | Michael Vogel | 2012-04-01 | 1 | -0/+10 |
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-01 | 13 | -44/+174 |
|\| | |
|