Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-27 | 2 | -4/+14 |
|\ | |||||
| * | do not scroll items behind the navbar | Mario Vavti | 2016-09-27 | 1 | -1/+1 |
| | | |||||
| * | remove logging | Mario Vavti | 2016-09-27 | 1 | -1/+0 |
| | | |||||
| * | catch js error if the notification mid is for e.g. a like and class ↵ | Mario Vavti | 2016-09-27 | 1 | -1/+2 |
| | | | | | | | | .item_123def... does not exist | ||||
| * | more changelog | Mario Vavti | 2016-09-27 | 1 | -2/+12 |
| | | |||||
* | | apply the same fix to our own DB as we did for hubzilla master and redmatrix. | redmatrix | 2016-09-26 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'nulldate' into dev | redmatrix | 2016-09-26 | 21 | -149/+155 |
|\ \ | |/ |/| | |||||
| * | next wave of nulldate fixes | redmatrix | 2016-09-26 | 4 | -118/+117 |
| | | |||||
| * | null_date conversion; phase 1 | redmatrix | 2016-09-25 | 18 | -31/+31 |
| | | |||||
| * | function to check for different values of NULL_DATE for backward compatibility | redmatrix | 2016-09-21 | 1 | -0/+7 |
| | | |||||
* | | allow a site to over-ride the help table-of-contents files | redmatrix | 2016-09-26 | 2 | -3/+10 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-26 | 1 | -4/+6 |
|\ \ | |||||
| * | | catch js error if there are no collapsed comments | Mario Vavti | 2016-09-26 | 1 | -4/+6 |
| | | | |||||
* | | | missing categories in preview mode | redmatrix | 2016-09-26 | 1 | -4/+2 |
|/ / | |||||
* | | use color #337AB7 instead aof bold and 120% for ivoted class | Mario Vavti | 2016-09-26 | 1 | -3/+2 |
| | | |||||
* | | remove the now useless url fragments from notification links | redmatrix | 2016-09-25 | 1 | -4/+1 |
| | | |||||
* | | autoscroll to target post/comment when in single-thread mode; don't ↵ | redmatrix | 2016-09-25 | 3 | -5/+10 |
| | | | | | | | | interfere with other modes; replaces using a named anchor with a url fragment to reach a particular place in the conversation when content is loaded with ajax. | ||||
* | | subtle indicator of your own response verb activity | redmatrix | 2016-09-25 | 4 | -8/+22 |
| | | |||||
* | | more infrastructure for notification auto-scroll to comment | redmatrix | 2016-09-24 | 2 | -2/+11 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-24 | 1 | -2/+18 |
|\ \ | |||||
| * | | fix issue #528 | Mario Vavti | 2016-09-24 | 1 | -2/+18 |
| | | | |||||
* | | | also allow notification scroll on conversation page notifications (network ↵ | redmatrix | 2016-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | and home), though we may also need some js to open comments for the thread holding the fragment (as well as the scrollto js). | ||||
* | | | the rest of the backend for supporting scroll-to-comment from notifications. ↵ | redmatrix | 2016-09-24 | 4 | -2/+10 |
| | | | | | | | | | | | | We still need an ajax handler as fragments are evaluated before content is loaded. | ||||
* | | | convert oembed tools to use json arrays rather than json objects | redmatrix | 2016-09-24 | 3 | -32/+35 |
|/ / | |||||
* | | add server_roles document to aid people in making informed choices | redmatrix | 2016-09-24 | 1 | -0/+27 |
| | | |||||
* | | issue #531 - util/config and postgres | redmatrix | 2016-09-23 | 1 | -1/+1 |
| | | |||||
* | | attach sql issue | redmatrix | 2016-09-23 | 2 | -3639/+3641 |
| | | |||||
* | | issue #527 | redmatrix | 2016-09-22 | 1 | -2/+1 |
| | | |||||
* | | issue #526 | redmatrix | 2016-09-22 | 2 | -2/+12 |
| | | |||||
* | | issue #523 | redmatrix | 2016-09-22 | 2 | -2/+2 |
| | | |||||
* | | issue #519 continued | redmatrix | 2016-09-22 | 1 | -5/+12 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-22 | 10 | -12917/+13359 |
|\ \ | |||||
| * \ | Merge pull request #529 from phellmes/dev | git-marijus | 2016-09-22 | 2 | -7794/+8199 |
| |\ \ | | | | | | | | | Update DE translation strings | ||||
| | * | | Update DE translation strings | phellmes | 2016-09-22 | 2 | -7794/+8199 |
| | | | | |||||
| * | | | Merge pull request #530 from wave72/dev | Wave | 2016-09-22 | 2 | -5106/+5151 |
| |\ \ \ | | |/ / | |/| | | Updated Italian strings | ||||
| | * | | Updated Italian strings | Wave72 | 2016-09-22 | 2 | -5106/+5151 |
| | | | | |||||
| * | | | objects with id=share_container seem to be blacklisted in various security ↵ | Mario Vavti | 2016-09-22 | 2 | -16/+4 |
| | | | | | | | | | | | | | | | | browser plugins. rename it to distr_container. also remove some superfluous js | ||||
| * | | | add bootstrap .css.map files | Mario Vavti | 2016-09-22 | 4 | -0/+4 |
| | | | | |||||
| * | | | fix #525 | Mario Vavti | 2016-09-22 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | issue #524 | redmatrix | 2016-09-22 | 1 | -0/+3 |
|/ / | |||||
* | | issue #522 - replace && with AND in sql query. | redmatrix | 2016-09-21 | 1 | -1/+1 |
| | | |||||
* | | issue #521, add 'map' extension to files served natively by nginx without ↵ | redmatrix | 2016-09-21 | 1 | -1/+1 |
| | | | | | | | | using the project controller | ||||
* | | finish the channel_reddress() conversion | redmatrix | 2016-09-21 | 9 | -19/+19 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | typo | Mario Vavti | 2016-09-21 | 1 | -1/+1 |
| | | | |||||
* | | | zot discovery wasn't returning in all cases (after discovering zot), which ↵ | redmatrix | 2016-09-21 | 1 | -1/+3 |
|/ / | | | | | | | means that it could fall through and also discover other protocols and create xchans for them. | ||||
* | | issue #516 | redmatrix | 2016-09-20 | 1 | -65/+58 |
| | | |||||
* | | issue #519 | redmatrix | 2016-09-20 | 1 | -2/+5 |
| | | |||||
* | | issue #520 | redmatrix | 2016-09-20 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-20 | 1 | -12/+8 |
|\ \ |