redmatrix
1267d995ef
db statement debugging
2016-06-22 19:08:59 -07:00
Mario Vavti
5536df51f5
erge branch 'dev' into sabre32
2016-06-22 09:58:55 +02:00
redmatrix
f48b12ff52
provide a skeleton of the current CalDAVClient with lots of notes about how best to move forward just in case anybody is feeling ambitious or anxious.
2016-06-21 20:44:55 -07:00
redmatrix
415a8d1e01
channel homepage not providing content when javascript disabled
2016-06-21 19:42:08 -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
ed16660867
code optimisation
2016-06-20 20:34:19 -07:00
redmatrix
3a43b1d85d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-06-20 13:43:36 -07:00
redmatrix
01bfadaeaa
fix siteinfo plugin list
2016-06-20 13:42:04 -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
Mario Vavti
17c5502330
missing backslash leading to wsod on xconfig changes
2016-06-20 21:45:15 +02:00
Andrew Manning
a3ec9f3940
Add formatted heading for revision comparison viewer
2016-06-20 13:27:05 -04:00
Andrew Manning
8cd9a1e4fc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-20 13:07:29 -04:00
Mario Vavti
178b440f05
Merge branch 'dev' into sabre32
2016-06-18 11:10:40 +02:00
redmatrix
22edd00211
"thing" always showing default url, not that supplied by the thing.
2016-06-17 21:26:25 -07:00
redmatrix
c81f6b9f6f
"thing" always showing default url, not that supplied by the thing.
2016-06-17 16:28:36 -07: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
28a7458e48
Merge branch 'dev' into sabre32
2016-06-16 10:26:47 +02:00
Andrew Manning
fc7c4e64ff
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-15 21:48:47 -04:00
redmatrix
976e32d3ae
translate already imported system apps
2016-06-15 16:25:24 -07:00
redmatrix
476116a972
translate already imported system apps
2016-06-15 16:24:45 -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
9a0dff08bc
Merge branch 'dev' into sabre32
2016-06-15 08:42:51 +02:00
redmatrix
212d8b6cfd
support cookie auth in Sabre DAV
2016-06-14 20:30:34 -07:00
redmatrix
ccfd028919
readme for the module directory, also provide an undocumented way to reset the timestamp on connection photos to force a refresh without messing with the database directly.
2016-06-14 17:04:29 -07: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
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
Andrew Manning
b5933e9d44
Photo embed button with album browser works in new post editor.
2016-06-12 19:41:37 -04: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
e109abbef7
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 07:17:23 -04:00
Mario Vavti
86985b454f
Merge branch 'dev' into sabre32
2016-06-10 12:22:01 +02:00
hubzilla
beb55235c6
Merge pull request #410 from anaqreon/wiki
...
Wiki module: first iteration
2016-06-10 20:03:08 +10:00
Mario Vavti
9d5d3a9468
Merge branch 'dev' into sabre32
2016-06-10 10:45:09 +02:00
redmatrix
bb3d56a0b2
foreach: invalid argument
2016-06-09 22:07:27 -07:00
Andrew Manning
7a242f829f
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-09 20:07:09 -04:00
redmatrix
0dcea87b99
namespace issue with openid reverse auth
2016-06-09 16:20:16 -07:00
redmatrix
a10f5e9e06
allow an exclusion for transmitting hidden file activities. There may be a better way to do this, but it was pointed out recently that transmitting some hidden activities might cause a problem. I cannot locate the conversation at the moment to summarise the exact issue.
2016-06-09 16:11:58 -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
Mario Vavti
4234c9a194
Merge branch 'dev' into sabre32
2016-06-08 12:04:45 +02:00
Andrew Manning
d43a814385
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-08 05:41:13 -04: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
Mario Vavti
75b97cafb0
Merge branch 'dev' into sabre32
2016-06-07 09:43:14 +02: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
Mario Vavti
b886a40471
Merge branch 'dev' into sabre32
2016-06-06 09:39:56 +02:00
redmatrix
adecd2960e
move pconfig to static class
2016-06-05 22:18:17 -07:00
redmatrix
9afecaaffe
We need a laugh icon more than we need a cry icon.
2016-06-05 20:16:33 -07:00
Andrew Manning
2af8105b46
Hide page history viewer when viewing sandbox
2016-06-05 21:14:30 -04:00
Andrew Manning
b8b50bdb5a
Custom commit message available. Improved history viewer and feedback from revert buttons.
2016-06-05 20:30:45 -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
Mario Vavti
cfbd2fc85c
Merge branch 'dev' into sabre32
2016-06-05 20:04:12 +02:00
redmatrix
a0d339f208
short-term solution to emoji size issue - make them 32px from the sender
2016-06-04 15:53:30 -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
a92241d3cf
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-04 15:13:10 -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
redmatrix
b84f7cd37f
class functions called incorrectly
2016-06-04 03:32:03 -07: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
af4352adf2
need to set item_origin on locally created reactions so they propagate properly
2016-06-03 18:46:59 -07:00
redmatrix
1877df0e70
missed table rename in event query in mod_manage
2016-06-03 18:39:11 -07:00
redmatrix
a7e5e3d574
allow any (current) emoji to be displayed on any site, and provide a default list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.
2016-06-03 18:13:21 -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
Mario Vavti
7582802f03
Merge branch 'dev' into sabre32
2016-06-03 09:40:37 +02:00
redmatrix
390ce207db
experimental emoji support
2016-06-02 20:31:34 -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
e596bf025b
preserve app categories when updating a system app
2016-06-02 17:08:47 -07:00
redmatrix
4a3ec65409
adjust algorithm to ensure new system apps are installed.
2016-06-02 16:45:00 -07:00
redmatrix
0f1fcd9743
install system apps if a) they have never been installed, or b) if the app version changes
2016-06-02 16:38:15 -07:00
Mario Vavti
f23bdde464
Merge branch 'dev' into sabre32
2016-06-02 11:02:15 +02: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
Mario Vavti
c1039977f1
Merge branch 'dev' into sabre32
2016-06-01 09:15:56 +02: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
Mario Vavti
316fee93f7
Merge branch 'dev' into sabre32
2016-05-31 10:59:11 +02:00
redmatrix
ca78374f30
remove unused tables
2016-05-30 22:41:45 -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
Andrew Manning
82ec40dd80
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-30 15:00:50 -04: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
6d4adfcedc
Merge branch 'dev' into sabre32
2016-05-30 10:08:13 +02:00
redmatrix
f2ebe41a50
undefined function
2016-05-29 20:18:28 -07: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
a3dfdd9d38
Remove Parsedown library files and remove references.
2016-05-29 20:44:28 -04:00
Andrew Manning
00d32f6b94
Only show wiki delete control if channel owner
2016-05-29 20:39:19 -04:00
Andrew Manning
fad27fc1e7
Hide page controls when not owner. Fixed some serious access control issues.
2016-05-29 20:16:17 -04:00
Andrew Manning
3e6af5c876
Hacked Parsedown and Markdown to add class inline-code to <code> blocks for proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
2016-05-29 17:06:45 -04:00
Andrew Manning
df7772e301
Home page create with new wiki. URL redirects here when no page given. Fixed bug with author in wiki item table record.
2016-05-29 13:33:52 -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