Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 1 | -0/+4 | |
| |\ \ \ \ | ||||||
| * | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 1 | -4/+3 | |
| | | | | | | ||||||
| * | | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 1 | -1/+5 | |
| | | | | | | ||||||
| * | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 1 | -2/+6 | |
| | | | | | | ||||||
| * | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 1 | -0/+24 | |
| | | | | | | ||||||
* | | | | | | multiple acl work | Mario Vavti | 2016-08-03 | 1 | -0/+6 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | translate mime types to icons, update some icons, move file preview (upload ↵ | Mario Vavti | 2016-07-28 | 1 | -16/+17 | |
| |_|_|/ |/| | | | | | | | | | | | progress) below table header | |||||
* | | | | Merge branch 'dev' into perms | redmatrix | 2016-07-18 | 1 | -1/+1 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | do not transform hashes to tags in [code=xxx] or [code] blocks | Mario Vavti | 2016-07-18 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'dev' into perms | redmatrix | 2016-07-17 | 1 | -0/+4 | |
|\| | | ||||||
| * | | more ZAT work | redmatrix | 2016-07-14 | 1 | -0/+4 | |
| |/ | ||||||
* / | deprecate/remove json_decode_plus | redmatrix | 2016-07-13 | 1 | -12/+4 | |
|/ | ||||||
* | cleanup | redmatrix | 2016-07-05 | 1 | -2/+14 | |
| | ||||||
* | relocate the cache class | redmatrix | 2016-06-23 | 1 | -26/+2 | |
| | ||||||
* | the xchan_query wasn't fully optimised as we were comparing quoted and ↵ | redmatrix | 2016-06-22 | 1 | -4/+4 | |
| | | | | unquoted strings when looking for duplicates | |||||
* | make sure the optimisations are reliable | redmatrix | 2016-06-20 | 1 | -1/+1 | |
| | ||||||
* | code optimisation | redmatrix | 2016-06-20 | 1 | -1/+1 | |
| | ||||||
* | 1. string update, 2. pretty print json blobs | redmatrix | 2016-06-17 | 1 | -0/+6 | |
| | ||||||
* | code comments | redmatrix | 2016-06-15 | 1 | -0/+5 | |
| | ||||||
* | ignore case in language names and add 'js' as an alias for 'javascript' | redmatrix | 2016-06-15 | 1 | -1/+3 | |
| | ||||||
* | This was the reason for the large line widths - an extra linefeed after each ↵ | redmatrix | 2016-06-15 | 1 | -1/+1 | |
| | | | | li element | |||||
* | provide syntax based [colour] highlighting on code blocks for popular ↵ | redmatrix | 2016-06-15 | 1 | -0/+38 | |
| | | | | languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins. | |||||
* | missing iconfig conversion | redmatrix | 2016-06-13 | 1 | -3/+6 | |
| | ||||||
* | deprecate the item_id table - replace with iconfig. A possibly useful ↵ | redmatrix | 2016-06-13 | 1 | -2/+3 | |
| | | | | function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication. | |||||
* | provide a hover class for smiley emojis which renders them slightly larger ↵ | redmatrix | 2016-06-04 | 1 | -1/+1 | |
| | | | | on compatible devices when you single them out for inspection | |||||
* | the :tone variants are messed up, remove them | redmatrix | 2016-06-04 | 1 | -0/+2 | |
| | ||||||
* | return of the project smilie | redmatrix | 2016-06-04 | 1 | -2/+3 | |
| | ||||||
* | For emojis in posts, extend smilies and save a lot of duplication of effort | redmatrix | 2016-06-04 | 1 | -0/+12 | |
| | ||||||
* | missed an object -> obj conversion in prepare_body | redmatrix | 2016-06-03 | 1 | -1/+1 | |
| | ||||||
* | some initial emoji reaction work | redmatrix | 2016-06-02 | 1 | -1/+5 | |
| | ||||||
* | the rest of the schema updates - WARNING: some third party plugins may fail; ↵ | redmatrix | 2016-06-01 | 1 | -32/+1 | |
| | | | | e.g. embedphotos and chess. $item['object'] is now $item['obj'] and $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale'] and $photo['data'] is now $photo['content']. There are a number of other changes, but these are the ones noted to cause issues with third-party plugins. The project plugins have been updated. Please note any new issues as this effort touched a lot of code in a lot of files. | |||||
* | more db column renames | redmatrix | 2016-05-31 | 1 | -1/+1 | |
| | ||||||
* | track down some issues from the application logs | redmatrix | 2016-05-26 | 1 | -0/+9 | |
| | ||||||
* | code cleanup | redmatrix | 2016-05-24 | 1 | -20/+8 | |
| | ||||||
* | more work associated with DBA and index.php shuffle | redmatrix | 2016-05-24 | 1 | -10/+15 | |
| | ||||||
* | relocate index and db | redmatrix | 2016-05-24 | 1 | -2/+2 | |
| | ||||||
* | renamed include files identity.php (channel.php) and Contact.php ↵ | redmatrix | 2016-05-22 | 1 | -3/+3 | |
| | | | | (connections.php) | |||||
* | move template stuff to zotlabs/render | redmatrix | 2016-05-20 | 1 | -4/+2 | |
| | ||||||
* | cleanup proc_run after messing it up with debugging yesterday | redmatrix | 2016-05-20 | 1 | -0/+29 | |
| | ||||||
* | Ensure that channels can't be created with DAV reserved paths as a redress. ↵ | redmatrix | 2016-05-11 | 1 | -1/+15 | |
| | | | | Sabre mentions in several places that trying to change these paths to other strings; while possible - is unsupported and likely to cause problems. So for now, we're stuck with 'principals', 'addressbooks', and 'calendars'. If you already have these redresses on your site, you're basically buggered. | |||||
* | convert media embed functions that deal with rewriting specific corporate ↵ | redmatrix | 2016-05-08 | 1 | -23/+6 | |
| | | | | services to addon hooks | |||||
* | objectify comanche | redmatrix | 2016-05-05 | 1 | -0/+39 | |
| | ||||||
* | a couple of bugfixes from earlier checkins and implementation of source tags | redmatrix | 2016-05-01 | 1 | -1/+1 | |
| | ||||||
* | some much needed work on oembed security | redmatrix | 2016-05-01 | 1 | -1/+30 | |
| | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-30 | 1 | -26/+26 | |
|\ | ||||||
| * | update icon names in include/ | Treer | 2016-05-01 | 1 | -26/+26 | |
| | | ||||||
* | | trim engr_units string slight improvement to avoid subtle bugs | redmatrix | 2016-04-29 | 1 | -1/+3 | |
|/ | ||||||
* | allow engineering units (e.g. 400M, 1G) as service class limits | redmatrix | 2016-04-28 | 1 | -1/+1 | |
| | ||||||
* | move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ↵ | Mario Vavti | 2016-04-26 | 1 | -29/+0 | |
| | | | | add open tag to bbco_autocomplete |