harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,799 Commits 6 Branches 36 Tags 152 MiB
68f6043d44
Commit Graph

879 Commits

Author SHA1 Message Date
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
zotlabs
9b3c00e0b6 pubsites: don't list dead sites 2016-11-30 01:16:44 -08:00
zotlabs
8c87f32b38 This isn't the most elegant solution as it requires a bit of arcane knowledge, but provide a way to step through connections with a specific tab/panel open in the connection editor. It does not close the default panel, but merely opens the one specified by a &section= URL parameter (closing the default panel would require a major refactoring of the default panel logic). Valid choices for section currently are affinity, filter, and perms. This tab/panel selection should persist across form posting and 'prev/next'. 2016-11-29 18:41:34 -08:00
zotlabs
d757dd4e17 provide a fresh new look and cleaner layout and more relevant information to siteinfo 2016-11-29 15:47:38 -08: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
90f3cc7328 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-11-28 11:19:20 -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
d8774cda8e minor cleanup and remove more double encoding 2016-11-28 11:54:36 +01: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
zotlabs
7de4f1d96f connedit prev/next: sort in the db. 2016-11-26 14:28:36 -08:00
git-marijus
e7a4aeca6f Merge pull request #601 from anaqreon/wiki 
Wiki: Make a git commit when a new page is created
 2016-11-25 11:08:44 +01:00
Andrew Manning
86002a2f7b Make a git commit when a new page is created, recording who created the page. 2016-11-24 18:24:15 -05:00
zotlabs
08a4bbb7d0 prev-next navigation for mod_connedit 2016-11-24 15:08:31 -08:00
Mario Vavti
6cf8ca5e43 whitespace and minor fixes 2016-11-23 13:38:27 +01:00
Mario Vavti
f76046b612 silence headers already sent warning. issue #596 2016-11-23 10:28:37 +01:00
Mario Vavti
69e1f6e4ba whitespace and coding style 2016-11-23 09:47:10 +01:00
Mario Vavti
2fce010f30 whitespace cleanup 2016-11-23 09:41:10 +01:00
Mario Vavti
060982adb4 display wiki list on wiki landing page. 2016-11-22 11:30:04 +01:00
zotlabs
abb3341030 redmatrix is no longer considered a supported platform and will not be listed in pubsites as of 2.x 2016-11-19 13:15:29 -08:00
Andrew Manning
16281c626b Hide all content if no wiki is selected except for a message saying to choose one. 2016-11-18 22:10:55 -05: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
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
Andrew Manning
1985502894 Merge remote-tracking branch 'upstream/dev' into wiki 2016-11-14 20:47:38 -05:00
Andrew Manning
c3e3c32bdc Moved delete wiki button into new edit wiki form, opened by edit wiki icon in wiki list 2016-11-14 20:45:04 -05:00
zotlabs
544330345b SECURITY: public calendar leaks connection information (birthdays) when view_contacts is not allowed 2016-11-14 13:55:31 -08:00
zotlabs
7763643f2e zidify wiki content 2016-11-13 15:06:16 -08:00
Andrew Manning
af11525338 Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved page tools in there as well as new page and new wiki 2016-11-12 14:42:21 -05: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
743cfa13fd a bit more background work to support private mail preview 2016-11-08 16:25:36 -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
Mario Vavti
7cd7837e08 reverse logic 2016-11-07 23:24:07 +01: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
94065fde33 issue #576 - duplicate events shown 2016-11-02 19:26:02 -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
cb9e944de1 remove debugging 2016-11-02 17:01:44 -07:00
zotlabs
1f92c594c8 issue #575, when 'nofinish' is set on an event, invalid date was generated/stored 2016-11-02 17:00:29 -07:00
zotlabs
f91031bd65 allow your own likes/comments to be updated when in static update mode 2016-11-02 15:48:29 -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
b13fb1cca9 command line connect utility. 
Usage: util/connect uid|nick channel

uid|nick must be a local channel. The target channel can be any channel. If a nick is supplied as a target it is assumed to refer to a channel on the localhost unless @host is provided. RSS feeds and remote networks can also be connected, assuming the appropriate protocols are already enabled for the local channel. If the target channel is a non-forum on the local system and you wish bi-directional communication to be enabled you will probably need to use a second connnect command with the source and target reversed.

Examples:

	util/connect bob marketing

	Connects bob to the marketing channel

	util/connect marketing bob

	Connects the marketing channel to bob.

	util/connect 6 channelone@macgirvin.com

	Connects the channel with channel_id 6 to the Channel One public forum.

	util/connect bob https://mysite.foo/feed.rss

	Connects bob to an RSS feed if RSS feeds are allowed as connections on this site

	util/connect bob jb@diasp.org

	Connects bob to a diaspora account on diap.org (both the site and Bob's channel must previously have the Diaspora Protocol enabled).
 2016-11-01 15:27:34 -07:00
zotlabs
581ef6e18d string update 2016-10-30 12:34:00 -07:00
zotlabs
9c05f37c0f update setup and install documents for PDO and the freebsd issue with 
dns_get_record()
 2016-10-27 19:02:27 -07:00
zotlabs
2b3b5d2c8a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-10-26 21:52:53 -07:00
zotlabs
d46fe20986 modernise chanview, which has a renewed purpose - to provide a connect link to foreign network members. The iframe no longer works due to content security policies, and people hated this with a passion anyway; so just provide a URL to visit. 2016-10-26 21:50:30 -07:00
zotlabs
9e46409517 Merge pull request #570 from fsteinel/issue-NEW 
sql: limit 1 for UPDATE and DELETE is not supported …
 2016-10-27 12:38:46 +11:00
zotlabs
d42da529ec zot_finger from navbar people search looping 2016-10-26 18:35:10 -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
aee2742951 when inserting a link, if the url begins with '!' ignore oembed and do everytthing old school. 2016-10-26 16:44:54 -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
06bbf494bb profile photo issue on postgres 2016-10-23 20:01:39 -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
5c891bcfb5 need to perform dbunescbin on stored filenames as well as binary data - this is a no-op under mysql but could provide unpredictable data under postgres 2016-10-23 17:46:29 -07:00
zotlabs
0b5d550780 Merge pull request #565 from anaqreon/wiki-download 
Add wiki download button to export the selected wiki repo to a zip file
 2016-10-23 07:28:38 +11:00
Mario Vavti
5fb173149a provide lockstate for events and remove obsolete code 2016-10-22 20:44:41 +02:00
Andrew Manning
02cf7274d2 Add wiki download button to export the selected wiki repo to a zip file 2016-10-22 08:52:26 -04:00
zotlabs
bb1b6c906d Merge pull request #563 from ilu33/dev 
Postgres complaining again ...
 2016-10-22 15:07:08 +11:00
zotlabs
aa9fef7778 squash timezone adjusted birthdays into a single day in the calendar, by lying and telling the js calendar that the end date/time is unknown 2016-10-21 20:56:01 -07:00
ilu33
351f21c89f Postgres complaining again ... 
```sql
UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = 13 LIMIT 1) WHERE abook_profile = '' AND abook_channel = 13 ; returned false
ERROR:  syntax error at or near "profile"
LINE 1: ... SET abook_profile = (SELECT profile_guid AS FROM profile WH...
                                                             ^
```
 2016-10-22 05:52:29 +02:00
zotlabs
5e761a1068 full revert, that wasn't working at all. Not sure why. 2016-10-21 14:27:29 -07:00
zotlabs
afff751ff1 partial revert 2016-10-21 14:23:49 -07:00
zotlabs
222186d5f7 fine tune the navbar people autocomplete, as the check for minimum length wasn't taking into consideration the initial tag character, and one char search provides way too many results. The autocomplete cache doesn't search again but just searches through its cache. This means as you type more chars, if the answer wasn't included in the very first search (one char), it won't be returned. This may need further tweaking as the network grows. 2016-10-21 14:15:29 -07:00
zotlabs
29320f8aad remove requirement that imported profile photos be in the profile photos album 2016-10-18 18:37:58 -07:00
zotlabs
2a59f45a3b Change the behaviour of 'use existing photo for profile'. For a channel with one profile, works just as it did previously. For multiple profiles, go back to the "upload form" but with a pre-existing file selected so that the correct profile can be selected. The text on this page and the resulting form are changed to remove the 'upload' text and file selection; but falls through to cropping in either case. 2016-10-18 18:30:50 -07:00
zotlabs
2db7b2d948 change event behaviour - share by default. 2016-10-18 16:46:09 -07:00
Klaus Weidenbach
745515b11f [FEATURE] Add config and use composer autoloader. 
We use composer already to install SabreDAV. Include config
composer.(json|lock) to install and manage more dependencies
in future.
Also provide PSR-4 autoloading for our namespaced classes, e.g.
"Zotlabs\". To regenerate autoloader maps use:
$ composer install --optimize-autoloader --no-dev

We could also remove the whole vendor/ folder from our repository, but
that would need changes in deployment and how to install hubs and needs
more discussion first.
 2016-10-18 18:11:41 +02:00
zotlabs
17091bd38c add get_photo hook to go along with get_profile_photo hook. This allows a plugin to over-ride the permissions for cover photos or insert a different photo in place of that requested 2016-10-17 22:09:41 -07:00
zotlabs
e46e3027fa rename diaspora2bb() to markdown_to_bb() to reflect that is has a more generic use 2016-10-16 16:48:33 -07:00
zotlabs
5d9cf6a6d7 remove logging 2016-10-14 13:17:53 -07:00
zotlabs
47db3452f4 permissions issue 2016-10-14 13:16:33 -07:00
Klaus Weidenbach
7b41839ea8 [TASK] Update Doxyfile and fix Doxygen errors. 
Updated Doxyfile to include new folders.
Add a list for @hooks tags.
Fixed some parsing problems for Doxygen.
 2016-10-13 11:27:23 +02:00
zotlabs
6532972e61 additional array checking 2016-10-13 00:30:41 -07:00
zotlabs
48026efddf consolidate duplicated code for creating table entries from an array 2016-10-12 22:12:58 -07:00
zotlabs
e314510005 minor 2016-10-12 20:41:59 -07:00
zotlabs
9bb847bb07 remove the rest of the backticks from sql queries; replace with TQUOT const which is driver dependent 2016-10-12 18:15:12 -07:00
zotlabs
fc7d29edd3 some more api work 2016-10-12 15:31:14 -07:00
zotlabs
f56b4773cb When importing a channel from another server, try to auto-discover the best available api path. 2016-10-11 20:53:13 -07:00
zotlabs
af13e5fa4a since the snap module runs without permissions controls, verify the logged in channel matches the requested cloud path 2016-10-09 21:36:55 -07:00
zotlabs
8eac8132e3 snap dav module is currently read-only. error out on any request methods which can alter data. 2016-10-09 21:28:24 -07:00
zotlabs
02c72e59fa provide a DAV module which accesses the raw data storage for a channel. Together with an export data function in the API this allows a client process to create true backups of the cloud storage and importable cloud mirrors with all the metadata intact. The import function will need to be modified slightly to obtain the file contents from a plugin or API call; since it currently tries to fetch it from the source hub. 2016-10-09 20:49:40 -07:00
zotlabs
e7233c0c94 more backquotes - this should take care of most except for the array import queries 2016-10-09 16:31:04 -07:00
redmatrix
48f70e55aa try naked embed before submission instead of at render time 2016-10-06 15:59:27 -07:00
redmatrix
55c67c7870 remove obscured @ hack 2016-10-04 19:37:16 -07:00
redmatrix
26ea11c44f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-10-04 15:33:39 -07:00
redmatrix
de1825e54b remove leftover rating fragment 2016-10-04 15:33:14 -07:00
Mario Vavti
e259503933 feature_enabled() only takes two arguments 2016-10-04 21:12:03 +02:00
redmatrix
4e07b4c0e8 even more backslashes 2016-10-03 22:01:14 -07:00
redmatrix
ce6e81c682 more backticks 2016-10-03 21:48:53 -07:00
redmatrix
c44acb3575 allow delivery report for not just the author, but also if you're the owner and it's on your wall. 2016-10-03 20:50:13 -07:00
redmatrix
bad5057a74 start removing db backticks 2016-10-03 19:47:36 -07:00
redmatrix
cef1aa6d1b add some more stuff to admin/account_edit (service class, language, and techlevel if appropriate). Fix en-au and en-gb so they are listed as languages, and move language selector stuff to include/language.php instead of include/text.php; new file Zotlabs/Lib/Techlevels.php so we only need to write the selection array once. 2016-10-03 17:16:24 -07:00
redmatrix
e1df151d9b sync cloud storage permission changes (issue #538 continued) 2016-10-01 16:01:22 -07:00
redmatrix
fa94644bcf Unify the various mail sending instance to enotify::send() and z_mail(). Both take the same arguments. z_mail() is text only, enotify::send() provides html and text. Both are pluggable using the enotfy_send hook. 2016-10-01 03:06:01 -07:00
redmatrix
ad309f1036 provide ability for admin to change account password 2016-09-30 15:42:14 -07:00
redmatrix
56b12f6555 issue #538 continued 2016-09-30 13:00:15 -07:00
redmatrix
07df5833be more tag filtering in setup 2016-09-29 19:17:09 -07:00
redmatrix
3727bea29a issue #538 continued 2016-09-29 16:20:26 -07:00
redmatrix
5b6c2c32bf Bring the saved search feature in line with the spec, and publish the feature spec. 2016-09-28 20:55:15 -07:00
redmatrix
095e2bf0b3 file clone sync issue, 1. channel permission import had no uid, 2. mod_getfile was sending attach['data'] instead of attach['content'] 2016-09-28 16:51:47 -07:00
redmatrix
80b655fa7e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-28 02:44:42 -07:00
redmatrix
db95e6eba5 issue #537 - angle bracket characters in DB password not recognised 2016-09-28 02:43:50 -07:00
Mario Vavti
f0e8c9ead9 fix wrong array key for profile photo resloution 2016-09-28 11:13:30 +02:00
Mario Vavti
d92e9f38f8 fix with update with /channel?f=&mid=hash issue #461 2016-09-28 11:04:02 +02:00
redmatrix
eff2e6c795 make the fetching of the default profile photo hookable, and document the hook 2016-09-27 18:11:04 -07:00
redmatrix
4663278f52 Merge branch 'nulldate' into dev 2016-09-26 18:17:38 -07:00
redmatrix
fb9544badd null_date conversion; phase 1 2016-09-25 17:06:13 -07:00
redmatrix
c04c57ea0f the rest of the backend for supporting scroll-to-comment from notifications. We still need an ajax handler as fragments are evaluated before content is loaded. 2016-09-24 16:20:25 -07:00
redmatrix
dca4db9d4d convert oembed tools to use json arrays rather than json objects 2016-09-24 05:15:06 -07:00
Mario Vavti
56aa568124 objects with id=share_container seem to be blacklisted in various security browser plugins. rename it to distr_container. also remove some superfluous js 2016-09-22 11:07:21 +02:00
redmatrix
4511f8855b issue #516 2016-09-20 15:53:30 -07:00
Mario Vavti
8d0a0674c6 fix issue #517 2016-09-19 13:35:36 +02:00
redmatrix
2863c35ab5 a couple more namespace issues with exception handlers 2016-09-18 17:51:40 -07:00
redmatrix
44d945cd08 couple of minor issues with dba namespace during install and enotify::format referencing an unknown variable 2016-09-18 17:35:11 -07:00
redmatrix
0754da58da some changes merged from wrong branch... new function channel_reddress() instead of hardwired generation and which fixes case-sensitivity; allow dot notation in config and pconfig utils, updated string file 2016-09-17 14:51:57 -07:00
Mario Vavti
81624a601a fix settings/account 2016-09-12 15:03:51 +02:00
redmatrix
a90a0874b8 fix for old style version specifiers 2016-09-08 22:56:51 -07:00
redmatrix
2d83ea86dc more get rid of illegal offset in include/conversation 2016-09-08 22:33:39 -07:00
redmatrix
83b89b9576 pro: provide settings for techlevel and techlevel_lock on admin/site page 2016-09-08 00:50:53 -07:00
redmatrix
4c89f5d397 pro: better handling of system techlevel settings. 
system.techlevel = initial techlevel for all new accounts
system.techlevel_lock = if 1, account techlevel cannot be changed

this allows accounts to exist with alternate techlevels than a locked default, but they need to be set by the administrator. By default with no config settings, everybody starts at 0 but can set their own level.
 2016-09-07 21:02:57 -07:00
redmatrix
c2f83639d4 provide version info in /pubsites 2016-09-07 17:36:45 -07:00
redmatrix
77e865fc8e pubsites: we still need to filter really really old redmatrix sites. These will not provide a pleasant experience. We probably should add version to the table. 2016-09-07 13:45:52 -07:00
redmatrix
0d7eb186d1 Remove the platform check in pubsites, since we're reporting it now. Folks can decide for themselves. 2016-09-07 13:40:07 -07:00
redmatrix
de03f7f9ce photo move to another album - resurrected from a temporary branch where the work had gotten lost 2016-09-06 23:13:55 -07:00
redmatrix
6e149a2dd3 turn Settings page into sub-modules 2016-09-06 20:10:56 -07:00
redmatrix
95d24f1d30 final cleanup on submodules 2016-09-05 21:08:40 -07:00
redmatrix
dbb4ccbcc0 move the rest of mod_admin to sub modules 2016-09-05 21:00:00 -07:00
redmatrix
ed213c4d6d move admin/plugins::post to submodule and get rid of absolute paths 2016-09-05 19:50:55 -07:00
redmatrix
abb7695624 move admin/security to submodule 2016-09-05 19:10:12 -07:00
redmatrix
2cadda657c superfluous backslash 2016-09-05 18:16:29 -07:00
redmatrix
bedc7b7b69 use SubModule class for generalising submodules, move back to the zotlabs/module hierarchy 2016-09-05 18:11:00 -07:00
redmatrix
d7d46def9d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-09-05 17:10:31 -07:00
redmatrix
1639f5b83d add links to zcards #500 ; also provide drag/drop highlighting of comment regions when a link is being dragged over them 2016-09-05 17:08:48 -07:00
Mario Vavti
ba33c51b8c json_decode() should return an array instead of an object at this place 2016-09-05 10:31:19 +02:00
redmatrix
aaa7d6a0ec begin to organise the admin module into independent sub-modules. The same needs to happen with the API module. Using admin/plugins->get() as the first test case 2016-09-04 22:42:13 -07:00
redmatrix
ecb44ad572 sidebar table of contents for help hierarchies; note that these should probably be html due to extraneous linefeeds you might find in bbcode or markdown 2016-09-04 18:35:06 -07:00
redmatrix
5a1887ed17 move doc file parsing and rendering from the module level to the help library so that it can be re-used by widgets 2016-09-04 00:50:35 -07:00
redmatrix
a7eae1031c update diaspora compatibility list, and also remove private mail 'unsend' (recall) from techlevel 0 which includes the basic server configuration. It's one less cross network compatibility issue that basic members will have to be aware of and one less complication for entry-level 'pro' members. 2016-09-03 16:33:48 -07:00
redmatrix
904881e207 pro: allow admin to set a site techlevel and optionally lock it. 2016-09-02 16:08:30 -07:00
redmatrix
75c1e7a193 missed the namespace 2016-09-02 02:34:33 -07:00
redmatrix
5897ed896a empty schema 2016-09-02 02:06:05 -07:00
redmatrix
47dd1da6fb put theme config into its own namespace 2016-09-01 22:20:08 -07:00
redmatrix
b3efdf2109 turn theme configuration into a class object 2016-09-01 22:10:56 -07:00
redmatrix
e5c077243c check that the advanced_theming feature is enabled before the pdledit module can be accessed. 2016-09-01 20:35:52 -07:00
redmatrix
af87038150 separate the 'expert' feature into 'advanced_theming' and 'advanced_dirsearch'. Hide both features unless techlevel > 3. 2016-09-01 19:01:02 -07:00
redmatrix
720f1d7123 actively set all the theme options on the display settings page based on the current theme selection 2016-09-01 17:09:58 -07:00
redmatrix
678148b9aa more work on theme select backend 2016-09-01 13:48:11 -07:00
redmatrix
549943fb10 provide json module to load theme specific settings so we can auto-fill the display settings page with schemas and theme settings whenever somebody makes a different theme selection 2016-09-01 13:19:08 -07:00
redmatrix
2ebb8851f6 theme preview - that was easy; plus a bit more tweaking of the saved search widget to try and get the sucker to auto submit 2016-09-01 12:42:47 -07:00
redmatrix
fa8febbb31 some issues with saved search - tags and connection searches weren't being saved. 2016-08-31 21:57:08 -07:00
redmatrix
4bdb028499 Hubzilla pro: Don't offer 'custom/expert' permissions below a techlevel of 4; but any existing expert mode members are grandfathered in. 2016-08-31 19:55:45 -07:00
redmatrix
d18a8e849e Do not allow PERMS_PUBLIC as a choice for writable permission limits. Change text of buttons in expert mode for consistency with usage ('Channel Permission Limits' and 'Default Access Control List (ACL)'). 2016-08-31 19:22:47 -07:00
redmatrix
ea0be8ea1a provide techlevels in the pro server role. Should have no visible effect on other roles. 2016-08-31 17:49:22 -07:00
redmatrix
bf3a409569 only check permissions on normal photos and force cover photos as well as profile photos to be public. As a side effect 'thing' photos will also be considered public. 2016-08-30 20:54:54 -07:00
Andrew Manning
16b7df3717 Imported webpage elements update existing elements properly. AllowCode permission is checked correctly and issues error on import if denied. 2016-08-30 22:11:14 -04:00
redmatrix
d03c66c924 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-30 13:36:01 -07:00
Andrew Manning
ad5c93d673 Merge remote-tracking branch 'upstream/dev' into website-export 2016-08-30 06:14:22 -04:00
redmatrix
52b80711f6 remove duplicated include 2016-08-29 21:21:09 -07:00
redmatrix
6b4cfe4f18 Before throwing a 'smarty3 dir does not exist' fatal error, try and create it. We did try and create it during install, but the template processor is initalised long before we get to that code (and throws that ugly error). 2016-08-28 22:24:27 -07:00
redmatrix
810d9fefd9 create smarty dir before any templates can be initialised 2016-08-28 22:18:51 -07:00
redmatrix
fb13e69b8e supercedes pull request #503 2016-08-28 21:48:17 -07:00
redmatrix
689f232243 move allowed email domains to admin->security page 2016-08-28 19:36:14 -07:00
redmatrix
8931adc048 fix aconfig 2016-08-28 16:17:58 -07:00
Andrew Manning
07e28a9757 Display text around the searched query in documentation search 2016-08-27 21:26:16 -04:00
Andrew Manning
b05474fc30 Merge remote-tracking branch 'upstream/dev' into website-export 2016-08-27 18:58:10 -04:00
redmatrix
381b1a066d doc search broken 2016-08-27 15:30:46 -07:00
Andrew Manning
ddfc5209d3 Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php. 2016-08-27 06:52:01 -04:00
redmatrix
38ea8bee93 ratings are gone. They can be enabled, but there is no UI for doing so at this time; and will likely only be available in a 'pro' configuration once the new implementation details have been hashed out. This appears to require a mechanism for rebuttal before it can again be opened to the public. There are also some synchronisation issues to contend with; as ratings are currently only distributed to active directory servers. There is no reliable mechanism for a new directory server to fetch existing ratings. 2016-08-25 17:43:07 -07:00
redmatrix
238621ee92 allow changing the server role - as well as configuring any of the three options during installation 2016-08-23 23:00:24 -07:00
Andrew Manning
420aa4bc44 Merge remote-tracking branch 'upstream/dev' into website-export 2016-08-23 06:57:10 -04:00
Andrew Manning
305e0538d2 Website export to cloud files works. Created new recursive copy function in attach.php. 2016-08-23 06:55:26 -04:00
redmatrix
38ca3bac40 optional server role compatibility checks for plugins 2016-08-22 17:41:41 -07:00
redmatrix
d177cf94da server role management, part 1 2016-08-22 16:21:07 -07:00
redmatrix
b6a545b4a2 Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev 2016-08-21 16:33:59 -07:00
redmatrix
4d34d9c032 issue #496 2016-08-21 16:26:30 -07:00
Mario Vavti
4f62d7a78f move jotnets to jot and some cleanup (mostly whitespace) 2016-08-21 15:43:03 +02:00
Andrew Manning
1c61e316b4 Block export and re-import works. Fixed bug where layout content was not being imported properly. 2016-08-20 21:08:15 -04:00
Andrew Manning
2d42d58738 Layouts list and are selectable for export to the zip file 2016-08-20 16:05:27 -04:00
Andrew Manning
80ed05d45d Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages. 2016-08-20 15:22:30 -04:00
Andrew Manning
cf93d9c3b4 Merge remote-tracking branch 'upstream/dev' into website-export 2016-08-19 19:34:04 -04:00
Andrew Manning
40a7d38210 Pages populate the available-to-export list. New checkbox class for smaller boxes. 2016-08-19 19:32:52 -04:00
redmatrix
e4244c0cac remove insecure repository warning. 2016-08-18 17:22:54 -07:00
Andrew Manning
f2e87a204d Progress implementing zip file export 2016-08-17 21:25:50 -04:00
redmatrix
8a89cfb158 move schema settings into the display settings main so we can set theme:schema theme selectors in settings 2016-08-15 22:45:07 -07:00
redmatrix
4facae674d fix attached photo/file permissions on clones 2016-08-15 13:18:25 -07:00
Andrew Manning
2e7f4c1870 Added a disable comments setting to the "Additional features" settings with a corresponding post editor toggle button 2016-08-14 06:41:12 -04:00
redmatrix
5365e9b3a5 string update 2016-08-12 14:45:16 -07:00
zottel
dc3cc655db fix auto-connect setting 2016-08-12 23:27:03 +02:00
redmatrix
6bc5dd75bd more cleanup of api 2016-08-11 19:42:44 -07:00
redmatrix
3ba4b2c1c1 A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but you have to start somewhere. 2016-08-11 17:02:52 -07:00
Mario Vavti
82e867a9a8 implement acl for folder creation 2016-08-10 16:17:09 +02:00
redmatrix
5243dd153b use config system.server_role and deprecate 'UNO' 2016-08-07 17:29:35 -07:00
redmatrix
9068ae68ad Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-05 15:40:10 -07:00
Mario Vavti
b2298d44a4 multi acl: port /settings 2016-08-05 14:45:06 +02:00
Mario Vavti
c029839971 multi acl: port /display 2016-08-05 14:25:37 +02:00
Mario Vavti
e7e73e6fd1 multi acl: port /thing 2016-08-05 13:37:47 +02:00
Mario Vavti
bed0a5773f multi acl: port /rpost 2016-08-05 13:20:03 +02:00
Mario Vavti
53a2262fef Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-08-05 12:13:50 +02:00
redmatrix
eeabf514ea minor cleanup on ratings - no real functional changes at this time 2016-08-04 18:56:05 -07:00
Andrew Manning
6a82ff871f Parse bbcode when page loads 2016-08-04 19:45:35 -04:00
Mario Vavti
036b72757c multi acl: port /wiki 2016-08-04 12:09:06 +02:00
Mario Vavti
120e9a1e4c multi acl: port /webpages and /mitem 2016-08-04 11:23:43 +02:00
Mario Vavti
b49cfb2efd multi acl: port /chat 2016-08-04 10:46:50 +02:00
Mario Vavti
0340160ba7 multi acl: port /cloud and /filestorage 2016-08-04 10:36:45 +02:00
Mario Vavti
4ede3fd771 multi acl: port photos 2016-08-04 09:10:21 +02:00
Mario Vavti
3783c1af3e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-08-04 08:10:13 +02:00
Andrew Manning
05a9f0aa14 Convert select bbcode tags including [observer], [baseurl], [sitename] 2016-08-03 20:53:51 -04:00
redmatrix
178c983871 issue #473 - unable to delete privacy groups 2016-08-03 16:10:28 -07: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
0febfce268 missing comma in atoken update sql 2016-08-02 19:31:31 -07:00
redmatrix
69354e808f this should sort out likes showing up as wall-to-wall posts on diaspora 2016-08-01 22:12:44 -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
3d0c90cbc5 allow individual permissions on atokens 2016-07-31 23:17:07 -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
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
Andrew Manning
32366284a8 Import element selection page added to allow selective importing. 2016-07-30 09:56:47 -04: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
redmatrix
02fc082e45 github didn't accept the last push. Touching the files to force a git revision 2016-07-27 22:40:33 -07:00
redmatrix
be1ffca6f4 fix italian strings (messed up by rtl variable); and finish removing openid from core 2016-07-27 22:28:30 -07:00
redmatrix
5f3a8cbe93 add the hidden flag also 2016-07-27 16:14:46 -07:00
redmatrix
72479041ae don't include deleted or orphaned xchans in ratings search 2016-07-26 22:50:31 -07:00
redmatrix
5d4245ff01 move openid to addon 2016-07-25 17:16:41 -07:00
redmatrix
01338a7610 make drag/drop work with acl, which bypassed the form 2016-07-24 22:58:26 -07:00
redmatrix
271f85be3b add acl selection to files upload via /cloud (still missing from directory creation) 2016-07-24 20:27:59 -07:00
redmatrix
b5f2b4af35 string update and some minor comment edits 2016-07-24 16:11:34 -07:00
redmatrix
7d897a3f03 more work on #453 2016-07-21 23:06:55 -07:00
Andrew Manning
5a63ddd645 Merge remote-tracking branch 'upstream/dev' into website-import 2016-07-21 21:14:54 -04: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
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
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
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