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 |
|
zottel
|
d20fb3a31b
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-04 20:45:59 +02:00 |
|
redmatrix
|
b84f7cd37f
|
class functions called incorrectly
|
2016-06-04 03:32:03 -07:00 |
|
redmatrix
|
20a79c7acf
|
allow bbcode emojis (at least the single unicode character forms)
|
2016-06-03 22:00:53 -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
|
29a0a11b7e
|
some theming for emoji button
|
2016-06-03 11:03:01 +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 |
|
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 |
|
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 |
|
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
|
ca78374f30
|
remove unused tables
|
2016-05-30 22:41:45 -07:00 |
|
redmatrix
|
670e83b300
|
remove a bunch of unused stuff, some of which is orphaned and some which represents dead development efforts
|
2016-05-30 22:16:34 -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 |
|
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 |
|
Mario Vavti
|
d1efb59fcd
|
render code bbcode inline if there are no linebreaks in the text.
|
2016-05-30 16:12:48 +02:00 |
|
redmatrix
|
f2ebe41a50
|
undefined function
|
2016-05-29 20:18:28 -07:00 |
|
redmatrix
|
3b2679db29
|
fix remote_channel(), update php minversion requirement
|
2016-05-29 18:38:24 -07:00 |
|
redmatrix
|
ac4688eac0
|
allow objs to represent inventory
|
2016-05-27 23:57:47 -07:00 |
|
redmatrix
|
ab6eb1c4b2
|
strings update
|
2016-05-27 16:11:58 -07:00 |
|
redmatrix
|
0919c1eb61
|
check for session before querying session vars
|
2016-05-27 16:09:44 -07:00 |
|
redmatrix
|
551cf8ee94
|
link to hubchart site for site detail on pubsites page
|
2016-05-26 19:40:16 -07:00 |
|
redmatrix
|
61304d80d2
|
track down some issues from the application logs
|
2016-05-26 18:45:47 -07:00 |
|
redmatrix
|
1bce285eca
|
don't need quite so many backslashes
|
2016-05-26 17:51:59 -07:00 |
|
redmatrix
|
096fdfc61b
|
consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
|
2016-05-26 16:33:01 -07:00 |
|
redmatrix
|
8e4889bdf1
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-26 13:22:29 -07:00 |
|
redmatrix
|
7b91e551c4
|
kill off mcrypt
|
2016-05-26 13:21:43 -07:00 |
|
Mario Vavti
|
9d7abd58ac
|
another typo
|
2016-05-26 14:37:30 +02:00 |
|
Mario Vavti
|
24360fd191
|
check if $addonDir is a dir to silence warning if it does not exist
|
2016-05-26 14:33:10 +02:00 |
|
Mario Vavti
|
9017dcd0fd
|
typo
|
2016-05-26 14:23:17 +02:00 |
|