redmatrix
63123759ed
DAV auth issue
2016-07-21 15:50:07 -07:00
redmatrix
824dedbe9d
issue #453 and a bug noted from the logfiles related to the schema change last month
2016-07-20 23:05:31 -07:00
redmatrix
da707736a0
issue #453 and a bug noted from the logfiles related to the schema change last month
2016-07-20 23:04:07 -07:00
redmatrix
8f57bb95fe
undefined function
2016-07-20 21:57:15 -07:00
redmatrix
0c3543ac43
undefined function
2016-07-20 21:55:23 -07:00
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
542fcaff9a
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
2016-07-20 17:57:42 -07:00
redmatrix
bc8c74eb42
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:57:17 -07: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
d54ad98802
Merge branch '1.10RC' into dev
2016-07-20 22:01:58 +02: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
Mario Vavti
8c2b93da72
Merge branch '1.10RC' into dev
2016-07-20 20:44:20 +02:00
Mario Vavti
ca82b45fe4
fix /mail wsod issue reported by giac hellvecio
2016-07-20 20:43:12 +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
237cca7a0d
fixes to perms
2016-07-19 19:33:48 -07:00
redmatrix
ea83032863
translate more old perms calls
2016-07-19 17:52:45 -07:00
redmatrix
6a4573b935
Merge branch 'dev' into perms
2016-07-19 17:05:59 -07:00
redmatrix
9421e42dad
doc correction
2016-07-19 17:04:38 -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 2d4b75428a87038 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
aac0fa2b5f
os_delete_prohibit
2016-07-16 01:02:41 -07:00
redmatrix
8e667866fd
add service class restrictions to access_tokens
2016-07-15 21:57:41 -07:00
redmatrix
01fe7d6620
remove expired access tokens
2016-07-15 17:34:44 -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
redmatrix
f3eb9af046
more ZAT work
2016-07-14 19:43:47 -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
0aa205044b
Merge branch 'dev' into perms
2016-07-13 20:19:11 -07:00
redmatrix
00afe56cad
let abconfig specify a family
2016-07-13 20:17:40 -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
fb36561a68
force non-null sess_data
2016-07-11 13:27:44 -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
redmatrix
e11330a5c8
revise how we store perm_limits
2016-07-07 16:44:58 -07:00
Mario Vavti
227320f6f0
more fixes for /cloud and /dav
2016-07-07 20:16:27 +02:00
redmatrix
581a3c5323
expire crashing on shared hosting from memory exhaustion. Lower the expire limit. Also the sys channel was being expired with everybody else due to a flag change regression.
2016-07-06 22:02:06 -07: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
08a4763bff
more work on permissions
2016-07-05 20:21:47 -07:00
redmatrix
537f30f707
Merge branch 'dev' into perms
2016-07-05 19:40:09 -07:00
redmatrix
e3d70e6b62
merge include/reddav.php into Zotlabs/Storage/Directory.php
2016-07-05 17:54:05 -07:00
redmatrix
35cc763a92
regression - save bookmarks no longer present in item menu
2016-07-05 16:24:45 -07:00
redmatrix
cf05111622
start to refactor the permission roles
2016-07-04 22:37:30 -07: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
805ecde6a5
minor
2016-07-04 00:12:53 -07:00
redmatrix
2a26b0ae91
perms work - settings page
2016-07-03 22:47:46 -07:00
redmatrix
916e088462
make permissionlimits into a class
2016-07-03 18:20:15 -07:00
redmatrix
57226b2e13
Merge branch 'dev' into perms
2016-07-03 15:58:20 -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
hubzilla
05aba0b4dd
Merge pull request #444 from git-marijus/dev
...
Merge branch sabre32 into dev
2016-06-30 09:34:22 +10:00
Mario Vavti
f098600c41
missing backslash leads to wsod on refresh permissions
2016-06-29 23:04:34 +02:00
Mario Vavti
3102440d40
Merge branch 'dev' into sabre32
2016-06-29 09:11:22 +02:00
redmatrix
715b1667d9
readability
2016-06-28 20:48:43 -07:00
redmatrix
7d62e087c6
identity_export_year() was a bit short-sighted. We really require arbitrary date ranges. A new function was created to tackle this - channel_export_items() which takes a channel, and a start and finish date. Finish date will default to "now" if not set. Will be working this into the interface under a module named "export_items" which will correspond closely to the existing "import_items" module you'll need to do the reverse operation. Will also make it available via the API. Once that is complete, I anticipate removing identity_export_year() as it will then be somewhat redundant, and modifying the documentation on the channel export page accordingly. Note: the function works strictly in GMT so an interface would need to convert from channel local time.
2016-06-28 13:36:48 -07:00
Mario Vavti
9f576369a9
Merge branch 'dev' into sabre32
2016-06-28 11:09:22 +02: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
30a5fe3061
provide a daemon for implementing zot magic-auth over curl.
2016-06-27 19:53:35 -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
3704ff57cb
replace [+] and [-] with chevron icons
2016-06-27 16:50:06 -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
17e161006a
added permissionroles
2016-06-27 04:44:10 -07:00
redmatrix
85d2ad4aea
Merge branch 'dev' into perms
2016-06-27 04:00:10 -07:00
Mario Vavti
5b9cd0af64
Merge branch 'dev' into sabre32
2016-06-27 09:54:01 +02: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
redmatrix
2029b2b9ed
document the daemon classes
2016-06-26 21:58:09 -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
Mario Vavti
27ee95106d
Merge branch 'dev' into sabre32
2016-06-26 08:59:58 +02: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
Mario Vavti
c8ae04a96a
Merge branch 'dev' into sabre32
2016-06-24 11:25:20 +02:00
redmatrix
fb93ae2128
fix pdledit "list layouts"
2016-06-24 02:07:12 -07:00
redmatrix
fa02a09107
SuperCurl to provide a re-usable curl options stack and just change options that are different from one call to the next
2016-06-23 20:05:57 -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
e5c66d94f2
relocate the cache class
2016-06-23 05:18:58 -07:00
redmatrix
acf26d5c63
code cleanup for profile_photos
2016-06-23 01:17:44 -07:00
Mario Vavti
39b14b6b81
Merge branch 'dev' into sabre32
2016-06-23 10:14:13 +02: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
Mario Vavti
5536df51f5
erge branch 'dev' into sabre32
2016-06-22 09:58:55 +02:00
redmatrix
f48b12ff52
provide a skeleton of the current CalDAVClient with lots of notes about how best to move forward just in case anybody is feeling ambitious or anxious.
2016-06-21 20:44:55 -07:00
redmatrix
415a8d1e01
channel homepage not providing content when javascript disabled
2016-06-21 19:42:08 -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
Mario Vavti
ecae0b3d97
Merge branch 'dev' into sabre32
2016-06-21 10:08:49 +02: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
hubzilla
670d12219b
Merge pull request #429 from anaqreon/wiki
...
Wiki page revision comparison viewer
2016-06-21 06:23:58 +10:00
Mario Vavti
545219b839
Merge branch 'dev' into sabre32
2016-06-20 21:47:49 +02:00
Mario Vavti
985fb44424
Merge branch 'master' into dev
2016-06-20 21:46:33 +02:00
Mario Vavti
17c5502330
missing backslash leading to wsod on xconfig changes
2016-06-20 21:45:15 +02: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
Mario Vavti
178b440f05
Merge branch 'dev' into sabre32
2016-06-18 11:10:40 +02:00
redmatrix
22edd00211
"thing" always showing default url, not that supplied by the thing.
2016-06-17 21:26:25 -07: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
Mario Vavti
28a7458e48
Merge branch 'dev' into sabre32
2016-06-16 10:26:47 +02:00
Andrew Manning
fc7c4e64ff
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-15 21:48:47 -04:00
redmatrix
976e32d3ae
translate already imported system apps
2016-06-15 16:25:24 -07:00
redmatrix
476116a972
translate already imported system apps
2016-06-15 16:24:45 -07: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
Mario Vavti
9a0dff08bc
Merge branch 'dev' into sabre32
2016-06-15 08:42:51 +02:00
redmatrix
212d8b6cfd
support cookie auth in Sabre DAV
2016-06-14 20:30:34 -07: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
Mario Vavti
5c458e9111
Merge branch 'dev' into sabre32
2016-06-14 09:42:43 +02: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
Mario Vavti
e963714ad6
Merge branch 'dev' into sabre32
2016-06-13 09:18:39 +02: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
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
Mario Vavti
86985b454f
Merge branch 'dev' into sabre32
2016-06-10 12:22:01 +02:00
hubzilla
beb55235c6
Merge pull request #410 from anaqreon/wiki
...
Wiki module: first iteration
2016-06-10 20:03:08 +10:00
Mario Vavti
9d5d3a9468
Merge branch 'dev' into sabre32
2016-06-10 10:45:09 +02: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
redmatrix
d5d5d78e3a
initial perms work
2016-06-09 16:16:56 -07:00
redmatrix
a10f5e9e06
allow an exclusion for transmitting hidden file activities. There may be a better way to do this, but it was pointed out recently that transmitting some hidden activities might cause a problem. I cannot locate the conversation at the moment to summarise the exact issue.
2016-06-09 16:11:58 -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
Mario Vavti
4234c9a194
Merge branch 'dev' into sabre32
2016-06-08 12:04:45 +02:00
Andrew Manning
d43a814385
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-08 05:41:13 -04: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
Mario Vavti
75b97cafb0
Merge branch 'dev' into sabre32
2016-06-07 09:43:14 +02: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
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
Mario Vavti
c8f686b8a5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-09 09:26:38 +02:00
Andrew Manning
d714cd76dd
Addon repo is copied to /extend/addon/ when admin presses install. Addon repos can be removed via GUI.
2016-05-08 20:30:00 -04:00
Andrew Manning
174484a51c
Custom addon repo name option added.
2016-05-08 09:26:06 -04:00
Treer
09ef30feb0
Update some modules to use new ACL dialog feature
2016-05-08 21:27:52 +10:00
Andrew Manning
f73a74967e
Existing addon repos are listed on plugin page with controls for updating, removing, and switching branches.
2016-05-07 22:12:12 -04:00
Andrew Manning
bbbae3f42d
Merge remote-tracking branch 'upstream/dev' into plugin-repo
2016-05-07 18:39:34 -04:00
Andrew Manning
0746794e81
New plugin repo cloned using new GitRepo class. Readme and info displayed in wide modal dialog.
2016-05-07 18:39:19 -04:00
