9410b63bbc
Revised permissions checks across API and enabled collaborative editing using the write_pages per-channel permission.
Andrew Manning
2016-06-08 06:26:27 -04:00
4234c9a194
Merge branch 'dev' into sabre32
Mario Vavti
2016-06-08 12:04:45 +02:00
d43a814385
Merge remote-tracking branch 'upstream/dev' into wiki
Andrew Manning
2016-06-08 05:41:13 -04:00
5ef8199dae
Finish the config family
redmatrix
2016-06-07 18:17:39 -07:00
e86e666c22
Javascript only allows saving a page if the content has changed.
Andrew Manning
2016-06-07 20:58:14 -04:00
cf180f6142
Merge remote-tracking branch 'upstream/dev' into wiki
Andrew Manning
2016-06-07 20:43:49 -04:00
67665a8b9d
slight alteration to the base description
redmatrix
2016-06-07 16:37:04 -07:00
a50e555515
'recent photos' query was buggered, also fix issue #163 by adding configurable sort order to the album widget - default is album name ascending
redmatrix
2016-06-07 16:23:14 -07:00
04518702d2
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-06-07 12:59:39 +02:00
75b97cafb0
Merge branch 'dev' into sabre32
Mario Vavti
2016-06-07 09:43:14 +02:00
037cd74e8e
rename admin/users to admin/accounts, provide sortable columns in account and channel summaries - issue #255
redmatrix
2016-06-06 19:44:22 -07:00
82a81cd01f
new utility: util/safemode (on or off); requires util/addons
redmatrix
2016-06-06 16:34:10 -07:00
2a6afeb9a7
I don't know how to make this any clearer: "For these reasons we strongly recommend that you do NOT install addons from third-party repositories."
redmatrix
2016-06-05 16:59:45 -07:00
08a9553ccc
Merge remote-tracking branch 'upstream/dev' into wiki
Andrew Manning
2016-06-05 16:52:02 -04:00
0a3fbdd128
Basic page reversion implemented. The revert button on the history view replaces the editor text but does not save the page.
Andrew Manning
2016-06-05 16:32:03 -04:00
cfbd2fc85c
Merge branch 'dev' into sabre32
Mario Vavti
2016-06-05 20:04:12 +02:00
dd6718c2cd
provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection
redmatrix
2016-06-04 18:10:42 -07:00
d5f72165fd
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-06-05 02:21:46 +02:00
c1a24d44a3
another switch of type and ttype
redmatrix
2016-06-04 17:17:48 -07:00
bf438f67e1
the :tone variants are messed up, remove them
redmatrix
2016-06-04 17:13:55 -07:00
81f6511d34
return of the project smilie
redmatrix
2016-06-04 17:09:37 -07:00
a6012af00d
For emojis in posts, extend smilies and save a lot of duplication of effort
redmatrix
2016-06-04 17:06:12 -07:00
f89b7ac9e1
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-06-05 01:48:27 +02:00
a0d339f208
short-term solution to emoji size issue - make them 32px from the sender
redmatrix
2016-06-04 15:53:30 -07:00
6cd348f155
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-06-05 00:21:06 +02:00
2c7ce20ccf
cross-site encoding issue with tags
redmatrix
2016-06-04 15:04:14 -07:00
4bc4fd5b7e
Page deletion implemented. Hide the delete button and disallow for Home page.
Andrew Manning
2016-06-04 18:00:32 -04:00
a92241d3cf
Merge remote-tracking branch 'upstream/dev' into wiki
Andrew Manning
2016-06-04 15:13:10 -04:00
344c293424
Wiki and page filenames are abstracted from their displayed names. Special characters do not seem to break things.
Andrew Manning
2016-06-04 15:12:04 -04:00
d20fb3a31b
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-06-04 20:45:59 +02:00
71cd6ef24b
class object call
redmatrix
2016-06-04 05:01:15 -07:00
9b87a249b9
class functions not called with an object
redmatrix
2016-06-04 03:34:55 -07:00
b84f7cd37f
class functions called incorrectly
redmatrix
2016-06-04 03:32:03 -07:00
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.
Andrew Manning
2016-06-04 06:26:41 -04:00
c08f428b5e
Merge remote-tracking branch 'upstream/dev' into wiki
Andrew Manning
2016-06-04 05:45:53 -04:00
20a79c7acf
allow bbcode emojis (at least the single unicode character forms)
redmatrix
2016-06-03 22:00:53 -07:00
a4474b49cb
make init static on master also
redmatrix
2016-06-03 20:22:20 -07:00
0333dca550
App::init() should be static
redmatrix
2016-06-03 19:46:48 -07:00
af4352adf2
need to set item_origin on locally created reactions so they propagate properly
redmatrix
2016-06-03 18:46:59 -07:00
1877df0e70
missed table rename in event query in mod_manage
redmatrix
2016-06-03 18:39:11 -07:00
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.
redmatrix
2016-06-03 18:13:21 -07:00
e81ac9e063
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
redmatrix
2016-06-03 16:04:54 -07:00
624f4641e2
missed an object -> obj conversion in prepare_body
redmatrix
2016-06-03 15:09:58 -07:00
8d6c2b5d4a
Merge branch 'dev' into sabre32
Mario Vavti
2016-06-03 11:03:44 +02:00
29a0a11b7e
some theming for emoji button
Mario Vavti
2016-06-03 11:03:01 +02:00
7582802f03
Merge branch 'dev' into sabre32
Mario Vavti
2016-06-03 09:40:37 +02:00
f8949ed5d1
restrict emoji reactions to the top level for now.
redmatrix
2016-06-02 22:12:56 -07:00
7ae376b6cd
menu entries for basic emoji support. I could use a bit of help theming this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions.
redmatrix
2016-06-02 22:06:19 -07:00
390ce207db
experimental emoji support
redmatrix
2016-06-02 20:31:34 -07:00
b93e398674
Merge remote-tracking branch 'upstream/dev' into wiki
Andrew Manning
2016-06-02 22:32:50 -04:00
b70c680964
Major corrections to access control and page construction.
Andrew Manning
2016-06-02 22:27:26 -04:00
f9075e2a2f
some initial emoji reaction work
redmatrix
2016-06-02 18:42:51 -07:00
e596bf025b
preserve app categories when updating a system app
redmatrix
2016-06-02 17:08:47 -07:00
4a3ec65409
adjust algorithm to ensure new system apps are installed.
redmatrix
2016-06-02 16:45:00 -07:00
0f1fcd9743
install system apps if a) they have never been installed, or b) if the app version changes
redmatrix
2016-06-02 16:38:15 -07:00
f23bdde464
Merge branch 'dev' into sabre32
Mario Vavti
2016-06-02 11:02:15 +02:00
05d9e1bee5
check all return values
redmatrix
2016-06-01 22:05:17 -07:00
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.
redmatrix
2016-06-01 21:48:54 -07:00
1f5529752f
Merge remote-tracking branch 'upstream/dev' into dev
zottel
2016-06-01 16:28:44 +02:00
c1039977f1
Merge branch 'dev' into sabre32
Mario Vavti
2016-06-01 09:15:56 +02:00
b1259876bf
more db column renames
redmatrix
2016-05-31 21:45:33 -07:00
dfb6255f59
more removal of reserved words from DB schemas
redmatrix
2016-05-31 17:50:47 -07:00
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.
redmatrix
2016-05-31 16:16:54 -07:00
701acf59e2
don't remove missing hooks while update_r1169 is happpening - temp fix
redmatrix
2016-05-31 13:22:47 -07:00
380f65d309
Merge branch 'dev' into sabre32
Mario Vavti
2016-05-31 11:01:24 +02:00
316fee93f7
Merge branch 'dev' into sabre32
Mario Vavti
2016-05-31 10:59:11 +02:00
670e83b300
remove a bunch of unused stuff, some of which is orphaned and some which represents dead development efforts
redmatrix
2016-05-30 22:16:34 -07:00
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.
redmatrix
2016-05-30 20:59:46 -07:00
6602ff83dd
start removing reserved words from database column names (this run: addon and hook)
redmatrix
2016-05-30 19:44:30 -07:00
8d284bab47
Created page history widget to dynamically fetch and display the git commit history for wiki pages.
Andrew Manning
2016-05-30 20:59:54 -04:00
490ab9e2c5
begin moving config to zotlabs. Leave procedural stubs for backward comaptibility
redmatrix
2016-05-30 16:42:29 -07:00
f35609d26c
redundant dev line from an earlier modification causes issue #404
redmatrix
2016-05-30 13:25:58 -07:00
82ec40dd80
Merge remote-tracking branch 'upstream/dev' into wiki
Andrew Manning
2016-05-30 15:00:50 -04:00
a52cdcb241
Replaced wiki item record object field with ActivityStreams information. Wiki git repo path is stored in iconfig instead.
Andrew Manning
2016-05-30 14:59:33 -04:00
d1efb59fcd
render code bbcode inline if there are no linebreaks in the text.
Mario Vavti
2016-05-30 16:12:48 +02:00
Andrew Manning
Mario Vavti
redmatrix
zottel
jeroenpraat