Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-09 | 140 | -1755/+2353 |
|\ | |||||
| * | doco correction | friendica | 2014-09-09 | 1 | -11/+5 |
| | | |||||
| * | syntax error in dba driver, document z_post_url | friendica | 2014-09-09 | 2 | -0/+30 |
| | | |||||
| * | if we have php54 don't log the whole damn stack on a db error, just the ↵ | friendica | 2014-09-09 | 1 | -2/+5 |
| | | | | | | | | current frame | ||||
| * | d* friending vsprintf error | friendica | 2014-09-09 | 3 | -3/+5 |
| | | |||||
| * | heavy lifting on diaspora likes. Still needs much more work - especially as ↵ | friendica | 2014-09-08 | 1 | -67/+56 |
| | | | | | | | | we're ignoring signatures at this time | ||||
| * | prevent red#matrix smilie replacements from tripping over each other. | friendica | 2014-09-08 | 1 | -2/+3 |
| | | |||||
| * | diaspora_like - sql error | friendica | 2014-09-08 | 1 | -22/+15 |
| | | |||||
| * | one more time | friendica | 2014-09-08 | 1 | -2/+3 |
| | | |||||
| * | missed one | friendica | 2014-09-08 | 1 | -2/+5 |
| | | |||||
| * | This is long overdue - use a symblic constant NULL_DATE instead of the ↵ | friendica | 2014-09-08 | 22 | -46/+47 |
| | | | | | | | | easily mis-typed sequence '0000-00-00 00:00:00' | ||||
| * | attempt to format diaspora reshares correctly. This might be an iterative ↵ | friendica | 2014-09-08 | 1 | -24/+21 |
| | | | | | | | | process. | ||||
| * | wrap photo albums (albums and top level) in a div id=photo-album-contents | friendica | 2014-09-08 | 2 | -2/+5 |
| | | |||||
| * | import_profile_photo array warnings | friendica | 2014-09-08 | 2 | -3/+3 |
| | | |||||
| * | add categories to events | friendica | 2014-09-07 | 4 | -4/+89 |
| | | |||||
| * | set the default items-per-page for the entire app to 60 | friendica | 2014-09-07 | 1 | -1/+1 |
| | | |||||
| * | for webpages, hide the mimetype selector unless in advanced mode. For pages ↵ | friendica | 2014-09-07 | 4 | -9/+14 |
| | | | | | | | | that endless scroll and show blocky-block things, set the default items-per-page to 60. Why? It fits column-widths of 2,3,4,5,6,10,12,15, and 20 without leaving remaindered items dangling at the end. No other setting less than 100 has this much versatility. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-07 | 3 | -5/+14 |
| |\ | |||||
| | * | Added abook-changed background colour to dark schema | Jeroen | 2014-09-07 | 3 | -5/+14 |
| | | | |||||
| * | | Diaspora actually puts the account full name into the "nickname" field of ↵ | friendica | 2014-09-07 | 2 | -2/+2 |
| |/ | | | | | | | the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important. | ||||
| * | support the recent (2 years ago) changes to diaspora photo embeds | friendica | 2014-09-06 | 1 | -0/+6 |
| | | |||||
| * | hook photos scroll to page down | friendica | 2014-09-06 | 1 | -1/+1 |
| | | |||||
| * | extra_query_args() restricted to $_GET only. $_REQUEST was adding cookies ↵ | friendica | 2014-09-06 | 1 | -4/+5 |
| | | | | | | | | and this is undesired and potentially a security issue. | ||||
| * | and more ajax work | friendica | 2014-09-06 | 2 | -3/+3 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-06 | 3 | -2/+7 |
| |\ | |||||
| | * | Fix directory for NOT endless scroll. Dunno what's wrong with endless | Thomas Willingham | 2014-09-06 | 1 | -2/+3 |
| | | | | | | | | | | | | scroll, sorry. | ||||
| | * | Merge pull request #579 from encyclomundi/master | Thomas Willingham | 2014-09-06 | 2 | -0/+4 |
| | |\ | | | | | | | | | adding a bug report app | ||||
| | | * | adding a bug report app | Charles | 2014-09-05 | 2 | -0/+4 |
| | |/ | |||||
| * / | ajax work | friendica | 2014-09-06 | 8 | -16/+113 |
| |/ | |||||
| * | illegal string offset warnings | friendica | 2014-09-05 | 1 | -1/+1 |
| | | |||||
| * | more work on the event edit form | friendica | 2014-09-05 | 2 | -4/+18 |
| | | |||||
| * | doc updates | friendica | 2014-09-05 | 77 | -1045/+1331 |
| | | |||||
| * | improved logging if you're using php54 or later | friendica | 2014-09-04 | 1 | -2/+8 |
| | | |||||
| * | issue #451 - clear gid and cid from network tab if discover is selected | friendica | 2014-09-04 | 1 | -7/+7 |
| | | |||||
| * | put a date and time picker on events | friendica | 2014-09-04 | 2 | -6/+116 |
| | | |||||
| * | bb2diaspora_itembody - empty body, that explains a lot | friendica | 2014-09-04 | 1 | -0/+2 |
| | | |||||
| * | this improves the photos even more | friendica | 2014-09-04 | 1 | -3/+3 |
| | | |||||
| * | fix the client side of poco | friendica | 2014-09-04 | 1 | -11/+20 |
| | | |||||
| * | fix poco network | friendica | 2014-09-04 | 1 | -1/+4 |
| | | |||||
| * | import_author_rss not succeeding, missing url | friendica | 2014-09-04 | 1 | -4/+5 |
| | | |||||
| * | unset item_nocomment when starting a new delivery chain | friendica | 2014-09-04 | 1 | -1/+8 |
| | | |||||
| * | oops forgot about the privacy exclusion | friendica | 2014-09-04 | 1 | -4/+5 |
| | | |||||
| * | constrain photos to a fixed block regardless of aspect ratio | friendica | 2014-09-04 | 1 | -1/+23 |
| | | |||||
| * | allow feeds to be sourced | friendica | 2014-09-04 | 1 | -1/+1 |
| | | |||||
| * | realm detection logic reversed | friendica | 2014-09-04 | 1 | -1/+1 |
| | | |||||
| * | allow stuff with Diaspora authors to federate in zot conversations even if ↵ | friendica | 2014-09-04 | 4 | -2/+25 |
| | | | | | | | | the local site has diaspora disabled. This way it won't look like folks are talking to themselves. | ||||
| * | update docs as D* members should now be able to participate in redmatrix ↵ | friendica | 2014-09-03 | 1 | -2/+2 |
| | | | | | | | | forums. They will need to plus-tag the forum. There may still be minor issues, but nothing fundamentally at odds with this working. | ||||
| * | remove feed items from ACL selector - there's nothing we can do with them ↵ | friendica | 2014-09-03 | 1 | -0/+5 |
| | | | | | | | | and if we were to try we'd have to binary pack all the hashes | ||||
| * | sort out some of the bb2d madness | friendica | 2014-09-03 | 2 | -70/+27 |
| | | |||||
| * | this is turning into a wretched mess. It's going to get worse before it gets ↵ | friendica | 2014-09-03 | 2 | -200/+99 |
| | | | | | | | | better, but I'm trying to do this incrementally so I don't break the whole shebang for a few days. It will get better once all the bbcode translation is done in a single place (cross fingers), and we can just sign the post once when we submit it and be done with it. If Diaspora ever implements editing of existing posts we'll have to go back and do the whole wretched mess over again. |