redmatrix
ec8091a102
use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able.
2016-06-22 18:00:18 -07:00
Mario Vavti
5536df51f5
erge branch 'dev' into sabre32
2016-06-22 09:58:55 +02:00
redmatrix
2a840460dd
vcard spec changes
2016-06-21 19:25:14 -07:00
redmatrix
b593c3a9b9
1. provide automatic relocation of important links in items that are imported or synced to clones
...
2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O.
3. item_store and item_store_update now return the item that was stored
2016-06-21 18:24:36 -07:00
Mario Vavti
ecae0b3d97
Merge branch 'dev' into sabre32
2016-06-21 10:08:49 +02:00
redmatrix
63423c8ee1
make sure the optimisations are reliable
2016-06-20 20:56:58 -07:00
redmatrix
ed16660867
code optimisation
2016-06-20 20:34:19 -07:00
redmatrix
9c9d6363af
update attach on import if exists
2016-06-20 19:39:12 -07:00
hubzilla
670d12219b
Merge pull request #429 from anaqreon/wiki
...
Wiki page revision comparison viewer
2016-06-21 06:23:58 +10:00
Mario Vavti
545219b839
Merge branch 'dev' into sabre32
2016-06-20 21:47:49 +02:00
Mario Vavti
985fb44424
Merge branch 'master' into dev
2016-06-20 21:46:33 +02:00
Andrew Manning
8cd9a1e4fc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-20 13:07:29 -04:00
Mario Vavti
e40112b40d
Merge branch 'dev' into sabre32
2016-06-20 09:31:27 +02:00
redmatrix
fb61c4fb34
Merge branch '1.8RC'
2016-06-19 19:12:33 -07:00
redmatrix
30841d9470
Don't use count() to check DB results
2016-06-19 18:57:56 -07:00
Oda
5b92922516
When picktime is false, close date selector on date select
2016-06-18 23:03:06 -03:00
Mario Vavti
178b440f05
Merge branch 'dev' into sabre32
2016-06-18 11:10:40 +02:00
redmatrix
2e7606f569
the text link to a thing will take you to the local thing page, both as a link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
2016-06-17 21:44:08 -07:00
redmatrix
2793086c0d
1. string update, 2. pretty print json blobs
2016-06-17 14:58:03 -07:00
Andrew Manning
80d3a831f3
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-17 06:36:09 -04:00
Andrew Manning
961539258b
Wiki page revision comparison tool with diff displayed in modal dialog. Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
2016-06-17 06:33:39 -04:00
Mario Vavti
0324bc5cf0
Merge branch 'dev' into sabre32
2016-06-17 10:04:27 +02:00
redmatrix
f6d7628254
core changes to better support media migrations
2016-06-16 20:16:39 -07:00
Mario Vavti
28a7458e48
Merge branch 'dev' into sabre32
2016-06-16 10:26:47 +02:00
redmatrix
a2a87fec54
code comments
2016-06-15 22:36:00 -07:00
redmatrix
d457f11717
custom request methods for curl
2016-06-15 21:25:26 -07:00
redmatrix
bc5f73e6c3
provide a default for undefined languages
2016-06-15 20:51:55 -07:00
redmatrix
1dc35db1fe
ignore case in language names and add 'js' as an alias for 'javascript'
2016-06-15 20:25:19 -07:00
hubzilla
e0b705fd54
Merge pull request #422 from anaqreon/wiki
...
Wiki rename page feature added. Bug fixes related to git commits.
2016-06-16 13:01:49 +10:00
redmatrix
854c23a751
This was the reason for the large line widths - an extra linefeed after each li element
2016-06-15 19:59:30 -07:00
redmatrix
fa48de33c2
provide syntax based [colour] highlighting on code blocks for popular languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
2016-06-15 19:44:15 -07:00
Andrew Manning
fc7c4e64ff
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-15 21:48:47 -04:00
Mario Vavti
05ed20d336
Merge branch 'dev' into sabre32
2016-06-15 17:34:03 +02:00
redmatrix
ef1c01d968
add new connection to default group when auto-accepted
2016-06-15 05:30:03 -07:00
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
