Mario Vavti
|
b66bacff9f
|
possible better fix for #385
|
2016-05-21 14:52:07 +02:00 |
|
Mario Vavti
|
9480e9b68b
|
possible fix for #385
|
2016-05-21 14:34:01 +02:00 |
|
redmatrix
|
bf05012150
|
relocate the (unused currently) protocol driver
|
2016-05-20 23:12:06 -07:00 |
|
redmatrix
|
d8ace38041
|
rework the conversation object stuff at a high level - still needs a bit of refactoring
|
2016-05-20 22:52:47 -07:00 |
|
redmatrix
|
bc20cf9fa3
|
remove redundant include
|
2016-05-20 22:16:57 -07:00 |
|
redmatrix
|
019250eff8
|
consolidate include/*_selectors.php (not touching acl_selectors for the moment, as it will likely end up with a different disposition)
|
2016-05-20 22:13:20 -07:00 |
|
redmatrix
|
ac095c89f1
|
code comments
|
2016-05-20 19:14:49 -07:00 |
|
redmatrix
|
f4da365abd
|
move template stuff to zotlabs/render
|
2016-05-20 19:11:14 -07:00 |
|
redmatrix
|
b2f0d2d085
|
cleanup proc_run after messing it up with debugging yesterday
|
2016-05-20 17:44:26 -07:00 |
|
redmatrix
|
aefeda8c41
|
recurse one more level of array when processing args
|
2016-05-20 01:45:29 -07:00 |
|
redmatrix
|
fdece3b102
|
add some backtrace to find the issue
|
2016-05-20 01:33:34 -07:00 |
|
redmatrix
|
cae380f068
|
case issue
|
2016-05-20 01:21:19 -07:00 |
|
redmatrix
|
3aa6e96904
|
update the installation text for the cron setup
|
2016-05-19 22:59:25 -07:00 |
|
redmatrix
|
a97e7b2758
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-19 22:48:58 -07:00 |
|
redmatrix
|
2cda18f354
|
remove test file
|
2016-05-19 22:48:32 -07:00 |
|
redmatrix
|
2e83c17e2d
|
roll minor version, change example text
|
2016-05-19 22:47:20 -07:00 |
|
zottel
|
2f7d40d8db
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-05-20 07:46:22 +02:00 |
|
redmatrix
|
f228bf4555
|
typo uncovered during tests
|
2016-05-19 22:33:01 -07:00 |
|
redmatrix
|
a2cec8899a
|
daemon conversion continued...
|
2016-05-19 22:26:37 -07:00 |
|
redmatrix
|
014168a29b
|
cleanup of daemon infrastructure
|
2016-05-19 21:32:19 -07:00 |
|
redmatrix
|
39bc0664a7
|
Separate cron into periodic components and use that as the main interface for scheduled tasks instead of the quaint 'poller'.
|
2016-05-19 21:22:04 -07:00 |
|
redmatrix
|
853322e7d2
|
don't try to deliver empty hashes
|
2016-05-19 20:48:40 -07:00 |
|
redmatrix
|
9cb1ac3de5
|
daemon master: create some compatibility code
|
2016-05-19 20:36:32 -07:00 |
|
redmatrix
|
5b2474238e
|
first phase of daemon refactoring
|
2016-05-19 19:42:45 -07:00 |
|
hubzilla
|
3c5cb15432
|
Merge pull request #397 from git-marijus/dev
provide an acl select option for only me
|
2016-05-20 11:39:44 +10:00 |
|
redmatrix
|
6e7d7c5017
|
minor
|
2016-05-19 16:48:10 -07:00 |
|
Mario Vavti
|
1f2bd00d93
|
whitespace
|
2016-05-19 23:39:05 +02:00 |
|
Mario Vavti
|
c7cad6ab60
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-05-19 23:35:48 +02:00 |
|
Mario Vavti
|
0f5eb65210
|
provide an acl select option for only me
|
2016-05-19 23:35:19 +02:00 |
|
hubzilla
|
fc239cb8a2
|
Merge pull request #395 from anaqreon/plugin-repo-ui
Plugin repo ui
|
2016-05-20 06:09:12 +10:00 |
|
hubzilla
|
3fe7bd8bcc
|
Merge pull request #396 from Treer/permissions
fix permission string
|
2016-05-20 06:08:51 +10:00 |
|
Treer
|
6b69184554
|
fix permission string
|
2016-05-19 22:37:21 +10:00 |
|
Andrew Manning
|
d5ca889cf5
|
Replace text strings for translation support
|
2016-05-19 07:09:13 -04:00 |
|
Andrew Manning
|
062cb77539
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo-ui
|
2016-05-19 07:04:36 -04:00 |
|
Andrew Manning
|
b55e2776cc
|
Improved plugin repo management UI in admin/plugins
|
2016-05-19 07:03:42 -04:00 |
|
redmatrix
|
50d1d06b03
|
issue #391 - htmlspecialchars_decode before firing up jot, which re-encodes
|
2016-05-19 00:56:51 -07:00 |
|
zottel
|
3eca1c3696
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-05-19 08:44:59 +02:00 |
|
redmatrix
|
93a7df5a1b
|
one more text clarification
|
2016-05-18 22:57:23 -07:00 |
|
redmatrix
|
905432c7ae
|
text clarifications
|
2016-05-18 22:53:43 -07:00 |
|
redmatrix
|
3355210878
|
explain what we're doing and where we're going with this.
|
2016-05-18 22:03:43 -07:00 |
|
redmatrix
|
ada26dd2cb
|
This explains it all. Don't set the domain when creating a cookie. You'll get a wildcard and sessions will break if you have multiple domains running hubzilla (or any php basic session based code).
|
2016-05-18 21:00:31 -07:00 |
|
redmatrix
|
f4b31dcb3a
|
Document what I know about the session regeneration issue. I'm really tired of fighting this darn thing. Sessions and cookies need to work.
|
2016-05-18 20:36:03 -07:00 |
|
hubzilla
|
7abb214eaf
|
Merge pull request #394 from anaqreon/plugin-link
Link new plugins when updating repos via admin/plugins
|
2016-05-19 12:17:19 +10:00 |
|
Andrew Manning
|
77eb9bcfa0
|
Link new plugins when updating repos via admin/plugins
|
2016-05-18 21:32:23 -04:00 |
|
redmatrix
|
c17b47518d
|
comment out session_regenerate until we get this sorted
|
2016-05-18 17:55:22 -07:00 |
|
redmatrix
|
1f7e6cae82
|
Revert "Revert "yet more session work""
This reverts commit 37d14f3a1d .
|
2016-05-18 17:03:54 -07:00 |
|
redmatrix
|
37d14f3a1d
|
Revert "yet more session work"
This reverts commit 51edd472c2 .
|
2016-05-18 17:02:46 -07:00 |
|
redmatrix
|
166d63ff60
|
missing close tag
|
2016-05-18 16:31:12 -07:00 |
|
redmatrix
|
d38851023e
|
provide server role on pubsites page
|
2016-05-18 16:28:51 -07:00 |
|
hubzilla
|
e35bd5d251
|
Merge pull request #393 from git-marijus/dev
only show $showall_origin if permission_role is custom. it does not m…
|
2016-05-19 06:28:54 +10:00 |
|