redmatrix
3338f3c5b2
diaspora vcard updates
2016-08-07 20:16:14 -07:00
redmatrix
5243dd153b
use config system.server_role and deprecate 'UNO'
2016-08-07 17:29:35 -07:00
Mario Vavti
89c026924b
fix /cloud upload for images
2016-08-06 14:40:23 +02:00
Mario Vavti
4f0b138692
bring back acl for cloud file uploads
2016-08-06 12:46:10 +02:00
Mario Vavti
53a2262fef
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-05 12:13:50 +02:00
Andrew Manning
6a82ff871f
Parse bbcode when page loads
2016-08-04 19:45:35 -04:00
Andrew Manning
05a9f0aa14
Convert select bbcode tags including [observer], [baseurl], [sitename]
2016-08-03 20:53:51 -04:00
Mario Vavti
908e15bc90
multi acl: port events
2016-08-03 23:57:41 +02:00
Mario Vavti
b959641ca8
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-08-03 21:17:08 +02:00
Mario Vavti
c50bfa07ca
multiple acl work
2016-08-03 21:16:57 +02:00
redmatrix
c4fd0af16d
comment policy permissions typo
2016-08-02 18:21:43 -07:00
redmatrix
3a7d3e3a54
This checkin should make all permission modes work correctly with atokens (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.
2016-08-01 20:12:52 -07:00
redmatrix
4c76b31684
/storeurl/cloudurl/
2016-08-01 17:44:21 -07:00
redmatrix
9b9621e10d
add a few more path macros to portable menu elements (channelurl, pageurl, storeurl and baseurl)
2016-07-31 20:14:25 -07:00
redmatrix
86eb923f29
make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit.
2016-07-31 18:08:41 -07:00
Andrew Manning
42b718b3e0
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-31 07:38:44 -04:00
Andrew Manning
7c47557554
Improved UI. Removed logger statements.
2016-07-31 07:30:25 -04:00
redmatrix
da9b6690e5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-07-30 14:04:30 -07:00
Andrew Manning
f17f51a9c1
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-30 06:30:46 -04:00
redmatrix
4ce8f965aa
issue #466 , sql typo
2016-07-28 13:10:19 -07:00
Mario Vavti
9fa3956aa8
translate mime types to icons, update some icons, move file preview (upload progress) below table header
2016-07-28 10:28:48 +02:00
redmatrix
80e4338314
missing s
2016-07-26 19:28:28 -07:00
redmatrix
56957b60e2
issue #460 - remove reference to $a which was passed by value since it doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier.
2016-07-26 15:57:33 -07:00
redmatrix
2fb4952137
issue #460
2016-07-25 13:27:17 -07:00
redmatrix
b5f2b4af35
string update and some minor comment edits
2016-07-24 16:11:34 -07:00
redmatrix
2c1b432613
fix birthday addtocal
2016-07-21 21:35:26 -07:00
redmatrix
bc46f70a90
zat URL auth updated to match changes to the atoken_login interface
2016-07-21 20:04:30 -07:00
Andrew Manning
5a63ddd645
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-21 21:14:54 -04:00
redmatrix
8566f91303
fail oembed if it is attempted and less than 80% of the original content is left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link.
2016-07-21 17:44:04 -07:00
redmatrix
cf0b1f1f15
typo
2016-07-21 01:48:20 -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
6a56a509d3
Merge branch 'dev' into perms
2016-07-20 19:03:18 -07:00
redmatrix
779885f9af
fix vevent multi-line formatting
2016-07-20 18:59:51 -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
Andrew Manning
99f7dd0fd4
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-20 05:38:19 -04:00
redmatrix
a3e5307b93
fix the forum detection in include/zot
2016-07-19 22:57:23 -07:00
redmatrix
ae6256f95a
another couple of minor perms fixes
2016-07-19 22:32:22 -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
f4b658d7b1
issue #411
2016-07-19 05:13:18 -07:00
redmatrix
7272b97e9a
yet more grungy perms work.
2016-07-19 01:26:28 -07:00
redmatrix
99cf2cbaa9
missing bracket
2016-07-18 21:46:40 -07:00
redmatrix
b63165b6e0
more perms work (a lot more)
2016-07-18 21:37:34 -07:00
redmatrix
32ce790717
move legacy code inside the legacy check
2016-07-18 19:09:27 -07:00
redmatrix
b5b57523f1
more perms work
2016-07-18 16:45:43 -07:00
redmatrix
7524948a97
Merge branch 'dev' into perms
2016-07-18 16:10:41 -07:00
redmatrix
f9b67d3630
more perms work
2016-07-18 13:44:39 -07:00
Mario Vavti
f44ca74e99
do not transform hashes to tags in [code=xxx] or [code] blocks
2016-07-18 13:48:09 +02:00
redmatrix
10fa5c20e7
export/import channel permissions
2016-07-17 22:40:39 -07:00
redmatrix
f7833411a1
clone channel perms
2016-07-17 22:18:35 -07:00
redmatrix
de4f9d68bd
Merge branch 'dev' into perms
2016-07-17 21:40:04 -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
6c5086a933
Added functions to check cloud files path and return path with hashed names
2016-07-17 11:52:21 -04: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
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
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
e6c8614801
first cut at zot access tokens
2016-07-14 19:24:15 -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
503b420292
rework perm_is_allowed
2016-07-13 20:23:20 -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
75b943b98a
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-13 05:50:31 -04: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
bdd7d24ac1
update_remote_id - updated to work with iconfig
2016-07-12 19:08:36 -07:00
Andrew Manning
5131759823
Merge remote-tracking branch 'upstream/dev' into website-import
2016-07-12 21:43:05 -04:00
redmatrix
0fa807e7ad
don't try to send sync packets to dead sites.
2016-07-12 18:38:39 -07:00
redmatrix
ed0e2b52d7
move permissiondescription class to zotlabs/lib
2016-07-11 21:46:16 -07:00
redmatrix
168d35747d
use the get_hostname function rather than parse the url
2016-07-11 18:59:54 -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
833de9180e
create change_channel hook
2016-07-11 13:46:06 -07:00
redmatrix
cc83983ae5
perms work
2016-07-10 17:45:14 -07:00
Andrew Manning
c5e534c0cb
Clearer import control interface
2016-07-10 07:21:52 -04:00
Andrew Manning
a338a97d5b
First draft of website import tools
2016-07-10 06:58:20 -04:00
redmatrix
e6638b4715
change default so we don't have to check for array existence later
2016-07-09 21:23:00 -07: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
ce5adbf51e
more sql fine tuning
2016-07-09 18:10:13 -07:00
redmatrix
e2574cf069
some work on the forum widget queries
2016-07-09 16:07:53 -07:00
redmatrix
3bee6543fb
reduce the memory usage of the expire query dramatically.
2016-07-06 22:19:05 -07: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
redmatrix
537f30f707
Merge branch 'dev' into perms
2016-07-05 19:40:09 -07:00
redmatrix
ad954d01de
unused file
2016-07-05 17:57:36 -07:00
redmatrix
e3d70e6b62
merge include/reddav.php into Zotlabs/Storage/Directory.php
2016-07-05 17:54:05 -07:00
redmatrix
cbf009a95d
cleanup
2016-07-05 16:56:40 -07:00
redmatrix
35cc763a92
regression - save bookmarks no longer present in item menu
2016-07-05 16:24:45 -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
Treer
5c062aaec4
force immediate avatar update
2016-07-03 22:38:05 +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
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
339e620738
wiki featured disabled by default in UNO.
2016-06-29 21:03:53 -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
3102440d40
Merge branch 'dev' into sabre32
2016-06-29 09:11:22 +02: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
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
Mario Vavti
5b9cd0af64
Merge branch 'dev' into sabre32
2016-06-27 09:54:01 +02: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
900d8f3b0a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-06-26 20:17:12 -07:00
redmatrix
e2de2f65d5
issue #442 , tables contain too much whitespace (there's a definite issue here, but I should note the offending example was full of carriage returns as well as linefeeds; which exacerbated the problem).
2016-06-26 20:15:42 -07: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
hubzilla
dac3138fd1
Merge pull request #441 from Treer/cdn
...
fix absolute .js urls
2016-06-26 13:43:07 +10:00
Treer
e0a7637626
fix absolute .js urls
2016-06-26 13:08:40 +10:00
hubzilla
8c4481733f
Merge pull request #438 from anaqreon/wiki
...
Wiki post generation option and image embed tool
2016-06-26 08:25:31 +10: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
Treer
2dc1236dca
Allow absolute links to css and js files
2016-06-25 22:38:15 +10:00
Mario Vavti
2528d97f52
Merge branch 'dev' into sabre32
2016-06-25 13:58:24 +02: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
f66576f366
media (e.g. video) files weren't being detected correctly in oembed, causing the stream to try and load large videos (and failing)
2016-06-25 04:09:07 -07:00
Mario Vavti
c8ae04a96a
Merge branch 'dev' into sabre32
2016-06-24 11:25:20 +02: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
cef77ce5bb
the xchan_query wasn't fully optimised as we were comparing quoted and unquoted strings when looking for duplicates
2016-06-22 19:22:59 -07:00
redmatrix
1267d995ef
db statement debugging
2016-06-22 19:08:59 -07:00
redmatrix
ec8091a102
use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able.
2016-06-22 18:00:18 -07:00
Mario Vavti
5536df51f5
erge branch 'dev' into sabre32
2016-06-22 09:58:55 +02:00
redmatrix
2a840460dd
vcard spec changes
2016-06-21 19:25:14 -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
63423c8ee1
make sure the optimisations are reliable
2016-06-20 20:56:58 -07:00
redmatrix
ed16660867
code optimisation
2016-06-20 20:34:19 -07:00
redmatrix
9c9d6363af
update attach on import if exists
2016-06-20 19:39:12 -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
Andrew Manning
8cd9a1e4fc
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-20 13:07:29 -04:00
Mario Vavti
e40112b40d
Merge branch 'dev' into sabre32
2016-06-20 09:31:27 +02:00
