zotlabs
|
9f5d44fa32
|
turn the logs down again
|
2018-02-08 16:30:44 -08:00 |
|
zotlabs
|
cd1e5d4171
|
zot6 testing
|
2018-02-08 16:22:10 -08:00 |
|
zotlabs
|
beec49847f
|
missing quote
|
2018-02-08 15:45:33 -08:00 |
|
zotlabs
|
e4503f743e
|
logging
|
2018-02-08 15:36:22 -08:00 |
|
zotlabs
|
635c5e532b
|
z6 testing
|
2018-02-08 15:32:54 -08:00 |
|
zotlabs
|
4c27fa5c37
|
debug the crypto function
|
2018-02-07 22:04:53 -08:00 |
|
zotlabs
|
6cf2e9945a
|
encrypt the httpsig for zot6 transport
|
2018-02-07 21:53:47 -08:00 |
|
zotlabs
|
b21a5c3ce9
|
compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is present
|
2018-02-07 20:17:32 -08:00 |
|
zotlabs
|
5057a4bd4c
|
zot6 delivery work
|
2018-02-07 19:15:56 -08:00 |
|
zotlabs
|
3a0db39fa0
|
more zot6 delivery work
|
2018-02-07 18:38:10 -08:00 |
|
zotlabs
|
1d8d2c6e55
|
Merge branch 'master' into z6
|
2018-02-07 17:54:21 -08:00 |
|
zotlabs
|
dc88ccdc0b
|
remove dead code
|
2018-02-07 17:53:54 -08:00 |
|
zotlabs
|
4171854e2f
|
slight improvement in ostatus protocol detection from xml feed
|
2018-02-06 17:00:56 -08:00 |
|
zotlabs
|
cb042e32bc
|
code cleanup
|
2018-02-05 20:57:07 -08:00 |
|
zotlabs
|
5e94187d03
|
remove dead code
|
2018-02-05 20:31:24 -08:00 |
|
zotlabs
|
cadd958339
|
remove mobile_detect (outdated and unmaintainable)
|
2018-02-05 18:06:25 -08:00 |
|
zotlabs
|
b06c52553d
|
fix manual queue invocation (was using the web argc/argv from the cli)
|
2018-02-05 16:08:01 -08:00 |
|
zotlabs
|
b41c5f3497
|
Merge branch 'master' into z6
|
2018-02-05 15:58:28 -08:00 |
|
zotlabs
|
930e1fdbdc
|
feedutils: separate the parsing of author information from the parsing of item/activity information
|
2018-02-05 15:14:57 -08:00 |
|
zotlabs
|
f15fd93f90
|
implode can take its arguments in either order, but let's try to be consistent
|
2018-02-04 17:01:59 -08:00 |
|
zotlabs
|
6ad14f4ca0
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-02-04 15:53:56 -08:00 |
|
Mario Vavti
|
9d55a254dc
|
this will fix the cards query and keep the rest intact
|
2018-02-04 22:37:30 +01:00 |
|
Mario Vavti
|
f9aecf5d4c
|
superfluous ,
|
2018-02-04 21:17:41 +01:00 |
|
Mario Vavti
|
c57b2d25b2
|
remove indices from mysql schema file
|
2018-02-04 21:13:24 +01:00 |
|
Mario Vavti
|
3cc756f302
|
remove some never used indices which prevented our item queries to find the right query execution plan in mysql and adjust some queries to optimze the result
|
2018-02-04 20:42:40 +01:00 |
|
zotlabs
|
3e7dffb676
|
decomplicate cont.
|
2018-02-03 12:50:07 -08:00 |
|
zotlabs
|
512f3a7643
|
provide summaries in feeds under very limited cases, but never in compat (GNU-Social) mode
|
2018-02-01 21:26:34 -08:00 |
|
zotlabs
|
c1eb796cbd
|
document the tag changes
|
2018-02-01 20:12:34 -08:00 |
|
zotlabs
|
dd35cad62a
|
some feed cleanup
|
2018-02-01 19:52:40 -08:00 |
|
zotlabs
|
5f972e00fe
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-02-01 17:47:37 -08:00 |
|
zotlabs
|
cc0cd0b292
|
more generalisation of commonly used code constructs
|
2018-02-01 17:17:23 -08:00 |
|
zotlabs
|
c92bb6176a
|
more separation of complex code into separate functions
|
2018-02-01 15:09:51 -08:00 |
|
Mario Vavti
|
fffb95299e
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-02-01 13:14:52 +01:00 |
|
Mario Vavti
|
40cdb70b2f
|
we need to manualy take care to mark the notification read in this case
|
2018-01-31 20:41:31 +01:00 |
|
zotlabs
|
feae454481
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-01-30 21:38:49 -08:00 |
|
zotlabs
|
71c2cc79e5
|
cosmetic readme changes, code cleanup
|
2018-01-30 18:16:20 -08:00 |
|
Mario Vavti
|
d24cf0b85b
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-01-30 14:31:06 +01:00 |
|
zotlabs
|
0e2c539d93
|
remove logging
|
2018-01-29 19:57:43 -08:00 |
|
zotlabs
|
4f24cc7377
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-01-29 18:57:15 -08:00 |
|
zotlabs
|
9bf83a57bd
|
don't show jot bb-edit buttons if a mimetype other than text/bbcode is selected (:todo: also disable bbcode autocomplete)
|
2018-01-29 18:43:20 -08:00 |
|
zotlabs
|
668f56807a
|
unable to delete accounts using tickboxes on admin/accounts - make all the action names consistent
|
2018-01-29 17:43:11 -08:00 |
|
zotlabs
|
8d479aa1c7
|
redirect to the email_validation page if login was attempted after account creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it.
|
2018-01-29 16:58:55 -08:00 |
|
Mario Vavti
|
296117124c
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-01-29 22:44:38 +01:00 |
|
git-marijus
|
0d21c6f863
|
Merge pull request #967 from dawnbreak/dev
Fix a PHP7.2 warning when a channel has no cards.
|
2018-01-29 22:18:31 +01:00 |
|
git-marijus
|
b787865fbb
|
Merge pull request #970 from mrjive/patch-1
small details on connections.tpl
|
2018-01-29 22:15:43 +01:00 |
|
mrjive
|
7a377e72e7
|
small details
Just changed the icon from sort to filter (it's what it does, it filters) and changed id to class in connection-wrapper clearfix (line 28)
|
2018-01-29 16:37:34 +01:00 |
|
zotlabs
|
e4eff6a32b
|
fix workflow for form based email validation when auto_channel_create is in effect. Eventually we will need to rework the workflow logic because it is getting a bit tangled.
|
2018-01-29 02:41:45 -08:00 |
|
zotlabs
|
c1e44c0f54
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-01-28 21:43:50 -08:00 |
|
zotlabs
|
5cf2bf6b29
|
change the image - make it bland and neutral
|
2018-01-28 20:50:37 -08:00 |
|
zotlabs
|
56d1614ea6
|
provide a default video image if nothing else is available. Allow sites to change it.
|
2018-01-28 20:35:05 -08:00 |
|