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 |
|
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 |
|
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 |
|
Mario Vavti
|
316fee93f7
|
Merge branch 'dev' into sabre32
|
2016-05-31 10:59:11 +02:00 |
|
redmatrix
|
ca78374f30
|
remove unused tables
|
2016-05-30 22:41:45 -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 |
|
Andrew Manning
|
82ec40dd80
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-05-30 15:00:50 -04: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
|
6d4adfcedc
|
Merge branch 'dev' into sabre32
|
2016-05-30 10:08:13 +02:00 |
|
redmatrix
|
f2ebe41a50
|
undefined function
|
2016-05-29 20:18:28 -07: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
|
a3dfdd9d38
|
Remove Parsedown library files and remove references.
|
2016-05-29 20:44:28 -04:00 |
|
Andrew Manning
|
00d32f6b94
|
Only show wiki delete control if channel owner
|
2016-05-29 20:39:19 -04:00 |
|
Andrew Manning
|
fad27fc1e7
|
Hide page controls when not owner. Fixed some serious access control issues.
|
2016-05-29 20:16:17 -04:00 |
|
Andrew Manning
|
3e6af5c876
|
Hacked Parsedown and Markdown to add class inline-code to <code> blocks for proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
|
2016-05-29 17:06:45 -04:00 |
|
Andrew Manning
|
df7772e301
|
Home page create with new wiki. URL redirects here when no page given. Fixed bug with author in wiki item table record.
|
2016-05-29 13:33:52 -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
|
819683a073
|
Show page content by default. Hide page controls where appropriate. Fix sandbox text format.
|
2016-05-28 14:11:36 -04:00 |
|
Andrew Manning
|
7393dccde8
|
Page content is loaded from the file on disk
|
2016-05-28 12:33:07 -04:00 |
|
Mario Vavti
|
66effbfe08
|
upgrade to sabre32
|
2016-05-28 17:46:24 +02: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
|
d554681174
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-05-27 06:35:15 -04: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
|
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 |
|
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 |
|
hubzilla
|
2a9c1db0c9
|
Merge pull request #402 from git-marijus/dev
another try on #385 - replace sabres restrictive CSP with what we do in boot.php
|
2016-05-26 14:25:48 +10: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
|
e559f8b6a1
|
duplicate daemon run of cronhooks
|
2016-05-25 16:48:32 -07:00 |
|
Mario Vavti
|
929d33fb22
|
another try on #385 - replace sabres restrictive CSP with what we do in boot.php
|
2016-05-25 14:18:41 +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
|
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
|
80b422bdbe
|
typo
|
2016-05-23 13:49:54 -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
|
a1aa3d9061
|
Can't use "use x as y" aliases in callback function declarations
|
2016-05-22 22:08:01 -07:00 |
|
redmatrix
|
1aa3051e97
|
move chatroom stuff to zlib
|
2016-05-22 20:54:52 -07:00 |
|
redmatrix
|
20f444f5f2
|
add missing file
|
2016-05-22 19:26:21 -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
|
2fdd148598
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-21 18:21:35 -07:00 |
|
redmatrix
|
3dc131757d
|
include new finger backend
|
2016-05-21 18:21:04 -07: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 |
|
Andrew Manning
|
7a526fa8a9
|
Temp repo folder error message correction
|
2016-05-21 12:58:05 -04:00 |
|
Andrew Manning
|
598baa1b32
|
Moved git repository storage to store/[data]/git to avoid collision with a channel named git. Fixed bug where temp repo folder was never created.
|
2016-05-21 12:55:17 -04:00 |
|
Mario Vavti
|
4979a45120
|
revert fix for #385
|
2016-05-21 15:14:33 +02:00 |
|
Mario Vavti
|
b66bacff9f
|
possible better fix for #385
|
2016-05-21 14:52:07 +02:00 |
|
Mario Vavti
|
9480e9b68b
|
possible fix for #385
|
2016-05-21 14:34:01 +02: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
|
bc20cf9fa3
|
remove redundant include
|
2016-05-20 22:16:57 -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
|
2cda18f354
|
remove test file
|
2016-05-19 22:48:32 -07:00 |
|
redmatrix
|
2e83c17e2d
|
roll minor version, change example text
|
2016-05-19 22:47:20 -07:00 |
|
redmatrix
|
a2cec8899a
|
daemon conversion continued...
|
2016-05-19 22:26:37 -07:00 |
|
redmatrix
|
014168a29b
|
cleanup of daemon infrastructure
|
2016-05-19 21:32:19 -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 |
|
redmatrix
|
5b2474238e
|
first phase of daemon refactoring
|
2016-05-19 19:42:45 -07:00 |
|
Andrew Manning
|
d5ca889cf5
|
Replace text strings for translation support
|
2016-05-19 07:09:13 -04:00 |
|
redmatrix
|
50d1d06b03
|
issue #391 - htmlspecialchars_decode before firing up jot, which re-encodes
|
2016-05-19 00:56:51 -07:00 |
|
redmatrix
|
93a7df5a1b
|
one more text clarification
|
2016-05-18 22:57:23 -07:00 |
|
redmatrix
|
905432c7ae
|
text clarifications
|
2016-05-18 22:53:43 -07:00 |
|
redmatrix
|
ada26dd2cb
|
This explains it all. Don't set the domain when creating a cookie. You'll get a wildcard and sessions will break if you have multiple domains running hubzilla (or any php basic session based code).
|
2016-05-18 21:00:31 -07:00 |
|
redmatrix
|
f4b31dcb3a
|
Document what I know about the session regeneration issue. I'm really tired of fighting this darn thing. Sessions and cookies need to work.
|
2016-05-18 20:36:03 -07:00 |
|
Andrew Manning
|
77eb9bcfa0
|
Link new plugins when updating repos via admin/plugins
|
2016-05-18 21:32:23 -04:00 |
|
redmatrix
|
c17b47518d
|
comment out session_regenerate until we get this sorted
|
2016-05-18 17:55:22 -07:00 |
|
redmatrix
|
1f7e6cae82
|
Revert "Revert "yet more session work""
This reverts commit 37d14f3a1d.
|
2016-05-18 17:03:54 -07:00 |
|
redmatrix
|
37d14f3a1d
|
Revert "yet more session work"
This reverts commit 51edd472c2.
|
2016-05-18 17:02:46 -07:00 |
|
redmatrix
|
166d63ff60
|
missing close tag
|
2016-05-18 16:31:12 -07:00 |
|
redmatrix
|
d38851023e
|
provide server role on pubsites page
|
2016-05-18 16:28:51 -07:00 |
|
redmatrix
|
43c2b22fca
|
cli utilities - argc and argv reversed. Not functionally incorrect since it was consistent but aesthetically incorrect.
|
2016-05-17 19:49:21 -07:00 |
|
hubzilla
|
9a64c6b9f7
|
Merge pull request #389 from sasiflo/dev_sasiflo_sync
Synchronization: Directory creation on sync import corrected.
|
2016-05-18 12:16:20 +10:00 |
|
redmatrix
|
20cb4130d4
|
support work for a long-term fix for issue #390, essentially one can specify a theme:schema string anywhere a theme is input. It will be honoured unless an existing schema setting over-rides this behaviour. This should also be backward compatible but the theme selection code has been cleaned up slightly and there may be subtle differences in behaviour after this commit. On my site this required a page refresh as the first page load after this change was a bit confused.
|
2016-05-17 17:46:30 -07:00 |
|
sasiflo
|
bfbe6c1660
|
Synchronization: Directory creation on sync import corrected.
|
2016-05-17 12:27:15 +02:00 |
|
redmatrix
|
51edd472c2
|
yet more session work
|
2016-05-16 22:01:33 -07:00 |
|
redmatrix
|
883b1ff513
|
an issue related to #386
|
2016-05-16 19:23:42 -07:00 |
|
redmatrix
|
2dcedd6951
|
more work on sessions and cookies, as some anomalies appeared in caldav and firefox which suggested deeper issues
|
2016-05-16 17:07:39 -07:00 |
|
redmatrix
|
18a9831cd3
|
restrict static to the one function that requires it
|
2016-05-16 13:46:35 -07:00 |
|
redmatrix
|
605c05fc8b
|
changes to session for cdev compatibility
|
2016-05-16 02:03:15 -07:00 |
|
redmatrix
|
2f222546da
|
Comanche: provide a variable '$region' which can be used within a layout to make content aware of where it is on the page. For instance this can be passed as a variable to a widget and trigger either a vertical or horizontal layout depending on which region it is assigned to.
|
2016-05-12 21:18:34 -07:00 |
|
Andrew Manning
|
70d413ab04
|
Create store/git/sys/extend/addon directory and link if it does not exist in all plugin repo GUI POST actions
|
2016-05-12 06:49:24 -04:00 |
|
Andrew Manning
|
d968fc51ea
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo
|
2016-05-11 05:54:20 -04:00 |
|
Andrew Manning
|
c7698e4dc3
|
Check if target directories are writable when adding, updating, or removing plugin repos
|
2016-05-11 05:53:23 -04:00 |
|
redmatrix
|
4dd3839c41
|
provide repository versions on admin summary page and an upgrade message if you're behind master
|
2016-05-10 21:46:04 -07:00 |
|
redmatrix
|
9caaa9397e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-10 19:42:37 -07:00 |
|
redmatrix
|
915bd2ec77
|
sabre upgrade
|
2016-05-10 19:40:15 -07:00 |
|
Andrew Manning
|
40e3d37a72
|
Remove debugging lines
|
2016-05-10 21:01:47 -04:00 |
|
Andrew Manning
|
2882eef42f
|
Link plugins in the newly installed addon repo to /addon so they are accessible
|
2016-05-10 21:00:10 -04:00 |
|
redmatrix
|
0b02a6d123
|
initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)
|
2016-05-10 17:26:44 -07:00 |
|
Andrew Manning
|
78b40e6363
|
Delete existing repo if the new one has a different URL. Fixed bug that could cause repeated installation.
|
2016-05-10 06:28:00 -04:00 |
|
Mario Vavti
|
45c19e365d
|
another public -> pubstream
|
2016-05-10 10:40:36 +02:00 |
|
redmatrix
|
2469853175
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-10 01:31:15 -07:00 |
|
redmatrix
|
0c5434d5e3
|
try again with shutdown handler, fix issue #373 (live-pubstream div wasn't present
|
2016-05-10 01:30:22 -07:00 |
|
Mario Vavti
|
8ab7707898
|
allow delayed publishing of webpages
|
2016-05-10 10:02:27 +02:00 |
|
redmatrix
|
baa7020036
|
revert shutdown function
|
2016-05-09 22:28:54 -07:00 |
|
Andrew Manning
|
0b8a7f1bd0
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo
|
2016-05-09 22:00:21 -04:00 |
|
Andrew Manning
|
9c8cf7d433
|
Fixed some bugs with empty repo name and improved the interface a bit.
|
2016-05-09 21:59:27 -04:00 |
|
Andrew Manning
|
180731c162
|
copy-paste error
|
2016-05-09 21:17:47 -04:00 |
|
Treer
|
ef97e5a063
|
minor cleanup. No functional changes
|
2016-05-10 00:15:57 +10:00 |
|
Mario Vavti
|
a3e94591bc
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-05-09 11:58:10 +02:00 |
|
Mario Vavti
|
24c1dc528d
|
make editwebpage use status_editor() and fix storing of layout on webpage creation
|
2016-05-09 11:56:42 +02:00 |
|
redmatrix
|
6f486a3393
|
prevent recursion in the database driver when debugging is enabled and the system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log...
|
2016-05-09 01:12:24 -07:00 |
|