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 009ecb0ff4a7118e9713d79dbb3cc7faa1d22034)
|
2018-06-08 08:27:11 +02:00 |
|
gia vec
|
de20d8f73a
|
Update Developers.md
(cherry picked from commit 68ffddafb1ce27bf408735f08f2a69ad094655b3)
|
2018-06-08 08:26:46 +02:00 |
|
zotlabs
|
e4649648d1
|
upgrade the rest of my_perms
|
2018-06-07 20:17:30 -07:00 |
|
zotlabs
|
3b0469a277
|
finish migrating their_perms (except for federation addons)
|
2018-06-07 19:44:09 -07:00 |
|
zotlabs
|
38a2493ed0
|
Merge branch 'red'
|
2018-06-07 18:44:05 -07: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
|
fd62c67a8f
|
make sure we declare this experimental
|
2018-06-06 22:03:25 -07:00 |
|
zotlabs
|
cc6f2a07ef
|
remove ratings and the xrd interface
|
2018-06-06 21:50:43 -07: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
|
c2acdd299b
|
should probably add the files
|
2018-06-04 23:20:09 -07:00 |
|
zotlabs
|
915c50064c
|
consolidate directory functions into libzotdir
|
2018-06-04 23:19:16 -07:00 |
|
zotlabs
|
391cbacb2a
|
a few dangling references to libzot
|
2018-06-04 18:47:36 -07:00 |
|
zotlabs
|
4846ae5326
|
split off libsync from libzot
|
2018-06-04 18:40:11 -07:00 |
|
zotlabs
|
9232351cb2
|
Merge branch 'master' into zapp
|
2018-06-04 17:47:34 -07: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 |
|
zotlabs
|
eee6131d41
|
permissions work
|
2018-06-03 22:57:02 -07:00 |
|
zotlabs
|
b7356eda49
|
start fresh after a lot of heavy lifting and fix a lot of stuff
|
2018-06-03 21:23:34 -07:00 |
|
zotlabs
|
89f16c81dd
|
fix conflict
|
2018-06-03 17:59:41 -07:00 |
|
zotlabs
|
4524d241a2
|
Merge branch 'master' into zapp
|
2018-06-03 17:58:24 -07:00 |
|
zotlabs
|
02e173e733
|
finish porting zot6handler primitives
|
2018-06-03 17:49:48 -07:00 |
|
Mario Vavti
|
8b76b5a0a6
|
improve network cid query
|
2018-06-03 23:03:30 +02:00 |
|