Commit Graph

16207 Commits

Author SHA1 Message Date
redmatrix 1d5ea5efae explain the two aspects of federation which need to be handled in core to pass comments successfully amongst sites which optionally provide federation. Let's hope this list doesn't grow. 2016-04-04 17:02:27 -07:00
redmatrix 01ad485f65 SECURITY: Do not link unknown and unverified code repositories to the project without some form of confirmation that one accepts the significant risks involved. 2016-04-04 16:17:50 -07:00
redmatrix 447c59fd9b Merge branch 'master' into dev 2016-04-04 13:32:58 -07:00
redmatrix 3de40bdf04 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge 2016-04-04 13:31:31 -07:00
redmatrix ba6c346b46 revup - issue #337 2016-04-04 13:30:59 -07:00
Mario Vavti 1c9f773900 Merge branch 'master' into dev 2016-04-04 17:13:10 +02:00
Mario Vavti ec651f219e a simple autocomplete for bbcode or comanche - partly implemented 2016-04-04 17:12:23 +02:00
Mario Vavti ee8a9384d5 Merge branch 'master' into dev 2016-04-04 10:37:20 +02:00
Mario Vavti bba34a7a8e do not use dropdown class if there is nothing to dropdown 2016-04-04 10:37:07 +02:00
Mario Vavti dfa12b2919 Merge branch 'master' into dev 2016-04-04 10:13:30 +02:00
Mario Vavti 9b9f29a0b2 whitespace 2016-04-04 10:10:19 +02:00
Mario Vavti 4a9aad2a33 whitespace 2016-04-04 10:09:46 +02:00
Mario Vavti 69617b5c34 fullscreen mode for photo albums view 2016-04-04 10:09:13 +02:00
redmatrix 222ace3770 For GNU-social discovery, use the URI in the feed (author.uri) rather than try to pick out which of the aliases in webfinger are likely to be the right one. If we get it wrong, our communications with them will be discarded and there is no rhyme or reason to the logic about which representation is likely to be the one true account URI. It appears to vary with the clean_url setting of the site and this info isn't available to us except with a sequence of expensive probes and testing various ways of re-writing URLs to see if we get a response. 2016-04-03 20:55:38 -07:00
redmatrix 2e7d2a63c3 provide a backup copy of prior notes widget content if the contents were just nuked. 2016-04-03 19:34:19 -07:00
redmatrix a703835b5c Bug: "remember me" doesn't 2016-04-03 17:38:17 -07:00
redmatrix bf3f3564e0 issue #138 ; make ajaxchat optional and configurable. For reasons we've discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity. 2016-04-03 16:41:40 -07:00
redmatrix 102d41ccb9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-03 16:17:54 -07:00
redmatrix cfad5ba8b8 Merge branch 'master' into dev 2016-04-03 16:17:31 -07:00
redmatrix b4c1baada1 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge 2016-04-03 16:16:14 -07:00
redmatrix 1ca3eeedff issue #337 2016-04-03 16:15:41 -07:00
Mario Vavti 298b53e93a Merge branch 'master' into dev 2016-04-03 18:00:25 +02:00
Mario Vavti f13096a6f3 various fixes 2016-04-03 18:00:03 +02:00
Mario Vavti 470f14b919 Merge branch 'master' into dev 2016-04-03 15:27:26 +02:00
Mario Vavti 53311a30ad reduce chat-item-title fontsize to match wall-item-ago 2016-04-03 15:27:10 +02:00
Mario Vavti 5634a4bb61 Merge branch 'master' into dev 2016-04-03 14:56:52 +02:00
Mario Vavti 738e14348d update upstream libs fullcalendar and moment to a recent version 2016-04-03 14:56:19 +02:00
Mario Vavti 787e2ef961 Merge branch 'master' into dev 2016-04-03 12:20:10 +02:00
Mario Vavti db4e9aeaad fullscreen mode for events 2016-04-03 12:19:49 +02:00
Mario Vavti 7850b04853 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-04-03 11:35:47 +02:00
Mario Vavti b6f18a9a0b Merge branch 'master' into dev 2016-04-03 11:35:06 +02:00
Mario Vavti b8d8be7013 show chat expiration time in overview and minor fixes 2016-04-03 11:34:07 +02:00
redmatrix 84feff9500 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-04-02 21:09:05 -07:00
redmatrix 81ba293561 Merge branch 'master' into dev 2016-04-02 21:07:34 -07:00
redmatrix 8b3c099a12 use constant 2016-04-02 21:06:41 -07:00
Mario Vavti 2772a72095 ge branch 'master' into dev 2016-04-03 00:19:30 +02:00
Mario Vavti e361ee9253 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-04-03 00:04:30 +02:00
Mario Vavti 3edd4ce78f ease transition between fullscreen and inline view for small screens 2016-04-03 00:04:05 +02:00
redmatrix 381cc3e6f8 Merge branch 'master' into dev 2016-04-02 13:54:49 -07:00
redmatrix d09694587d typo in router 2016-04-02 13:52:16 -07:00
redmatrix 63451db3f6 small changes in README.md 2016-04-02 01:47:46 -07:00
redmatrix 7660afdb0f revup 2016-04-02 00:28:51 -07:00
jeroenpraat 72d995d35f Update nl and es-es strings 2016-04-01 23:24:13 +02:00
redmatrix 2a32df75f1 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-04-01 03:27:46 -07:00
redmatrix e16da7a166 unreferenced app member 2016-04-01 03:27:21 -07:00
Mario Vavti 5b55726a93 on update only jump to bottom if we actually got a new message 2016-04-01 11:13:04 +02:00
Mario Vavti bbe93d0e1d scroll chat to bottom on fullscreen toggle 2016-04-01 10:29:58 +02:00
Mario Vavti 5dd422e2d8 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-04-01 10:20:26 +02:00
Mario Vavti a564f495a7 improve scroll to bottom in chat 2016-04-01 10:20:10 +02:00
redmatrix 995555f357 ditto for typohelper 2016-04-01 01:04:37 -07:00