Commit graph

18088 commits

Author SHA1 Message Date
redmatrix
fb9544badd null_date conversion; phase 1 2016-09-25 17:06:13 -07:00
redmatrix
bfc2552841 more infrastructure for notification auto-scroll to comment 2016-09-24 20:10:20 -07:00
redmatrix
39dc4fc992 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-24 16:40:36 -07:00
redmatrix
14e2a5cc39 also allow notification scroll on conversation page notifications (network and home), though we may also need some js to open comments for the thread holding the fragment (as well as the scrollto js). 2016-09-24 16:25:04 -07:00
redmatrix
c04c57ea0f the rest of the backend for supporting scroll-to-comment from notifications. We still need an ajax handler as fragments are evaluated before content is loaded. 2016-09-24 16:20:25 -07:00
Mario Vavti
8333d41dbd fix issue #528 2016-09-24 19:02:37 +02:00
redmatrix
dca4db9d4d convert oembed tools to use json arrays rather than json objects 2016-09-24 05:15:06 -07:00
redmatrix
4650458157 add server_roles document to aid people in making informed choices 2016-09-24 02:30:12 -07:00
redmatrix
ce41710a7c issue #531 - util/config and postgres 2016-09-23 18:52:14 -07:00
redmatrix
97d472380f attach sql issue 2016-09-23 01:16:59 -07:00
redmatrix
9ab6029280 issue #527 2016-09-22 17:15:12 -07:00
redmatrix
7b90b0dfd9 issue #526 2016-09-22 17:08:16 -07:00
redmatrix
24ddc8e026 issue #523 2016-09-22 17:00:32 -07:00
redmatrix
9981cbb72c issue #519 continued 2016-09-22 16:58:29 -07:00
redmatrix
be6c4019f6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-22 16:52:37 -07:00
redmatrix
8b8712c15b issue #524 2016-09-22 16:52:25 -07:00
git-marijus
4ffa408420 Merge pull request #529 from phellmes/dev
Update DE translation strings
2016-09-22 18:56:27 +02:00
Wave
c7ffe606a6 Merge pull request #530 from wave72/dev
Updated Italian strings
2016-09-22 17:24:42 +02:00
Wave72
26138ac46d Updated Italian strings 2016-09-22 17:22:03 +02:00
phellmes
ed457ac694 Update DE translation strings 2016-09-22 13:45:49 +02:00
Mario Vavti
56aa568124 objects with id=share_container seem to be blacklisted in various security browser plugins. rename it to distr_container. also remove some superfluous js 2016-09-22 11:07:21 +02:00
Mario Vavti
73c781a0cf add bootstrap .css.map files 2016-09-22 09:52:11 +02:00
Mario Vavti
3edbb564fc fix #525 2016-09-22 09:43:11 +02:00
redmatrix
4e85bc66b8 function to check for different values of NULL_DATE for backward compatibility 2016-09-21 17:16:54 -07:00
redmatrix
d1c9701ccf issue #522 - replace && with AND in sql query. 2016-09-21 16:01:17 -07:00
redmatrix
ec5cc08fab issue #521, add 'map' extension to files served natively by nginx without using the project controller 2016-09-21 15:47:18 -07:00
redmatrix
b5d093e5ca finish the channel_reddress() conversion 2016-09-21 15:28:37 -07:00
redmatrix
10a52977f8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-21 13:26:02 -07:00
redmatrix
c43eccf591 zot discovery wasn't returning in all cases (after discovering zot), which means that it could fall through and also discover other protocols and create xchans for them. 2016-09-21 13:24:16 -07:00
Mario Vavti
d9dc7f0f38 typo 2016-09-21 00:58:10 +02:00
redmatrix
4511f8855b issue #516 2016-09-20 15:53:30 -07:00
redmatrix
007836f514 issue #519 2016-09-20 15:38:11 -07:00
redmatrix
83dd1c7be2 issue #520 2016-09-20 15:34:35 -07:00
redmatrix
8ed9d915ad Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-20 15:27:52 -07:00
redmatrix
f812866665 issue #515 2016-09-20 15:27:36 -07:00
Mario Vavti
fde46ca78c Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-09-20 15:21:21 +02:00
Mario Vavti
ab59479a0c narrow navbar css fixes 2016-09-20 15:19:13 +02:00
redmatrix
299c46f118 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-20 06:14:40 -07:00
redmatrix
73bd65ead5 don't offer a settings/features link for techlevel 0 (basic or pro:0) even if there are level 0 features/categories. The definition of level 0 is "don't confuse me with options". 2016-09-20 06:05:20 -07:00
Mario Vavti
4b691703fe remove redundant loop 2016-09-20 13:39:26 +02:00
Mario Vavti
85bf025adc update changelog 2016-09-20 13:31:54 +02:00
redmatrix
8fd8ddcbc1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-19 14:46:54 -07:00
redmatrix
0011b8fd48 probable fix for #509 - errant comment notifications provided on delayed (duplicate delivery) top level posts which are probably coming from clones 2016-09-19 14:42:56 -07:00
Mario Vavti
0cba82ce9c if a feature category array has no items unset it 2016-09-19 15:09:19 +02:00
Mario Vavti
eb7db62a64 erge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Merge erforderlich ist, insbesondere wenn es einen aktualisierten
2016-09-19 13:36:14 +02:00
Mario Vavti
8d0a0674c6 fix issue #517 2016-09-19 13:35:36 +02:00
redmatrix
6c4f9f324b pro: filter features by techlevel 2016-09-19 04:08:27 -07:00
redmatrix
2863c35ab5 a couple more namespace issues with exception handlers 2016-09-18 17:51:40 -07:00
redmatrix
44d945cd08 couple of minor issues with dba namespace during install and enotify::format referencing an unknown variable 2016-09-18 17:35:11 -07:00
redmatrix
0754da58da some changes merged from wrong branch... new function channel_reddress() instead of hardwired generation and which fixes case-sensitivity; allow dot notation in config and pconfig utils, updated string file 2016-09-17 14:51:57 -07:00