redmatrix
47fc0c7958
add new connection to default group when auto-accepted
2016-06-15 05:28:16 -07:00
Andrew Manning
688171d016
Rename page feature added. Fixed bug in git commit function and other minor fixes.
2016-06-15 06:25:31 -04:00
Mario Vavti
5c458e9111
Merge branch 'dev' into sabre32
2016-06-14 09:42:43 +02:00
redmatrix
0ef2622621
some work to provide propagation and honouring of the item_notshown flag.
2016-06-13 22:09:22 -07:00
redmatrix
1ff9abe1b4
missing iconfig conversion
2016-06-13 21:16:36 -07:00
redmatrix
1e68d4fb75
deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
2016-06-13 19:58:24 -07:00
Mario Vavti
e963714ad6
Merge branch 'dev' into sabre32
2016-06-13 09:18:39 +02:00
hubzilla
b18b9464a4
Merge pull request #416 from anaqreon/embedphotos
...
Add embed photos button with album browser to new post editor
2016-06-13 10:15:09 +10:00
redmatrix
7abfe716b4
DB schema issue with import
2016-06-12 16:35:17 -07:00
redmatrix
81b3c59711
DB schema issue with import
2016-06-12 16:34:27 -07:00
Andrew Manning
410f5389ae
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 15:18:43 -07:00
Andrew Manning
a1183bf09a
Merge remote-tracking branch 'upstream/dev' into embedphotos
2016-06-12 14:38:48 -04:00
Andrew Manning
e109abbef7
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 07:17:23 -04:00
redmatrix
f41380de77
remove debugging
2016-06-11 15:28:52 -07:00
redmatrix
0e0a6f5f8d
Work supporting issue #411 , add an optional priority (int) as a second arg to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other
...
ordering.
2016-06-11 15:23:13 -07:00
Mario Vavti
bdbbe00bdf
Merge branch 'dev' into sabre32
2016-06-11 20:12:41 +02:00
redmatrix
96cd63cf1a
iconfig sharing not set correctly
2016-06-10 22:41:58 -07:00
Mario Vavti
86985b454f
Merge branch 'dev' into sabre32
2016-06-10 12:22:01 +02:00
Andrew Manning
7a242f829f
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-09 20:07:09 -04:00
Andrew Manning
7fc2b13fe6
Stashing changes. Not a functional state.
2016-06-09 20:06:36 -04:00
Mario Vavti
85e82e919e
more style work
2016-06-09 22:05:52 +02:00
redmatrix
40bba93a31
potential fix to hubzilla-addons issue 16
2016-06-08 19:34:11 -07:00
Andrew Manning
9410b63bbc
Revised permissions checks across API and enabled collaborative editing using the write_pages per-channel permission.
2016-06-08 06:26:27 -04:00
Andrew Manning
d43a814385
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-08 05:41:13 -04:00
redmatrix
e46e7002a8
block random_profile from accessing sys channels
2016-06-07 22:55:24 -07:00
redmatrix
5ef8199dae
Finish the config family
2016-06-07 18:17:39 -07:00
Andrew Manning
cf180f6142
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-07 20:43:49 -04:00
redmatrix
a50e555515
'recent photos' query was buggered, also fix issue #163 by adding configurable sort order to the album widget - default is album name ascending
2016-06-07 16:23:14 -07:00
redmatrix
037cd74e8e
rename admin/users to admin/accounts, provide sortable columns in account and channel summaries - issue #255
2016-06-06 19:44:22 -07:00
redmatrix
adecd2960e
move pconfig to static class
2016-06-05 22:18:17 -07:00
Andrew Manning
4528becf4c
Remove debugging logger statements
2016-06-05 20:52:40 -04:00
Andrew Manning
08a9553ccc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-05 16:52:02 -04:00
Andrew Manning
0a3fbdd128
Basic page reversion implemented. The revert button on the history view replaces the editor text but does not save the page.
2016-06-05 16:32:03 -04:00
redmatrix
dd6718c2cd
provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection
2016-06-04 18:10:42 -07:00
redmatrix
c1a24d44a3
another switch of type and ttype
2016-06-04 17:17:48 -07:00
redmatrix
bf438f67e1
the :tone variants are messed up, remove them
2016-06-04 17:13:55 -07:00
redmatrix
81f6511d34
return of the project smilie
2016-06-04 17:09:37 -07:00
redmatrix
a6012af00d
For emojis in posts, extend smilies and save a lot of duplication of effort
2016-06-04 17:06:12 -07:00
redmatrix
2c7ce20ccf
cross-site encoding issue with tags
2016-06-04 15:04:14 -07:00
Andrew Manning
4bc4fd5b7e
Page deletion implemented. Hide the delete button and disallow for Home page.
2016-06-04 18:00:32 -04:00
Andrew Manning
344c293424
Wiki and page filenames are abstracted from their displayed names. Special characters do not seem to break things.
2016-06-04 15:12:04 -04:00
Andrew Manning
b5d8443f59
Created three distinct names for wiki and page that are suitable for URL, HTML, and raw display. Implemented in new wiki POST activity only so far.
2016-06-04 06:26:41 -04:00
Andrew Manning
c08f428b5e
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-04 05:45:53 -04:00
redmatrix
20a79c7acf
allow bbcode emojis (at least the single unicode character forms)
2016-06-03 22:00:53 -07:00
redmatrix
e81ac9e063
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
2016-06-03 16:04:54 -07:00
redmatrix
624f4641e2
missed an object -> obj conversion in prepare_body
2016-06-03 15:09:58 -07:00
Andrew Manning
b93e398674
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-02 22:32:50 -04:00
Andrew Manning
b70c680964
Major corrections to access control and page construction.
2016-06-02 22:27:26 -04:00
redmatrix
f9075e2a2f
some initial emoji reaction work
2016-06-02 18:42:51 -07:00
redmatrix
a9d7acda27
the rest of the schema updates - WARNING: some third party plugins may fail; e.g. embedphotos and chess. $item['object'] is now $item['obj'] and $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale'] and $photo['data'] is now $photo['content']. There are a number of other changes, but these are the ones noted to cause issues with third-party plugins. The project plugins have been updated. Please note any new issues as this effort touched a lot of code in a lot of files.
2016-06-01 21:48:54 -07:00
redmatrix
b1259876bf
more db column renames
2016-05-31 21:45:33 -07:00
redmatrix
dfb6255f59
more removal of reserved words from DB schemas
2016-05-31 17:50:47 -07:00
redmatrix
00b4843425
provide a sort of mutex lock around db logging so it can't possibly recurse. Previous attempts to do something similar using other methods haven't worked out satisfactorily.
2016-05-31 16:16:54 -07:00
redmatrix
701acf59e2
don't remove missing hooks while update_r1169 is happpening - temp fix
2016-05-31 13:22:47 -07:00
redmatrix
44d3dadb03
don't update hubloc_connected any more often than 15 minutes. We don't require that level of granularity and the frequent writes are causing issues with the stability of that table.
2016-05-30 20:59:46 -07:00
redmatrix
9e9f2e13fe
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-30 19:49:15 -07:00
redmatrix
6602ff83dd
start removing reserved words from database column names (this run: addon and hook)
2016-05-30 19:44:30 -07:00
Andrew Manning
8d284bab47
Created page history widget to dynamically fetch and display the git commit history for wiki pages.
2016-05-30 20:59:54 -04:00
redmatrix
490ab9e2c5
begin moving config to zotlabs. Leave procedural stubs for backward comaptibility
2016-05-30 16:42:29 -07:00
hubzilla
0757dbf07f
Merge pull request #405 from git-marijus/dev
...
render code bbcode inline if there are no linebreaks in the text.
2016-05-31 09:07:22 +10:00
redmatrix
f35609d26c
redundant dev line from an earlier modification causes issue #404
2016-05-30 13:25:58 -07:00
Andrew Manning
a52cdcb241
Replaced wiki item record object field with ActivityStreams information. Wiki git repo path is stored in iconfig instead.
2016-05-30 14:59:33 -04:00
Mario Vavti
d1efb59fcd
render code bbcode inline if there are no linebreaks in the text.
2016-05-30 16:12:48 +02:00
Andrew Manning
8f0c3f0e9b
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-29 21:45:54 -04:00
redmatrix
3b2679db29
fix remote_channel(), update php minversion requirement
2016-05-29 18:38:24 -07:00
Andrew Manning
4b350b9090
Fixed bug in access control. Hide new wiki/page buttons if not channel owner.
2016-05-29 21:23:56 -04:00
Andrew Manning
00d32f6b94
Only show wiki delete control if channel owner
2016-05-29 20:39:19 -04:00
Andrew Manning
75b169f391
Fixed bug where page file was not loaded because of urlencoding/urldecoding
2016-05-29 13:50:32 -04:00
Andrew Manning
63a97ff6fc
Git commit made for the page edits when the page is saved.
2016-05-29 10:18:26 -04:00
Andrew Manning
ab54bf5149
Wiki pages can be saved.
2016-05-28 15:11:19 -04:00
Andrew Manning
7393dccde8
Page content is loaded from the file on disk
2016-05-28 12:33:07 -04:00
Andrew Manning
ae94e8a855
Wiki page list links work. File content is not yet loaded into the editor. Removed some logger calls.
2016-05-28 07:42:18 -04:00
Andrew Manning
f884fa6678
Wiki page list is fetched and the page widget is updated
2016-05-28 07:17:42 -04:00
Andrew Manning
4691c3ec01
Add new page to wiki and redirect to editor page.
2016-05-27 22:19:05 -04:00
Andrew Manning
ca78ebce6d
Check if wiki exists and redirect if it does not
2016-05-27 20:37:37 -04:00
Andrew Manning
97e6b7c4ba
Wiki deletion works
2016-05-27 20:20:33 -04:00
Andrew Manning
d554681174
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-27 06:35:15 -04:00
redmatrix
61304d80d2
track down some issues from the application logs
2016-05-26 18:45:47 -07:00
redmatrix
096fdfc61b
consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
2016-05-26 16:33:01 -07:00
redmatrix
7b91e551c4
kill off mcrypt
2016-05-26 13:21:43 -07:00
redmatrix
2f64684299
some event fixes, also change jquery-textcomplete to un-minified since the minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
2016-05-25 20:06:21 -07:00
redmatrix
66b6f8c0ff
app rendering issues, typo in class name and could not find icon 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
2016-05-25 17:30:15 -07:00
redmatrix
0d8dcdbbc9
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-25 13:46:55 -07:00
redmatrix
da19ac98dd
Just set it and forget it.
2016-05-25 13:46:19 -07:00
Mario Vavti
9908a7193a
remove the add others button for now - after some research it turned out not beeing so useful
2016-05-25 14:31:58 +02:00
redmatrix
c37eaff263
require token signatures in zot_refresh, also move channel specific stuff into include/channel.php from include/connections.php
2016-05-24 23:05:00 -07:00
redmatrix
80f2ba640e
code cleanup
2016-05-24 20:49:23 -07:00
redmatrix
f9a295a236
Add space between project name and server type
2016-05-24 19:25:10 -07:00
redmatrix
516c43ba15
more work associated with DBA and index.php shuffle
2016-05-24 17:54:45 -07:00
redmatrix
84ba6393ad
relocate index and db
2016-05-24 16:36:55 -07:00
Andrew Manning
e00b8a7082
Delete wiki (in progress)
2016-05-24 06:15:42 -04:00
redmatrix
29ba891809
moved enotify
2016-05-24 01:25:13 -07:00
redmatrix
bbc71343bd
change the signed token format. We don't folks to be able to submit random text for signing by us, as they could then use these to generate known signatures.
2016-05-22 22:44:13 -07:00
redmatrix
1aa3051e97
move chatroom stuff to zlib
2016-05-22 20:54:52 -07:00
redmatrix
2d06663490
move apps to zlib
2016-05-22 19:25:27 -07:00
redmatrix
5e0698ba87
turn the oft-repeated block_public ... check into a function observer_prohibited()
2016-05-22 17:52:30 -07:00
redmatrix
de006771c7
renamed include files identity.php (channel.php) and Contact.php (connections.php)
2016-05-22 16:54:30 -07:00
Andrew Manning
a36bef7979
List of wikis populates with links according to observer permissions.
2016-05-21 21:55:09 -04:00
redmatrix
1cb311cef9
finish updating zot_finger instances
2016-05-21 18:18:33 -07:00
redmatrix
ed56b6e67b
first cut at zot-finger request signatures
2016-05-21 18:02:14 -07:00
Andrew Manning
049147a9d7
Successful new wiki git repo and item table record
2016-05-21 19:02:23 -04:00
Andrew Manning
c6aa42773a
Trying to fix wiki branch starting fresh from dev
2016-05-21 14:56:42 -04: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
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
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
cae380f068
case issue
2016-05-20 01:21:19 -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
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
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
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
0d04a1221a
issue #386 (master)
2016-05-16 19:38:38 -07: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
b14dd0e066
issue #383
2016-05-14 21:05:24 -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
2d79e75788
SECURITY: edited comment to private post loses privacy info. Not visible in stream but may be visible in feeds
2016-05-12 16:51:20 -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
redmatrix
d07afb54e4
rework bb2diaspora for eradicating the diaspora comment virus
2016-04-19 21:43:12 -07:00
Mario Vavti
6941fbb182
add querystring to css and js which is added via head_add_{css, js}
2016-04-19 13:38:06 +02:00
Andrew Manning
7594796ee1
Try toggling context help using onclick attribute
2016-04-19 05:52:16 -04:00
redmatrix
2a4e8972e0
module updates
2016-04-18 20:38:38 -07:00
redmatrix
d1ecf3f323
some issues with GNU-Social's implementation of events in feeds. The summary element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later.
2016-04-18 00:59:42 -07:00
redmatrix
521d404013
remove the date hack on public feeds which was a temporary fix for an issue limiting the number of posts returned and no longer needed.
2016-04-17 16:37:44 -07:00
redmatrix
521641f3a8
filter out a bit more dreport noise - especially for private posts to multiple recipients.
2016-04-14 21:53:39 -07:00
redmatrix
a8f7af2079
provide general purpose verification class, remove include/session.php (no longer used)
2016-04-14 18:51:06 -07:00
redmatrix
ed0bff798b
fix marked bug in code
2016-04-13 22:58:37 -07:00
redmatrix
5cb3143c04
issue #331 use timeago.js for reshared publish date instead of relative_date() which does not play well with other networks.
2016-04-10 21:30:35 -07:00
redmatrix
d1a2aecfa0
move more session related stuff such as paranoia handling (IP address changes) into the session object and extend remember_me cookies once a day so that they will never expire (theoretically). The DB session driver will extend its expiration on every session write (in the case of persistent sessions).
2016-04-10 19:20:41 -07:00
redmatrix
e9f1bac062
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-10 17:03:30 -07:00
redmatrix
abfbe9c937
a few issues: block public not blocking mod_cal, typo in sql for one clone file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session.
2016-04-10 16:56:08 -07:00
Mario Vavti
e2b4d33627
some work on comanche autocomplete
2016-04-09 12:16:42 +02:00
redmatrix
9b66b5eee3
objectify all the session management stuff
2016-04-08 04:44:10 -07:00
redmatrix
279f32b13d
send file sync packets for all known file operations
2016-04-07 18:54:48 -07:00
redmatrix
3a6187af3d
implement updates of attach data to sync'd clones.
2016-04-07 16:44:53 -07:00
redmatrix
aa678ba0ff
reset profile photo and cover photo bits for existing photos if a new one arrives from a clone
2016-04-06 22:14:05 -07:00
redmatrix
e4391e6336
missing profile photo in export data
2016-04-06 21:36:47 -07:00
redmatrix
aa0412d83b
use the explicit form of build_sync_packet so that file/photo sync will work even when the actual observer is a guest (with permission to upload).
2016-04-06 20:25:52 -07:00
redmatrix
861f5232d3
more work on file sync to clones, 60-70% test coverage, mostly working but many changes made during testing which themselves have not yet been tested
2016-04-06 19:56:38 -07:00
redmatrix
9831ad515d
file sync testing continued
2016-04-06 18:46:29 -07:00
redmatrix
6650916435
file sync testing
2016-04-06 18:38:48 -07:00
redmatrix
29363a185d
file sync work
2016-04-06 18:07:29 -07:00
redmatrix
a20ef706fd
issue #340
2016-04-06 05:44:40 -07:00
redmatrix
adad8f2ebc
getting file sync data - missed parent folder
2016-04-06 05:20:55 -07:00
redmatrix
fb9c12df15
rework the "remember me" fix to be a bit less hackish
2016-04-06 02:33:11 -07:00
redmatrix
5a2a8717e3
provide function to collect file/photo sync data per help/filesync
2016-04-05 23:11:24 -07:00
redmatrix
0d50d29538
Merge branch 'master' into dev
2016-04-05 22:15:29 -07:00
redmatrix
54aa998b52
undeclared static property App::$stringsave (push_lang() and pop_lang())
2016-04-05 22:13:56 -07:00
redmatrix
fd07940b10
provide stream resource pointer option to z_fetch_url() and z_post_url() per earlier doco commit on syncing files/photos across clones.
2016-04-05 18:24:24 -07:00
Mario Vavti
bd29551f9a
fix contextual help
2016-04-05 16:59:32 +02:00
redmatrix
ec41170121
Merge pull request #338 from anaqreon/contextual-help
...
Contextual help
2016-04-05 22:43:15 +10:00
redmatrix
222ace3770
For GNU-social discovery, use the URI in the feed (author.uri) rather than try to pick out which of the aliases in webfinger are likely to be the right one. If we get it wrong, our communications with them will be discarded and there is no rhyme or reason to the logic about which representation is likely to be the one true account URI. It appears to vary with the clean_url setting of the site and this info isn't available to us except with a sequence of expensive probes and testing various ways of re-writing URLs to see if we get a response.
2016-04-03 20:55:38 -07:00
