redmatrix
f3eb9af046
more ZAT work
2016-07-14 19:43:47 -07: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
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
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
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