 Mike Macgirvin
|
633693c94b
|
Merge branch 'fix-addons-links' into 'dev'
fix links to addons repository
See merge request hubzilla/core!1216
|
2018-06-13 03:07:05 +02:00 |
|
 Herbert Thielen
|
b361fb4f89
|
fix links to addons repository
|
2018-06-11 15:54:22 +02:00 |
|
|
zotlabs
|
a8f179145b
|
Merge branch 'master' of ../hz into dev
|
2018-06-10 22:16:39 -07:00 |
|
|
zotlabs
|
912ccb31a1
|
hubzilla core issue #1218
|
2018-06-10 19:26:35 -07:00 |
|
|
zotlabs
|
6959c9e423
|
fixes for immediate expire, channel_active not initialised in DB
|
2018-06-10 15:27:55 -07:00 |
|
 Mario Vavti
|
1b9a350469
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-06-10 17:05:05 +02:00 |
|
|
Mario Vavti
|
d0f7b1d9b7
|
fix issue #1221
|
2018-06-10 17:04:34 +02:00 |
|
|
Mario
|
46cc64f2d8
|
Merge branch 'dev' into 'dev'
Update symbolic link doc/es
See merge request hubzilla/core!1214
|
2018-06-10 16:54:22 +02:00 |
|
|
Mario Vavti
|
9e29c13678
|
fix issue #1219
|
2018-06-09 16:38:15 +02:00 |
|
 Manuel Jiménez Friaza
|
438ce44af9
|
Update symbolic link doc/es
|
2018-06-09 13:41:13 +02:00 |
|
|
Mario Vavti
|
e37ccb7a63
|
move cid filter js to the widget
|
2018-06-09 13:08:14 +02:00 |
|
|
Mario Vavti
|
afaa8012c8
|
bump version
|
2018-06-09 11:04:56 +02:00 |
|
|
Mario Vavti
|
c4778e5e24
|
restrict cid filter to unthreaded order (makes much more sense that way imho and the query is a lot faster) and slighty change order of the filters
|
2018-06-09 10:58:01 +02:00 |
|
|
Mario Vavti
|
d5ee8d80ab
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-06-08 23:19:56 +02:00 |
|
|
Mario Vavti
|
1fbc131469
|
if unthreaded and cid and not pf, query author only
|
2018-06-08 23:19:30 +02:00 |
|
|
Mario Vavti
|
468af29e3e
|
new feature filter network by name
|
2018-06-08 23:03:05 +02:00 |
|
|
Mario
|
b05e7943c2
|
Merge branch 'dev' into 'dev'
Update github.com git repo URLs with framagit.org URLs
See merge request hubzilla/core!1212
|
2018-06-08 21:04:21 +02:00 |
|
|
Mario
|
dbf0c1893c
|
Merge branch 'dev' into 'dev'
Update doc/es-es
See merge request hubzilla/core!1213
|
2018-06-08 21:02:07 +02:00 |
|
 Manuel Jiménez Friaza
|
950006a4de
|
Update doc/es-es
|
2018-06-08 12:49:21 +02:00 |
|
|
Mario Vavti
|
7c98aea524
|
update changelog
|
2018-06-08 12:16:47 +02:00 |
|
 Andrew Manning
|
4feff1cf89
|
Update github.com git repo URLs with framagit.org URLs
|
2018-06-08 05:37:23 -04:00 |
|
|
Andrew Manning
|
df2d181602
|
Merge branch 'dev' of framagit.org:hubzilla/core into dev
|
2018-06-08 05:22:01 -04:00 |
|
|
Mario Vavti
|
7bf1c5f27b
|
github to framagit transition
|
2018-06-08 09:04:19 +02:00 |
|
|
Mario Vavti
|
b47fdd748f
|
typo
|
2018-06-08 08:30:22 +02:00 |
|
 gia vec
|
c69c7db4f7
|
Update developers.bb
(cherry picked from commit 009ecb0ff4)
|
2018-06-08 08:27:11 +02:00 |
|
|
gia vec
|
de20d8f73a
|
Update Developers.md
(cherry picked from commit 68ffddafb1)
|
2018-06-08 08:26:46 +02:00 |
|
|
Mario Vavti
|
dfa48ba17c
|
fixes for search_item.tpl
|
2018-06-07 23:24:36 +02:00 |
|
|
Mario Vavti
|
b3928f3d2a
|
escape query string
|
2018-06-07 22:45:07 +02:00 |
|
|
Mario Vavti
|
d3bc50e18d
|
do not query for parents if $conv and $nouveau are set
|
2018-06-07 21:58:09 +02:00 |
|
|
Mario Vavti
|
ad4e8fd7f5
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-06-07 14:00:18 +02:00 |
|
|
zotlabs
|
2c7597066c
|
update a number of links in the code
|
2018-06-06 17:12:20 -07:00 |
|
|
zotlabs
|
c06c2650e5
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-06-06 16:49:07 -07:00 |
|
|
Mario Vavti
|
9ffb10c0e6
|
update install instructions
|
2018-06-06 22:11:55 +02:00 |
|
|
Mario Vavti
|
dd4b8529c2
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-06-06 20:13:03 +02:00 |
|
|
Mario Vavti
|
5d1d6299cd
|
add the pf argument to the forum notification links
|
2018-06-06 18:02:25 +02:00 |
|
|
Mario Vavti
|
4e1c32e610
|
remove gravizot.de from directory fallback servers due to owners request
|
2018-06-06 17:59:13 +02:00 |
|
|
zotlabs
|
d6f98ab88e
|
some work to make menus editable by visitors with webpage write permissions; this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality.
|
2018-06-05 21:12:42 -07:00 |
|
|
Mario Vavti
|
7188e719ef
|
rely on the pf argument to determine if we deal with a forum or not. xchan_pubforum is not set for all public forums in the forum filters for some reason.
|
2018-06-05 11:56:30 +02:00 |
|
|
Mario Vavti
|
2328dfc851
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2018-06-05 10:36:54 +02:00 |
|
|
Mario Vavti
|
30c00df4f3
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-06-05 10:36:37 +02:00 |
|
|
zotlabs
|
e1b85a361c
|
photos not syncing properly if destination is a postgres site
|
2018-06-04 16:36:13 -07:00 |
|
|
git-marijus
|
915328d92a
|
Merge pull request #1210 from mjfriaza/dev
Initial Spanish translations in doc/es-es
|
2018-06-04 16:00:29 +02:00 |
|
|
Mario Vavti
|
6019a34da2
|
be specific about the term type and do not sort the results
|
2018-06-04 15:54:18 +02:00 |
|
|
zotlabs
|
5a9e6c8a69
|
sort out some mismatched hovertips on the activity filter
|
2018-06-03 23:38:03 -07:00 |
|
|
zotlabs
|
57231a8807
|
wrong level
|
2018-06-03 23:16:40 -07:00 |
|
|
zotlabs
|
dd9f7ef6e9
|
fix submenunavigation on activity filters
|
2018-06-03 23:14:01 -07:00 |
|
|
Mario Vavti
|
8b76b5a0a6
|
improve network cid query
|
2018-06-03 23:03:30 +02:00 |
|
|
Mario Vavti
|
3d3e7bafd5
|
distinct is needed or it can heavily impact pagination in certain situations (5 per page instead of 20). Add ordering to the select clause to mitigate errors in postgres and add item_thread_top = 1 for slightly better performance.
|
2018-06-03 17:31:50 +02:00 |
|
|
Mario Vavti
|
a42ff1e6d4
|
missing $perm_sql
|
2018-06-03 13:27:06 +02:00 |
|
|
Manuel Jiménez Friaza
|
ea8ff7037a
|
Initial translations in doc/es-es
|
2018-06-03 12:29:27 +02:00 |
|