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
|
d5d5d78e3a
|
initial perms work
|
2016-06-09 16:16:56 -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 |
|