redmatrix
6a56a509d3
Merge branch 'dev' into perms
2016-07-20 19:03:18 -07:00
Andrew Manning
d504197a78
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-20 21:22:53 -04:00
redmatrix
3affb2e817
sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for.
2016-07-20 17:55:40 -07:00
redmatrix
df0cd4dbc7
Merge branch 'dev' into perms
2016-07-20 13:39:10 -07:00
Mario Vavti
4da005e209
type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as id. This fixes the issue that autocomplete for mail returns null for data.xid
2016-07-20 22:00:41 +02:00
Andrew Manning
99f7dd0fd4
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-20 05:38:19 -04:00
Andrew Manning
0c7ad924a8
Starting to make the import selection page after element scan.
2016-07-20 05:33:40 -04:00
redmatrix
a3e5307b93
fix the forum detection in include/zot
2016-07-19 22:57:23 -07:00
redmatrix
a961d5e6c8
permission fixes
2016-07-19 20:49:54 -07:00
redmatrix
ea83032863
translate more old perms calls
2016-07-19 17:52:45 -07:00
redmatrix
b63165b6e0
more perms work (a lot more)
2016-07-18 21:37:34 -07:00
redmatrix
b5b57523f1
more perms work
2016-07-18 16:45:43 -07:00
redmatrix
de4f9d68bd
Merge branch 'dev' into perms
2016-07-17 21:40:04 -07:00
redmatrix
279359c1bd
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-07-17 16:05:46 -07:00
redmatrix
dc9fa7cf64
include attach.php at the module level since 2d4b75428a wasn't backported to dev and we're about to branch an RC
2016-07-17 16:04:00 -07:00
Andrew Manning
d6b28cdc57
Importing webpage elements from manually entered cloud file path work. All detected elements are automatically imported.
2016-07-17 16:05:26 -04:00
Andrew Manning
75fb065526
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-17 11:54:36 -04:00
Andrew Manning
6c5086a933
Added functions to check cloud files path and return path with hashed names
2016-07-17 11:52:21 -04:00
Mario Vavti
2b674d4cd9
hide fullscreen button in embedphotos modal album view
2016-07-17 12:54:10 +02:00
Andrew Manning
99354ac576
Merge remote-tracking branch 'upstream/dev' into website-import-remote
2016-07-16 21:04:04 -04:00
Andrew Manning
e7b8531751
Stash changes to merge from dev
2016-07-16 21:02:13 -04:00
Andrew Manning
ff2f599142
Postpone remote folder import until filesystem mirroring matures.
2016-07-16 19:25:44 -04:00
redmatrix
8e667866fd
add service class restrictions to access_tokens
2016-07-15 21:57:41 -07:00
redmatrix
f3aff45042
provide examples for using access tokens in urls
2016-07-15 16:31:21 -07:00
redmatrix
dcb3c2c299
mod_home: if using an atoken login on the home page redirect to the channel page of the channel that owns the atoken.
2016-07-15 15:26:36 -07:00
redmatrix
da5ec98f98
make lockview work with throwaway identities
2016-07-15 02:07:27 -07:00
redmatrix
d54f5a3831
more cleanup of atoken UI
2016-07-15 01:43:09 -07:00
redmatrix
5e475acb85
cleanup and debug of atoken feature
2016-07-15 01:33:28 -07:00
redmatrix
f666d8a083
enforce non-empty name and token/password on access tokens until better checks are instituted.
2016-07-15 01:06:25 -07:00
redmatrix
7ee7f00bf3
Here's the basic UI for the Zot Access Tokens, requires some minor cleanup
2016-07-14 22:41:53 -07:00
redmatrix
397a23499d
make the xchan_hash for the access token location independent
2016-07-14 21:28:17 -07:00
redmatrix
f70f4a4e85
add zat to acl
2016-07-14 20:26:22 -07:00
Andrew Manning
0edf248cd1
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-14 22:25:30 -04:00
Andrew Manning
514ffb74aa
Refactored the scan and import functions to reduce redundant code and simplify logic. Import of pages, layouts, and blocks works.
2016-07-14 22:24:23 -04:00
redmatrix
191cd21028
more perms work
2016-07-13 23:05:19 -07:00
redmatrix
b3a785711c
deprecate/remove json_decode_plus
2016-07-13 22:11:06 -07:00
redmatrix
1fd65c934d
lots more permission work
2016-07-13 19:53:28 -07:00
Andrew Manning
960e9edff5
Blocks, pages, and layouts import from zip file. Layouts are not applied to pages until imported twice though.
2016-07-13 21:46:59 -04:00
redmatrix
b72720f6b6
Merge branch 'dev' into perms
2016-07-13 18:24:45 -07:00
redmatrix
f60a0c5ce0
document mod_acl a bit better and try to remove some redundancies and consolidate the various options
2016-07-13 17:51:19 -07:00
Andrew Manning
ba903e21ed
Updated import_blocks for database calls
2016-07-13 06:17:12 -04:00
Andrew Manning
75b943b98a
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-13 05:50:31 -04:00
redmatrix
18565600b2
missing namespace prefix \
2016-07-12 22:58:12 -07:00
redmatrix
f4e4e734de
more work on perms
2016-07-12 21:47:24 -07:00
redmatrix
6424bac47c
Merge branch 'dev' into perms
2016-07-12 20:50:27 -07:00
Andrew Manning
5131759823
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-12 21:43:05 -04:00
Andrew Manning
1e4ef81244
Import blocks from zip file, but needs updates as detailed in https://gitlab.com/zot/hubsites/merge_requests/2
2016-07-12 21:41:37 -04:00
redmatrix
ed0e2b52d7
move permissiondescription class to zotlabs/lib
2016-07-11 21:46:16 -07:00
redmatrix
a01baab4f0
Merge branch 'dev' into perms
2016-07-11 17:45:10 -07:00
redmatrix
71b001fdb7
more perms work - notably the stuff in public_perms
2016-07-11 17:02:49 -07:00
redmatrix
67c60229ca
use the profile_uid here.
2016-07-11 13:20:12 -07:00
Mario Vavti
3d3584b36c
remove check for mcrypt
2016-07-10 13:42:04 +02:00
redmatrix
c9db8c6857
more permissions work
2016-07-09 21:08:02 -07:00
redmatrix
917a465ccd
more work on perms
2016-07-09 19:03:29 -07:00
redmatrix
ee1ec0428b
gak one more typo
2016-07-07 18:53:09 -07:00
redmatrix
3b17dca252
typo
2016-07-07 18:51:56 -07:00
redmatrix
eef40cb3fd
duplicate supression SQL query was horribly inefficient and could cause issues in resource deprived environments.
2016-07-07 18:47:18 -07:00
hubzilla
9f413ed174
Merge pull request #450 from git-marijus/dev
...
fix /cloud after recent changes
2016-07-08 10:40:59 +10:00
redmatrix
233cfc29d6
hide the redeliver option one level down since it should rarely be needed by folks outside of shared hosting.
2016-07-07 17:23:52 -07:00
Mario Vavti
227320f6f0
more fixes for /cloud and /dav
2016-07-07 20:16:27 +02:00
Mario Vavti
a59e84cadd
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-07-06 21:31:17 +02:00
Mario Vavti
d4627a0b1c
fix /cloud after recent changes
2016-07-06 21:31:05 +02:00
redmatrix
e6224898d2
more heavy lifting on xtensible perms
2016-07-04 21:33:25 -07:00
redmatrix
d566ffa678
more heavy lifting on extensible perms
2016-07-04 17:55:13 -07:00
redmatrix
2a26b0ae91
perms work - settings page
2016-07-03 22:47:46 -07:00
Treer
5c062aaec4
force immediate avatar update
2016-07-03 22:38:05 +10:00
Treer
b87106b6fe
Mark nickname as required field, if left empty then channel creation fails silently
2016-07-03 17:59:44 +10:00
redmatrix
523e7b5084
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-07-01 20:48:49 -07:00
redmatrix
41fa2d6c69
delivery invoked twice in mod_tagger, once in post_activity_item() and another at the main module level
2016-07-01 20:46:57 -07:00
redmatrix
5947467339
use small photo for Diaspora attribution correction; the medium looks awkward in the D* stream.
2016-07-01 20:34:00 -07:00
Mario Vavti
7371e08625
ditch the change_view widget and make header fixed in fullscreen mode
2016-07-01 12:21:19 +02:00
redmatrix
bb5ec8cfb8
allow multiple apd's per plugin dir
2016-07-01 02:16:23 -07:00
redmatrix
bd403276f2
disable wiki if feature disabled, sync updates of delayed publish posts
2016-06-30 21:27:59 -07:00
redmatrix
7f8dcf4f12
sync flags even if post has not been edited
2016-06-30 21:12:39 -07:00
Andrew Manning
0fd8eeec23
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-30 21:51:33 -04:00
Andrew Manning
7124c0aee5
Replace homemade table of content generator with existing jQuery plugin. Now toc is linked to document headings.
2016-06-30 21:50:38 -04:00
redmatrix
1cc816f662
dreport: convert timestamp to channel localtime and get rid of old pre-template code
2016-06-29 22:53:18 -07:00
redmatrix
bfe84a9ff7
templatise the Dreport page and add a redeliver option for when things stuff up badly.
2016-06-29 22:46:47 -07:00
redmatrix
9ef710c557
provide wiki as a feature (default is on so there aren't any surprises) and add to channel menu and profile tabs
2016-06-29 20:59:00 -07:00
redmatrix
2e93a09d83
stream large photos through buffered I/O if possible
2016-06-29 17:31:48 -07:00
Mario Vavti
f098600c41
missing backslash leads to wsod on refresh permissions
2016-06-29 23:04:34 +02:00
redmatrix
715b1667d9
readability
2016-06-28 20:48:43 -07:00
redmatrix
7d7f43c205
still working through some issues with curl magic-auth
...
fixed profile photo upload
2016-06-27 22:25:37 -07:00
redmatrix
b155e93ab1
add letsencrypt x3 intermediate cert and new cert file, improve UX of new registrations
2016-06-27 19:04:00 -07:00
redmatrix
ee1d527497
comment on the setup page about the possible need for intermediate certs.
2016-06-27 16:15:47 -07:00
redmatrix
8d298d5a06
fix for the rendering side of issue #412 . We traditionally store all
...
"user generated" content with ENT_COMPAT encoding to reduce the attack
vector for JS CSS exploits. This may present compatibility issues sharing
wikis to platforms which do not provide such CSS protection. We can either
decide that wikis are inherently insecure and filter them on render (with
an associated performance penalty), or keep the existing method of filtering
on store. I'm not making that choice. I'm merely fixing the obvious rendering
issue in mono-platform viewing.
2016-06-26 22:26:45 -07:00
redmatrix
3035c792dc
remove the app $a passed to profile_load, also add profile_load to mod_wiki which should fix issue #431
2016-06-26 22:13:59 -07:00
Andrew Manning
81da9f99e4
Fixed bug with rendering table of contents upon page load
2016-06-26 15:41:25 -04:00
Andrew Manning
216f034b6d
Also generate table of contents when loading the page
2016-06-26 15:27:55 -04:00
Andrew Manning
b96edd8b9a
Added table of contents generator. Table is inserted wherever [toc] is encountered.
2016-06-26 15:04:47 -04:00
Andrew Manning
0df3978cc5
A page name wrapped in double brackets is converted into a link to another page in the current wiki
2016-06-25 14:29:52 -05:00
Andrew Manning
83a42afddf
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-25 06:30:15 -05:00
Andrew Manning
780f83a118
Post generation about new wiki is optional, default is NOT to post. Fixed bug in wiki creation. Added embed image dialog and album browser.
2016-06-25 06:27:14 -05:00
redmatrix
fb93ae2128
fix pdledit "list layouts"
2016-06-24 02:07:12 -07:00
redmatrix
b19bbf5473
change AbConfig to use channel_id instead of channel_hash; which was a mistake in retrospect
2016-06-23 18:12:26 -07:00
redmatrix
acf26d5c63
code cleanup for profile_photos
2016-06-23 01:17:44 -07:00
redmatrix
b8c5a91940
set profile when "use existing photo"
2016-06-22 20:46:44 -07:00
redmatrix
515b054a6e
missing class selector when "use photo as profile photo"
2016-06-22 20:17:19 -07:00
redmatrix
1267d995ef
db statement debugging
2016-06-22 19:08:59 -07:00
redmatrix
b593c3a9b9
1. provide automatic relocation of important links in items that are imported or synced to clones
...
2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O.
3. item_store and item_store_update now return the item that was stored
2016-06-21 18:24:36 -07:00
redmatrix
ed16660867
code optimisation
2016-06-20 20:34:19 -07:00
redmatrix
3a43b1d85d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-06-20 13:43:36 -07:00
redmatrix
01bfadaeaa
fix siteinfo plugin list
2016-06-20 13:42:04 -07:00
Andrew Manning
a3ec9f3940
Add formatted heading for revision comparison viewer
2016-06-20 13:27:05 -04:00
Andrew Manning
8cd9a1e4fc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-20 13:07:29 -04:00
redmatrix
c81f6b9f6f
"thing" always showing default url, not that supplied by the thing.
2016-06-17 16:28:36 -07:00
Andrew Manning
961539258b
Wiki page revision comparison tool with diff displayed in modal dialog. Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
2016-06-17 06:33:39 -04:00
Andrew Manning
fc7c4e64ff
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-15 21:48:47 -04:00
Andrew Manning
688171d016
Rename page feature added. Fixed bug in git commit function and other minor fixes.
2016-06-15 06:25:31 -04:00
redmatrix
ccfd028919
readme for the module directory, also provide an undocumented way to reset the timestamp on connection photos to force a refresh without messing with the database directly.
2016-06-14 17:04:29 -07:00
redmatrix
0ef2622621
some work to provide propagation and honouring of the item_notshown flag.
2016-06-13 22:09:22 -07:00
redmatrix
1e68d4fb75
deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
2016-06-13 19:58:24 -07:00
hubzilla
b18b9464a4
Merge pull request #416 from anaqreon/embedphotos
...
Add embed photos button with album browser to new post editor
2016-06-13 10:15:09 +10:00
Andrew Manning
b5933e9d44
Photo embed button with album browser works in new post editor.
2016-06-12 19:41:37 -04:00
Andrew Manning
410f5389ae
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 15:18:43 -07:00
hubzilla
beb55235c6
Merge pull request #410 from anaqreon/wiki
...
Wiki module: first iteration
2016-06-10 20:03:08 +10:00
redmatrix
bb3d56a0b2
foreach: invalid argument
2016-06-09 22:07:27 -07:00
Andrew Manning
7a242f829f
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-09 20:07:09 -04:00
redmatrix
0dcea87b99
namespace issue with openid reverse auth
2016-06-09 16:20:16 -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
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
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
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
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
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
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
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
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
