Commit graph

6331 commits

Author SHA1 Message Date
zotlabs
6552ccc477 issue #607 parens not recognised inside urls 2016-12-01 02:44:01 -08:00
zotlabs
83a4999dbe issue #606, postgres binary data handling under PDO and HHVM when passed null 2016-11-30 19:45:46 -08:00
zotlabs
c845eed114 advanced crypto restricted by server role 2016-11-30 16:36:33 -08:00
zotlabs
5b09829959 zot 1.2 2016-11-30 16:22:31 -08:00
Mario Vavti
afffbb6487 go live with wiki mimetypes - you can now choose if a wiki will contain markdown or bb-code markup 2016-11-30 13:30:50 +01:00
Mario Vavti
53e4b55ea3 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-11-30 10:57:04 +01:00
zotlabs
175ae58563 highlight 2016-11-29 14:27:55 -08:00
Mario Vavti
f32f7d2308 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-11-29 13:38:59 +01:00
zotlabs
3ed6d82367 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-11-29 02:57:58 -08:00
zotlabs
793047919d missed this from the earlier checkin 2016-11-29 02:57:29 -08:00
Mario Vavti
6a786342f9 rename function 2016-11-29 10:46:04 +01:00
Mario Vavti
d184b3fa86 more work on wiki mimetypes 2016-11-29 10:33:46 +01:00
Mario Vavti
91e97468a0 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-11-29 10:13:47 +01:00
zotlabs
b66aeea384 minor re-arrange 2016-11-28 14:00:34 -08:00
Mario Vavti
f9b732482d some basic work for implementing mimetypes for wikis 2016-11-28 15:24:49 +01:00
git-marijus
683a09781a Merge pull request #602 from anaqreon/doco
Update context help content and context page element focus feature.
2016-11-28 13:44:41 +01:00
Mario Vavti
1ce4eda0b9 wiki: move delete page functionality to the widget 2016-11-28 11:29:10 +01:00
Andrew Manning
678239424a Integrating lots of member guide content 2016-11-27 16:46:24 -07:00
Andrew Manning
369dc295b1 Add some identity-aware parsing to HTML content using parseIdentityAwareHTML() 2016-11-27 14:48:06 -07:00
Andrew Manning
7470b1180e Add ability to include page assets in documentation pages such as images. Updated Personal Channel tutorial to use local images using this new capability. 2016-11-27 13:43:07 -07:00
Mario Vavti
0ff24b6f21 whitespace and minor fixes 2016-11-23 13:49:24 +01:00
zotlabs
5c5d45f52b missing plugins in zot-info 2016-11-22 16:33:00 -08:00
zotlabs
11b4d98f37 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-11-22 14:18:58 -08:00
zotlabs
6e016c439c db update required for Zot2 2016-11-22 14:15:33 -08:00
Mario Vavti
9b5e6a1f7a use plural since we can have more than one wiki 2016-11-22 15:27:26 +01:00
Mario Vavti
060982adb4 display wiki list on wiki landing page. 2016-11-22 11:30:04 +01:00
zotlabs
bc95b2fc77 wrong function 2016-11-21 14:38:02 -08:00
zotlabs
f926915e56 zot: specify crypto method 2016-11-20 21:18:38 -08:00
Mario Vavti
9d1443bbfe move the remote user homebutton to the user menu. this way everything remote user related is in one place. 2016-11-20 15:38:36 +01:00
Mario Vavti
f4f3769225 fix #594 2016-11-20 14:15:13 +01:00
zotlabs
dda2ea8fed Do not render maps for Diaspora destinations. 2016-11-19 14:16:38 -08:00
Andrew Manning
d24e867603 Move page list back out to the side menu, but with the new page form below the new page button like the new wiki form. Disable text editing if viewer lacks edit permission, and change the tab label to Source instead of Edit in that case. 2016-11-18 21:55:29 -05:00
Andrew Manning
d5c14a513d Wiki pages display in tab to the left of the edit pane tab. Home is always first in the list. 2016-11-18 21:25:40 -05:00
Mario Vavti
3147b7c62b revert simple checkbox 2016-11-18 14:15:01 +01:00
Mario Vavti
0ceb75ea09 add a simple checkbox template for use in widgets 2016-11-18 13:55:48 +01:00
zotlabs
3b6248cb64 dba_pdo: return false on q() DB error like the old driver did 2016-11-17 15:15:34 -08:00
Mario Vavti
0b0e0f8f43 wiki list fixes 2016-11-17 14:17:26 +01:00
Andrew Manning
20db8bbe2e Highlight active wiki in list in preparation for removing active wiki name from content section header to make room for page list viewer 2016-11-17 05:58:26 -05:00
Andrew Manning
748c894450 Move new wiki dialog directly underneath new wiki button in wiki list widget 2016-11-16 20:16:46 -05:00
zotlabs
0e8b13841a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-11-16 14:15:42 -08:00
zotlabs
91c803ff65 use item from DB for return value 2016-11-16 14:13:10 -08:00
zotlabs
7a17ee9f8c export issue 2016-11-16 14:10:57 -08:00
Mario Vavti
1ad8f20bce only turn [] and [x] into checkboxes if it is found inside a checklist 2016-11-16 20:49:58 +01:00
zotlabs
501bd814c3 wiki: simplify permission model, reduce duplicate calls to get the same channel info and permissions, return the owner permissions with the normal permission check (keeping all permission fetching in one place), rename the 'channel' variable to 'owner' in several places to identify this channel role more clearly as to the way it is being used in this module, update the deprecated call to proc_run (include/notifier) and make several notice messages translatable. 2016-11-15 18:43:26 -08:00
zotlabs
0f5a166cce still a bit of wiki permission weirdness, this should catch the major ones 2016-11-15 02:12:30 -08:00
zotlabs
e0a702df76 wiki: permissions issues, untranslated strings in templates and some minor changes to provide a consistent UI with the rest of the app. 2016-11-15 00:50:31 -08:00
zotlabs
e990a35a91 xchan_fetch() returns a simplified structure 2016-11-14 21:06:58 -08:00
zotlabs
3e286f4f19 update api perm_allowed to return all perms if no perm specified 2016-11-14 20:59:10 -08:00
zotlabs
e0a83b4b94 API: add GET /api/z/1.0/perm_allowed 2016-11-14 20:50:55 -08:00
zotlabs
b9728a96ce API: add GET /api/z/1.0/abconfig 2016-11-14 20:30:28 -08:00
zotlabs
9055d0910c API: add GET api/z/1.0/abook 2016-11-14 17:47:44 -08:00
Mario Vavti
192df273cc show wiki controls only to owner and whitespace fixes 2016-11-14 12:01:16 +01:00
zotlabs
cf5c803fe0 api: allow group member list to use a group name or id 2016-11-13 23:28:03 -08:00
zotlabs
3c302bae5a move all the zid related stuff to one file 2016-11-13 20:22:01 -08:00
zotlabs
103cd2b7a1 provide 'per-page' caching for is_matrix_url() results to reduce duplicate queries 2016-11-13 16:12:36 -08:00
zotlabs
7763643f2e zidify wiki content 2016-11-13 15:06:16 -08:00
zotlabs
ebef7d6348 attach_rename: flaw in duplicate filename detection resulted in filename(1)(1)(1).ext 2016-11-10 20:27:18 -08:00
zotlabs
20497f1be3 Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin on the first hop since we no longer provide the twitter api by default 2016-11-10 15:59:49 -08:00
zotlabs
74947d1c1c deprecate/remove get_channel_by_nick() which is just a less generalised variant of channelx_by_nick() 2016-11-08 18:15:57 -08:00
zotlabs
db3d230ad9 more api work 2016-11-08 17:47:56 -08:00
zotlabs
fabf278633 more api re-org 2016-11-08 16:55:29 -08:00
zotlabs
b80674bf2e move twitter api to addon; there's still a bit of cleanup remaining, mostly dealing with abstracting the authentication calls and separating out the twitter authentication structure from the zot api. 2016-11-08 14:54:55 -08:00
zottel
cb32640f70 fix a fatal error with incorrect DB object access 2016-11-07 12:19:03 +01:00
zotlabs
66c07a8b33 reorganise emoticons 2016-11-06 20:31:37 -08:00
zotlabs
8811ca9e9e provide /locs link on settings page if there is more than one hubloc for this channnel *that isn't deleted*. 2016-11-05 03:31:50 -07:00
zotlabs
b541351a0a ignore flags to dns_get_record() and look for anything 2016-11-02 23:37:57 -07:00
zotlabs
92f5a2b6a6 issue #409 - use item_notshown for file activities to prevent display but allow transmitting to other sites. We currently allow file acitivies with item_hidden to be transmitted as a special case but eventually we want to remove the special case and disallow items with item_hidden from being propagated. 2016-11-02 21:17:18 -07:00
zotlabs
9e2ccbd2a7 convert manual page updates to a display setting instead of a feature 2016-11-02 18:40:50 -07:00
zotlabs
6a6494d947 if connecting to a channel that is already pending, undo the pending and set connect permissions accordingly. issue #577 - this will mostly affect channels that were connected out of band, but will also auto-friend somebody that has already connected to you, if you reciprocate prior to seeing and/or acting on the pending connection notice. 2016-11-02 17:27:18 -07:00
zotlabs
ca948d66a9 feature: static page update as opposed to live update of conversations on the page. Changes will be queued until the page is reloaded. There may or may not be notifications of pending activity updates depending on your notification preferences. Endless scrolling (append) is still performed either way. This only affects changed and new/unseen items being inserted into the page. 2016-11-01 20:21:39 -07:00
zotlabs
863ee9e6dd bbcode event formatting issue 2016-10-31 21:48:00 -07:00
zotlabs
4ebd604ca9 provide plugin restrictions based on config settings 2016-10-31 18:54:04 -07:00
zotlabs
321a32050b improve the check in 9b42bc860 2016-10-30 12:33:30 -07:00
Mario Vavti
db6a207afe Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-10-30 15:54:46 +01:00
Mario Vavti
9b42bc860d possible fix for https://zothub.de/display/2d4996dd629504851d 2016-10-30 15:54:06 +01:00
zotlabs
b5c72611b4 change log string on pdo log messages 2016-10-27 15:21:40 -07:00
Florian Steinel
c1c96e01fa sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and postgresql
(see: https://www.postgresql.org/message-id/flat/1291109101.26137.35.camel%40pcd12478 )
2016-10-27 02:41:32 +02:00
zotlabs
33b1c57092 For z_dns_check() use config values from memory and ignore DB - as this function can be called in the early stages of Setup when we first try to connect to the database. 2016-10-25 23:32:24 -07:00
zotlabs
441d3bf1ed make the edited header stand out slightly 2016-10-25 20:46:57 -07:00
zotlabs
bd83936e5d send "hidden" edit activities to networks which don't support edits themselves 2016-10-25 20:43:24 -07:00
zotlabs
88a68b941f put all dns checking into one function, allow it to be ignored 2016-10-25 18:27:32 -07:00
zotlabs
084b41fc2c first cut at edit activities 2016-10-25 16:21:56 -07:00
zotlabs
7b713e2576 pdo - fetch assoc only 2016-10-25 16:15:39 -07:00
zotlabs
25982f0475 set port if non-zero (instead of non-null) 2016-10-24 18:55:11 -07:00
zotlabs
2d2ac98b3d Merge pull request #559 from zotlabs/pdo
Pdo DB driver
2016-10-25 11:48:22 +11:00
zotlabs
f1fc201862 not null violation in mail 2016-10-24 17:14:06 -07:00
zotlabs
681f45943b some more places which require dbescbin and dbunescbin 2016-10-24 00:36:38 -07:00
zotlabs
5dc8c54b8d found it... 2016-10-23 21:35:06 -07:00
zotlabs
20194bed42 this seems to work, but there are unanswered questions and is still undergoing investigation. It appears that the data stored with os_content = 1 is not being escaped in all circumstances or the scaled image data is being escaped twice. 2016-10-23 21:27:10 -07:00
zotlabs
06bbf494bb profile photo issue on postgres 2016-10-23 20:01:39 -07:00
zotlabs
21b919a76b correct encoding 2016-10-23 19:04:42 -07:00
zotlabs
39f0707201 fetch bytea as stream 2016-10-23 17:53:34 -07:00
zotlabs
8d52a278a9 Merge branch 'dev' into pdo 2016-10-23 17:49:15 -07:00
zotlabs
5fbba27d17 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-10-23 17:48:33 -07:00
zotlabs
547c700764 misplaced parens 2016-10-23 17:23:53 -07:00
zotlabs
d30892ea60 pdo hacks 2016-10-23 17:05:08 -07:00
zotlabs
ac5ad0b9ce Merge pull request #562 from fsteinel/issue-561
add column display_path to inserts into attachment, as this column is…
2016-10-23 07:27:48 +11:00
zotlabs
8fc87411fa php warning, $uplink didn't have a default 2016-10-22 13:20:51 -07:00
Florian Steinel
f84530c285 attach_mkdir use $os_path and $display_path initilized to an empty string 2016-10-22 08:07:27 +02:00
zotlabs
c5dcac4dbb issue #564 2016-10-21 21:44:15 -07:00