aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-272-4/+14
|\
| * do not scroll items behind the navbarMario Vavti2016-09-271-1/+1
| |
| * remove loggingMario Vavti2016-09-271-1/+0
| |
| * catch js error if the notification mid is for e.g. a like and class ↵Mario Vavti2016-09-271-1/+2
| | | | | | | | .item_123def... does not exist
| * more changelogMario Vavti2016-09-271-2/+12
| |
* | apply the same fix to our own DB as we did for hubzilla master and redmatrix.redmatrix2016-09-261-0/+3
| |
* | Merge branch 'nulldate' into devredmatrix2016-09-2621-149/+155
|\ \ | |/ |/|
| * next wave of nulldate fixesredmatrix2016-09-264-118/+117
| |
| * null_date conversion; phase 1redmatrix2016-09-2518-31/+31
| |
| * function to check for different values of NULL_DATE for backward compatibilityredmatrix2016-09-211-0/+7
| |
* | allow a site to over-ride the help table-of-contents filesredmatrix2016-09-262-3/+10
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-261-4/+6
|\ \
| * | catch js error if there are no collapsed commentsMario Vavti2016-09-261-4/+6
| | |
* | | missing categories in preview moderedmatrix2016-09-261-4/+2
|/ /
* | use color #337AB7 instead aof bold and 120% for ivoted classMario Vavti2016-09-261-3/+2
| |
* | remove the now useless url fragments from notification linksredmatrix2016-09-251-4/+1
| |
* | autoscroll to target post/comment when in single-thread mode; don't ↵redmatrix2016-09-253-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 activityredmatrix2016-09-254-8/+22
| |
* | more infrastructure for notification auto-scroll to commentredmatrix2016-09-242-2/+11
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-241-2/+18
|\ \
| * | fix issue #528Mario Vavti2016-09-241-2/+18
| | |
* | | also allow notification scroll on conversation page notifications (network ↵redmatrix2016-09-241-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. ↵redmatrix2016-09-244-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 objectsredmatrix2016-09-243-32/+35
|/ /
* | add server_roles document to aid people in making informed choicesredmatrix2016-09-241-0/+27
| |
* | issue #531 - util/config and postgresredmatrix2016-09-231-1/+1
| |
* | attach sql issueredmatrix2016-09-232-3639/+3641
| |
* | issue #527redmatrix2016-09-221-2/+1
| |
* | issue #526redmatrix2016-09-222-2/+12
| |
* | issue #523redmatrix2016-09-222-2/+2
| |
* | issue #519 continuedredmatrix2016-09-221-5/+12
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-2210-12917/+13359
|\ \
| * \ Merge pull request #529 from phellmes/devgit-marijus2016-09-222-7794/+8199
| |\ \ | | | | | | | | Update DE translation strings
| | * | Update DE translation stringsphellmes2016-09-222-7794/+8199
| | | |
| * | | Merge pull request #530 from wave72/devWave2016-09-222-5106/+5151
| |\ \ \ | | |/ / | |/| | Updated Italian strings
| | * | Updated Italian stringsWave722016-09-222-5106/+5151
| | | |
| * | | objects with id=share_container seem to be blacklisted in various security ↵Mario Vavti2016-09-222-16/+4
| | | | | | | | | | | | | | | | browser plugins. rename it to distr_container. also remove some superfluous js
| * | | add bootstrap .css.map filesMario Vavti2016-09-224-0/+4
| | | |
| * | | fix #525Mario Vavti2016-09-221-1/+1
| | |/ | |/|
* / | issue #524redmatrix2016-09-221-0/+3
|/ /
* | issue #522 - replace && with AND in sql query.redmatrix2016-09-211-1/+1
| |
* | issue #521, add 'map' extension to files served natively by nginx without ↵redmatrix2016-09-211-1/+1
| | | | | | | | using the project controller
* | finish the channel_reddress() conversionredmatrix2016-09-219-19/+19
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-211-1/+1
|\ \
| * | typoMario Vavti2016-09-211-1/+1
| | |
* | | zot discovery wasn't returning in all cases (after discovering zot), which ↵redmatrix2016-09-211-1/+3
|/ / | | | | | | means that it could fall through and also discover other protocols and create xchans for them.
* | issue #516redmatrix2016-09-201-65/+58
| |
* | issue #519redmatrix2016-09-201-2/+5
| |
* | issue #520redmatrix2016-09-201-0/+1
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-09-201-12/+8
|\ \