Mario Vavti
b66bacff9f
possible better fix for #385
2016-05-21 14:52:07 +02: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
a2cec8899a
daemon conversion continued...
2016-05-19 22:26:37 -07:00
Andrew Manning
d5ca889cf5
Replace text strings for translation support
2016-05-19 07:09:13 -04:00
redmatrix
50d1d06b03
issue #391 - htmlspecialchars_decode before firing up jot, which re-encodes
2016-05-19 00:56:51 -07: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
Andrew Manning
77eb9bcfa0
Link new plugins when updating repos via admin/plugins
2016-05-18 21:32:23 -04: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
Andrew Manning
70d413ab04
Create store/git/sys/extend/addon directory and link if it does not exist in all plugin repo GUI POST actions
2016-05-12 06:49:24 -04:00
Andrew Manning
d968fc51ea
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-11 05:54:20 -04:00
Andrew Manning
c7698e4dc3
Check if target directories are writable when adding, updating, or removing plugin repos
2016-05-11 05:53:23 -04:00
redmatrix
4dd3839c41
provide repository versions on admin summary page and an upgrade message if you're behind master
2016-05-10 21:46:04 -07:00
redmatrix
9caaa9397e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-10 19:42:37 -07:00
redmatrix
915bd2ec77
sabre upgrade
2016-05-10 19:40:15 -07:00
Andrew Manning
40e3d37a72
Remove debugging lines
2016-05-10 21:01:47 -04:00
Andrew Manning
2882eef42f
Link plugins in the newly installed addon repo to /addon so they are accessible
2016-05-10 21:00:10 -04:00
redmatrix
0b02a6d123
initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)
2016-05-10 17:26:44 -07:00
Andrew Manning
78b40e6363
Delete existing repo if the new one has a different URL. Fixed bug that could cause repeated installation.
2016-05-10 06:28:00 -04:00
Mario Vavti
45c19e365d
another public -> pubstream
2016-05-10 10:40:36 +02:00
redmatrix
2469853175
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-10 01:31:15 -07:00
redmatrix
0c5434d5e3
try again with shutdown handler, fix issue #373 (live-pubstream div wasn't present
2016-05-10 01:30:22 -07:00
Mario Vavti
8ab7707898
allow delayed publishing of webpages
2016-05-10 10:02:27 +02:00
redmatrix
baa7020036
revert shutdown function
2016-05-09 22:28:54 -07:00
Andrew Manning
0b8a7f1bd0
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-09 22:00:21 -04:00
Andrew Manning
9c8cf7d433
Fixed some bugs with empty repo name and improved the interface a bit.
2016-05-09 21:59:27 -04:00
Andrew Manning
180731c162
copy-paste error
2016-05-09 21:17:47 -04:00
Treer
ef97e5a063
minor cleanup. No functional changes
2016-05-10 00:15:57 +10:00
Mario Vavti
a3e94591bc
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-09 11:58:10 +02:00
Mario Vavti
24c1dc528d
make editwebpage use status_editor() and fix storing of layout on webpage creation
2016-05-09 11:56:42 +02:00
redmatrix
6f486a3393
prevent recursion in the database driver when debugging is enabled and the system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log...
2016-05-09 01:12:24 -07:00
Mario Vavti
c8f686b8a5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-09 09:26:38 +02:00
Andrew Manning
d714cd76dd
Addon repo is copied to /extend/addon/ when admin presses install. Addon repos can be removed via GUI.
2016-05-08 20:30:00 -04:00
Andrew Manning
174484a51c
Custom addon repo name option added.
2016-05-08 09:26:06 -04:00
Treer
09ef30feb0
Update some modules to use new ACL dialog feature
2016-05-08 21:27:52 +10:00
Andrew Manning
f73a74967e
Existing addon repos are listed on plugin page with controls for updating, removing, and switching branches.
2016-05-07 22:12:12 -04:00
Andrew Manning
bbbae3f42d
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-07 18:39:34 -04:00
Andrew Manning
0746794e81
New plugin repo cloned using new GitRepo class. Readme and info displayed in wide modal dialog.
2016-05-07 18:39:19 -04:00
redmatrix
2b77c9a74b
SDAV is already absolute
2016-05-07 14:23:38 -07:00
Mario Vavti
75128e8f68
make editblock use status_editor()
2016-05-07 23:05:48 +02:00
Andrew Manning
6950100ff4
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo
2016-05-06 13:42:22 -04:00
redmatrix
7101bbedcb
objectify comanche
2016-05-05 23:07:35 -07:00
Andrew Manning
3011d3768c
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-05 21:49:24 -04:00
redmatrix
5508feb6ce
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-05 18:19:20 -07:00
redmatrix
2e3da0cbbb
- Setup: check php version (5.4 required)
...
- Comanche: implement conditionals. Currently the only supported tests are true/false for system config settings
and supports the following forms:
[if $config.system.foo]
[widget=widget1][/widget]
[else]
[widget=widget2][/widget]
[/if]
[if $config.system.foo]
[widget=widget1][/widget]
[/if]
2016-05-05 18:15:07 -07:00
Treer
2174cdcd0e
Unify permissions dialog for network posts, channel posts, and remote posts
...
* changes the warning from being about when a post is "sent" to when it's "shared", to match the Share button.
* hyperlinks the "cannot be changed" part of the warning to the help file
* adds some more content to the help file
2016-05-06 01:44:46 +10:00
Andrew Manning
6ce939491b
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-05 05:35:00 -04:00
