redmatrix
9cb1ac3de5
daemon master: create some compatibility code
2016-05-19 20:36:32 -07: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
Treer
6b69184554
fix permission string
2016-05-19 22:37:21 +10:00
redmatrix
3355210878
explain what we're doing and where we're going with this.
2016-05-18 22:03:43 -07:00
redmatrix
d38851023e
provide server role on pubsites page
2016-05-18 16:28:51 -07:00
Mario Vavti
c77732b8ed
only show $showall_origin if permission_role is custom. it does not make much sense otherwise since the member is merely using a preset of permissions.
2016-05-18 21:23:24 +02:00
redmatrix
16f79b70e4
experimental PDO DBA driver
2016-05-17 22:32:49 -07:00
redmatrix
43c2b22fca
cli utilities - argc and argv reversed. Not functionally incorrect since it was consistent but aesthetically incorrect.
2016-05-17 19:49:21 -07:00
hubzilla
9a64c6b9f7
Merge pull request #389 from sasiflo/dev_sasiflo_sync
...
Synchronization: Directory creation on sync import corrected.
2016-05-18 12:16:20 +10:00
redmatrix
20cb4130d4
support work for a long-term fix for issue #390 , essentially one can specify a theme:schema string anywhere a theme is input. It will be honoured unless an existing schema setting over-rides this behaviour. This should also be backward compatible but the theme selection code has been cleaned up slightly and there may be subtle differences in behaviour after this commit. On my site this required a page refresh as the first page load after this change was a bit confused.
2016-05-17 17:46:30 -07:00
sasiflo
bfbe6c1660
Synchronization: Directory creation on sync import corrected.
2016-05-17 12:27:15 +02:00
redmatrix
883b1ff513
an issue related to #386
2016-05-16 19:23:42 -07:00
redmatrix
2dcedd6951
more work on sessions and cookies, as some anomalies appeared in caldav and firefox which suggested deeper issues
2016-05-16 17:07:39 -07:00
redmatrix
217db8f9b2
provide tools to extract a pdo constructor
2016-05-15 19:16:55 -07:00
redmatrix
ec81ef7b8d
issue #383
2016-05-14 21:04:19 -07:00
Mario Vavti
1e00fa79b3
change wording restricted -> custom selection and add a label to the select
2016-05-13 17:38:50 +02:00
Mario Vavti
573dea42d0
instead of radio buttons use select to choose between public and restricted acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible.
2016-05-13 16:22:43 +02:00
redmatrix
522fec5763
split off feed handling stuff from include/items
2016-05-12 20:21:04 -07:00
redmatrix
f2fc7d25c5
remove the rarely if ever used filter_insecure() function. We will provide this functionality in other ways.
2016-05-12 20:02:16 -07:00
redmatrix
781716277b
SECURITY: a comment to a private post that has been edited (the comment has been edited) loses its privacy settings. This comment isn't visible in the stream but may be visible in feeds.
2016-05-12 16:47:03 -07:00
redmatrix
32ad8bbaac
Ensure that channels can't be created with DAV reserved paths as a redress. Sabre mentions in several places that trying to change these paths to other strings; while possible - is unsupported and likely to cause problems. So for now, we're stuck with 'principals', 'addressbooks', and 'calendars'. If you already have these redresses on your site, you're basically buggered.
2016-05-11 17:18:17 -07: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
915bd2ec77
sabre upgrade
2016-05-10 19:40:15 -07: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
redmatrix
f658a3cae1
more work on diaspora relay
2016-05-09 20:17:59 -07:00
Treer
ef97e5a063
minor cleanup. No functional changes
2016-05-10 00:15:57 +10:00
Mario Vavti
61909d2480
if we do not have a layout $layout should be empty not default
2016-05-09 12:24:48 +02:00
Mario Vavti
7aeff7505b
remove unused code and whitespace
2016-05-09 12:09:04 +02: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
redmatrix
b6e0d8dee0
clean up some cruft
2016-05-08 20:19:23 -07:00
redmatrix
2a14c71128
convert media embed functions that deal with rewriting specific corporate services to addon hooks
2016-05-08 19:12:52 -07:00
Treer
e7a65c1f8d
improve non-ACL option description in ACL dialog
2016-05-08 20:44:30 +10:00
Mario Vavti
75128e8f68
make editblock use status_editor()
2016-05-07 23:05:48 +02:00
redmatrix
5882714e23
missed one other place where we called comanche outside the page build
2016-05-06 00:43:37 -07:00
redmatrix
7101bbedcb
objectify comanche
2016-05-05 23:07:35 -07:00
redmatrix
712b2b1bb2
comments
2016-05-05 22:02:46 -07: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
redmatrix
8ffdc4859b
replace app tagcloud with more traditional categories widget. One can always change this in the PDL
2016-05-05 00:45:38 -07:00
redmatrix
9eac9ef2b9
isolate all the tagadelic core code into a class and reuse it
2016-05-04 19:39:39 -07:00
redmatrix
566667a263
provide a tag cloud for app categories and allow filtering apps from this
2016-05-04 18:27:46 -07:00
redmatrix
1b6bc5394b
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-04 17:36:13 -07:00
redmatrix
50fb525b28
add categories to apps (wip)
2016-05-04 17:35:27 -07:00
Treer
e1e56936c9
add help to some permissions dialogs
2016-05-05 02:09:47 +10:00
Treer
33a8d845c1
Refine permissions dialog UI
2016-05-04 23:55:32 +10:00
redmatrix
7c57da3a28
Sync the current list of system apps with the built-in name translation table. Some of the names were changed in the past without the translation table being updated to reflect it.
2016-05-03 22:12:09 -07:00
redmatrix
191298ec93
more background work for app management - give every member a copy of all the system apps so that they can edit and delete them to taste/preference. This needs further work to pick up changes in system apps (additions, edits, deletions, etc.). Currently this is done once and never attempted again.
2016-05-03 20:37:05 -07:00
redmatrix
3df0bb5522
some preliminary structural work for app organisation
2016-05-03 18:41:16 -07:00
redmatrix
b371c028ad
more security stuff
2016-05-02 22:28:27 -07:00
redmatrix
2b7b26f4c0
a bit more oembed security - and document the shortcomings of this approach
2016-05-02 13:31:14 -07:00
redmatrix
559ed3f0a8
sort out the rest of the source categories
2016-05-02 01:18:18 -07:00
redmatrix
a10fe5f13e
a couple of bugfixes from earlier checkins and implementation of source tags
2016-05-01 22:45:38 -07:00
redmatrix
f284558007
use only the std_version
2016-05-01 19:29:30 -07:00
redmatrix
23bb4e8e15
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-01 19:20:09 -07:00
redmatrix
cd518625bf
some much needed work on oembed security
2016-05-01 19:19:17 -07:00
Mario Vavti
fa80a5c113
make weblink and attach button hideable and some minor fixes
2016-05-01 15:45:42 +02:00
redmatrix
84d93cca6e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-30 15:02:45 -07:00
redmatrix
9446d0cbb4
Merge pull request #362 from Treer/fontawesome
...
Update Font-Awesome to 4.6.1
2016-05-01 08:02:03 +10:00
Mario Vavti
c96b20c559
make mod editlayout use status_editor()
2016-04-30 21:56:52 +02:00
Treer
8f16e9ad33
update icon names in include/
2016-05-01 04:39:57 +10:00
git-marijus
80c9a8b8f6
Merge pull request #361 from Treer/bbcode
...
Add definition lists to bbcode
2016-04-30 19:24:43 +02:00
redmatrix
4c47d22f4b
trim engr_units string slight improvement to avoid subtle bugs
2016-04-29 23:47:13 -07:00
Mario Vavti
931a4fafe3
get rid of the unused ispublic variable
2016-04-29 21:38:36 +02:00
Treer
b5b21ecad7
improve whitespace control around definition list ([dl]) bbcode
2016-04-30 02:03:38 +10:00
Treer
9d079e5d2b
Add definition lists to bbcode
2016-04-30 01:13:34 +10:00
Mario Vavti
b797528b78
some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit
2016-04-29 13:18:42 +02:00
Mario Vavti
1fdac57d61
jot: cleanup unused variables
2016-04-29 09:58:44 +02:00
redmatrix
bb96f44861
allow engineering units (e.g. 400M, 1G) as service class limits
2016-04-28 21:02:27 -07:00
redmatrix
bdef71bda0
provide courtesy function for syncing one item. We'll probably be doing this a lot.
2016-04-27 21:26:52 -07:00
redmatrix
8e8df26066
Use / for album name in photo activities if no album present.
2016-04-27 13:25:58 -07:00
redmatrix
a67fa2651d
implement the singleton delivery stuff
2016-04-26 17:38:44 -07:00
redmatrix
509f25e46a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-26 16:14:10 -07:00
redmatrix
f99daf8ff9
move iconfig functions to include/config.php with all the rest of the configs, fix an issue with singleton discovery and start work on singleton delivery
2016-04-26 16:12:31 -07:00
Mario Vavti
ce50a429fa
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-04-26 11:41:23 +02:00
Mario Vavti
3446e68ac2
move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and add open tag to bbco_autocomplete
2016-04-26 11:41:08 +02:00
redmatrix
2e7028c976
some cleanup on the mysqli driver
2016-04-25 22:03:02 -07:00
redmatrix
d62f490814
Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date
...
Revert "remove global db variable"
This reverts commit c3b0c0f32a
.
2016-04-25 20:12:36 -07:00
redmatrix
c3b0c0f32a
remove global db variable
2016-04-25 16:55:33 -07:00
redmatrix
ce45a1cf94
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-23 16:57:32 -07:00
redmatrix
79c63e3cf4
this should work to call a hook for a string class method
2016-04-23 16:56:41 -07:00
redmatrix
df2990b27e
Class method support for hooks
2016-04-23 15:16:54 -07:00
Mario Vavti
b0a2e5d3f7
simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu.
2016-04-23 16:39:56 +02:00
redmatrix
540800da95
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-21 17:09:13 -07:00
redmatrix
1ff189ee90
new hook interface (the old one still works but requires handlers to have two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts.
2016-04-21 17:03:05 -07:00
Mario Vavti
d7f4bfedd5
some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
2016-04-21 23:03:09 +02:00
git-marijus
391ed8655e
Merge pull request #351 from anaqreon/toggle-context-help
...
Toggle context help
2016-04-21 18:44:50 +02:00
git-marijus
aa0c70e198
Merge pull request #348 from git-marijus/dev
...
add querystring to css and js which is added via head_add_{css, js}
2016-04-21 18:42:49 +02:00
Andrew Manning
82de68c3d3
Added admin/site setting that toggles context help panel. If disabled, original help menu button behavior is restored.
2016-04-21 06:41:55 -04:00
redmatrix
f00a701ad1
send the correct number of args
2016-04-20 19:56:01 -07:00
redmatrix
0d91f363cc
There is no longer a followup flag in the notifier. Remove all traces of it.
2016-04-20 19:03:56 -07:00
Andrew Manning
b96eb1c823
Merge branch 'dev' into toggle-context-help
2016-04-20 21:05:01 -04:00
redmatrix
2641980ac2
bb2d updates from testing signature changes
2016-04-20 01:40:09 -07:00
redmatrix
21b0128e9e
testing dmeta
2016-04-19 23:06:43 -07:00