zottel
|
d5f72165fd
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-05 02:21:46 +02: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 |
|
zottel
|
f89b7ac9e1
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-05 01:48:27 +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 |
|
zottel
|
6cd348f155
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-05 00:21:06 +02: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
|
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 |
|
zottel
|
d20fb3a31b
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-04 20:45:59 +02:00 |
|
redmatrix
|
71cd6ef24b
|
class object call
|
2016-06-04 05:01:15 -07:00 |
|
redmatrix
|
9b87a249b9
|
class functions not called with an object
|
2016-06-04 03:34:55 -07: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
|
20a79c7acf
|
allow bbcode emojis (at least the single unicode character forms)
|
2016-06-03 22:00:53 -07:00 |
|
redmatrix
|
a4474b49cb
|
make init static on master also
|
2016-06-03 20:22:20 -07:00 |
|
redmatrix
|
0333dca550
|
App::init() should be static
|
2016-06-03 19:46:48 -07: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 |
|
redmatrix
|
624f4641e2
|
missed an object -> obj conversion in prepare_body
|
2016-06-03 15:09:58 -07:00 |
|
redmatrix
|
dcba30a6aa
|
strings
|
2016-06-03 14:52:00 -07:00 |
|
Mario Vavti
|
25aded6b9b
|
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
|
2016-06-03 11:04:16 +02:00 |
|
Mario Vavti
|
8d6c2b5d4a
|
Merge branch 'dev' into sabre32
|
2016-06-03 11:03:44 +02:00 |
|
Mario Vavti
|
29a0a11b7e
|
some theming for emoji button
|
2016-06-03 11:03:01 +02:00 |
|
Mario Vavti
|
7582802f03
|
Merge branch 'dev' into sabre32
|
2016-06-03 09:40:37 +02:00 |
|
redmatrix
|
f8949ed5d1
|
restrict emoji reactions to the top level for now.
|
2016-06-02 22:12:56 -07:00 |
|
redmatrix
|
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.
|
2016-06-02 22:06:19 -07: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
|
f9075e2a2f
|
some initial emoji reaction work
|
2016-06-02 18:42:51 -07: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
|
05d9e1bee5
|
check all return values
|
2016-06-01 22:05:17 -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 |
|
zottel
|
1f5529752f
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-01 16:28:44 +02:00 |
|
Mario Vavti
|
b4eb9f2a11
|
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
|
2016-06-01 10:00:44 +02: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 |
|
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 |
|