Andrew Manning
|
a1183bf09a
|
Merge remote-tracking branch 'upstream/dev' into embedphotos
|
2016-06-12 14:38:48 -04: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 |
|
redmatrix
|
f41380de77
|
remove debugging
|
2016-06-11 15:28:52 -07:00 |
|
redmatrix
|
0e0a6f5f8d
|
Work supporting issue #411, add an optional priority (int) as a second arg to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other
ordering.
|
2016-06-11 15:23:13 -07:00 |
|
redmatrix
|
96cd63cf1a
|
iconfig sharing not set correctly
|
2016-06-10 22:41:58 -07:00 |
|
Andrew Manning
|
7a242f829f
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-09 20:07:09 -04:00 |
|
Andrew Manning
|
7fc2b13fe6
|
Stashing changes. Not a functional state.
|
2016-06-09 20:06:36 -04:00 |
|
redmatrix
|
40bba93a31
|
potential fix to hubzilla-addons issue 16
|
2016-06-08 19:34:11 -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 |
|
Andrew Manning
|
d43a814385
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-08 05:41:13 -04:00 |
|
redmatrix
|
e46e7002a8
|
block random_profile from accessing sys channels
|
2016-06-07 22:55:24 -07: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 |
|
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 |
|
redmatrix
|
adecd2960e
|
move pconfig to static class
|
2016-06-05 22:18:17 -07:00 |
|
Andrew Manning
|
4528becf4c
|
Remove debugging logger statements
|
2016-06-05 20:52:40 -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 |
|
redmatrix
|
dd6718c2cd
|
provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection
|
2016-06-04 18:10:42 -07: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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
d1efb59fcd
|
render code bbcode inline if there are no linebreaks in the text.
|
2016-05-30 16:12:48 +02: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
|
00d32f6b94
|
Only show wiki delete control if channel owner
|
2016-05-29 20:39:19 -04:00 |
|
Andrew Manning
|
75b169f391
|
Fixed bug where page file was not loaded because of urlencoding/urldecoding
|
2016-05-29 13:50:32 -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 |
|
Andrew Manning
|
7393dccde8
|
Page content is loaded from the file on disk
|
2016-05-28 12:33:07 -04:00 |
|
Andrew Manning
|
ae94e8a855
|
Wiki page list links work. File content is not yet loaded into the editor. Removed some logger calls.
|
2016-05-28 07:42:18 -04:00 |
|
Andrew Manning
|
f884fa6678
|
Wiki page list is fetched and the page widget is updated
|
2016-05-28 07:17:42 -04:00 |
|
Andrew Manning
|
4691c3ec01
|
Add new page to wiki and redirect to editor page.
|
2016-05-27 22:19:05 -04:00 |
|
Andrew Manning
|
ca78ebce6d
|
Check if wiki exists and redirect if it does not
|
2016-05-27 20:37:37 -04:00 |
|
Andrew Manning
|
97e6b7c4ba
|
Wiki deletion works
|
2016-05-27 20:20:33 -04:00 |
|
Andrew Manning
|
d554681174
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-05-27 06:35:15 -04:00 |
|
redmatrix
|
61304d80d2
|
track down some issues from the application logs
|
2016-05-26 18:45:47 -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
|
7b91e551c4
|
kill off mcrypt
|
2016-05-26 13:21:43 -07:00 |
|
redmatrix
|
2f64684299
|
some event fixes, also change jquery-textcomplete to un-minified since the minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
|
2016-05-25 20:06:21 -07:00 |
|
redmatrix
|
66b6f8c0ff
|
app rendering issues, typo in class name and could not find icon 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
|
2016-05-25 17:30:15 -07:00 |
|
redmatrix
|
0d8dcdbbc9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-25 13:46:55 -07:00 |
|
redmatrix
|
da19ac98dd
|
Just set it and forget it.
|
2016-05-25 13:46:19 -07:00 |
|
Mario Vavti
|
9908a7193a
|
remove the add others button for now - after some research it turned out not beeing so useful
|
2016-05-25 14:31:58 +02:00 |
|
redmatrix
|
c37eaff263
|
require token signatures in zot_refresh, also move channel specific stuff into include/channel.php from include/connections.php
|
2016-05-24 23:05:00 -07:00 |
|
redmatrix
|
80f2ba640e
|
code cleanup
|
2016-05-24 20:49:23 -07:00 |
|
redmatrix
|
f9a295a236
|
Add space between project name and server type
|
2016-05-24 19:25:10 -07:00 |
|
redmatrix
|
516c43ba15
|
more work associated with DBA and index.php shuffle
|
2016-05-24 17:54:45 -07:00 |
|
redmatrix
|
84ba6393ad
|
relocate index and db
|
2016-05-24 16:36:55 -07:00 |
|
Andrew Manning
|
e00b8a7082
|
Delete wiki (in progress)
|
2016-05-24 06:15:42 -04:00 |
|
redmatrix
|
29ba891809
|
moved enotify
|
2016-05-24 01:25:13 -07:00 |
|
redmatrix
|
bbc71343bd
|
change the signed token format. We don't folks to be able to submit random text for signing by us, as they could then use these to generate known signatures.
|
2016-05-22 22:44:13 -07:00 |
|
redmatrix
|
1aa3051e97
|
move chatroom stuff to zlib
|
2016-05-22 20:54:52 -07:00 |
|
redmatrix
|
2d06663490
|
move apps to zlib
|
2016-05-22 19:25:27 -07:00 |
|
redmatrix
|
5e0698ba87
|
turn the oft-repeated block_public ... check into a function observer_prohibited()
|
2016-05-22 17:52:30 -07:00 |
|
redmatrix
|
de006771c7
|
renamed include files identity.php (channel.php) and Contact.php (connections.php)
|
2016-05-22 16:54:30 -07:00 |
|
Andrew Manning
|
a36bef7979
|
List of wikis populates with links according to observer permissions.
|
2016-05-21 21:55:09 -04:00 |
|
redmatrix
|
1cb311cef9
|
finish updating zot_finger instances
|
2016-05-21 18:18:33 -07:00 |
|
redmatrix
|
ed56b6e67b
|
first cut at zot-finger request signatures
|
2016-05-21 18:02:14 -07:00 |
|
Andrew Manning
|
049147a9d7
|
Successful new wiki git repo and item table record
|
2016-05-21 19:02:23 -04:00 |
|
Andrew Manning
|
c6aa42773a
|
Trying to fix wiki branch starting fresh from dev
|
2016-05-21 14:56:42 -04:00 |
|
redmatrix
|
bf05012150
|
relocate the (unused currently) protocol driver
|
2016-05-20 23:12:06 -07:00 |
|
redmatrix
|
d8ace38041
|
rework the conversation object stuff at a high level - still needs a bit of refactoring
|
2016-05-20 22:52:47 -07:00 |
|
redmatrix
|
019250eff8
|
consolidate include/*_selectors.php (not touching acl_selectors for the moment, as it will likely end up with a different disposition)
|
2016-05-20 22:13:20 -07:00 |
|
redmatrix
|
f4da365abd
|
move template stuff to zotlabs/render
|
2016-05-20 19:11:14 -07:00 |
|
redmatrix
|
b2f0d2d085
|
cleanup proc_run after messing it up with debugging yesterday
|
2016-05-20 17:44:26 -07:00 |
|
redmatrix
|
cae380f068
|
case issue
|
2016-05-20 01:21:19 -07:00 |
|
redmatrix
|
a97e7b2758
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-19 22:48:58 -07:00 |
|
redmatrix
|
f228bf4555
|
typo uncovered during tests
|
2016-05-19 22:33:01 -07:00 |
|
redmatrix
|
a2cec8899a
|
daemon conversion continued...
|
2016-05-19 22:26:37 -07:00 |
|
redmatrix
|
39bc0664a7
|
Separate cron into periodic components and use that as the main interface for scheduled tasks instead of the quaint 'poller'.
|
2016-05-19 21:22:04 -07:00 |
|
redmatrix
|
853322e7d2
|
don't try to deliver empty hashes
|
2016-05-19 20:48:40 -07:00 |
|
redmatrix
|
9cb1ac3de5
|
daemon master: create some compatibility code
|
2016-05-19 20:36:32 -07:00 |
|