zotlabs
a3c45d47e6
add the ostatus:conversation element which is now more or less required by GNU-Social to work around some short-comings of the OStatus delivery model when it comes to conversational message grouping. If this element isn't there, message replies will not get grouped with the parent specified in thr:in-reply-to, which exists to group conversations together. The reasoning being that due to the point-to-point delivery model, a reply could arrive on one site which does not have a copy of the parent specified by thr:in-reply-to. Hence further replies arriving on this site are grouped with the first arrived comment as the parent. Since this project doesn't allow comments which don't have top-level parents, we can just set it to the parent-mid and save being forced to create a new database structure for orphan children acting as parents.
2017-01-06 13:42:45 -08:00
zotlabs
6db2561eda
preserve the original message-id coming from feeds - we will have to escape them properly before calling mod_display.
2017-01-06 13:25:57 -08:00
zotlabs
ba2d0fae0e
Merge branch 'dev' into gnusoc
2017-01-06 12:24:26 -08:00
zotlabs
2312302dea
setup: check disabled functions more precisely than using a string match
2017-01-05 14:17:56 -08:00
zotlabs
dfede52048
ical import/export - provide mechanism to preserve original source formatting across zot based systems.
2017-01-05 13:55:04 -08:00
zotlabs
ec18c3770b
issue #639 , voting setting is lost after post is edited (also the disabling of comments)
2017-01-05 12:17:36 -08:00
zotlabs
1ce8168d72
some gnusoc fixes
2017-01-04 11:47:08 -08:00
zotlabs
b88a735e54
feature: allow event creation in other timezones than your own.
2017-01-01 19:51:44 -08:00
zotlabs
1cd779459b
better fix for #629 #635 based on ownership/authorship rather than message flags which could be forged
2016-12-31 16:03:41 -08:00
zotlabs
e2eb0b2eac
better fix for #629 #635 based on ownership/authorship rather than message flags which could be forged
2016-12-31 15:56:45 -08:00
zotlabs
444e938e2d
issues #629 , #635 - edited post arriving from downstream source was not being rejected
2016-12-31 13:38:19 -08:00
zotlabs
3dd4bf9955
move api version call back to core
2016-12-30 02:48:42 -08:00
zotlabs
2e2254371a
move api version call back to core
2016-12-30 02:45:16 -08:00
zotlabs
693f7366a2
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-12-30 02:36:24 -08:00
zotlabs
b673c804be
profile clone issue with dev
2016-12-30 02:34:26 -08:00
zotlabs
03a1086ba3
logger typos
2016-12-30 02:32:53 -08:00
zotlabs
e8a2ad4315
logger typos
2016-12-30 02:31:53 -08:00
Andrew Manning
13768fdb9b
Zot structures doco integrated into the Zot page. Added nowrap option to [code] BBcode tag.
2016-12-28 14:58:25 -05:00
zotlabs
db9ea66069
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
2016-12-27 15:28:52 -08:00
zotlabs
ef02464e3c
issue with HTML in code blocks in markdown in wiki
2016-12-27 15:28:42 -08:00
zotlabs
17b7042a25
issue with HTML in code blocks in markdown in wiki
2016-12-27 15:26:47 -08:00
zotlabs
3bb6c667db
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-12-26 13:11:54 -08:00
zotlabs
b530d1d449
perform input validation on xchan_store and re-enable the post method of the xchan api endpoint.
2016-12-26 13:10:24 -08:00
Andrew Manning
1a5dd5c87c
Updated markup language support doco. Modified parseIdentityAwareHTML BBcode parsing to support the BBcode reference which is now in /help/member/bbcode.html. Add Bootstrap classes to tables for BBcode tables that have the border=0 or border=1 options set.
2016-12-26 08:58:40 -05:00
zotlabs
c38e7ee3e3
show webpages link to visitors if a 'home' page exists. This means the nav menu must be used to edit pages.
2016-12-25 14:26:27 -08:00
zotlabs
35ed9b9b72
issue with post signatures if posted from api and logged in locally with a different identity.
2016-12-24 15:00:37 -08:00
Mario Vavti
3b9b03cf86
Merge branch '2.0RC'
2016-12-23 10:09:46 +01:00
zotlabs
f2bfdfdedd
provide separate logging (if configured) for btlogger which is used to catch really subtle issues which don't always leave an audit trail. Similar to dbfail.out, the file btlogger.out (if it exists and is write-able) will only log these unusual situations with backtraces so we can find the culprits.
2016-12-21 23:35:54 -08:00
Mario Vavti
0c23cd62db
fix a glitch in sticky-kit and comment out alt_pager() in widget_conversations since it will not work there
2016-12-21 11:53:20 +01:00
Mario Vavti
04472bd730
fix a glitch in sticky-kit and comment out alt_pager() in widget_conversations since it will not work there
2016-12-21 11:51:24 +01:00
zotlabs
3d811a17fe
provide call button on connections list if mobile|tablet and a phone number exists
2016-12-20 23:26:31 -08:00
zotlabs
a270ca5101
allow update of fn and initial setting from channel name
2016-12-20 19:31:50 -08:00
zotlabs
493aa9f20d
progress on abook_vcard
2016-12-20 18:43:20 -08:00
zotlabs
4103344e48
abook_vcard first commit
2016-12-20 16:45:12 -08:00
zotlabs
d2cc7df7db
allow tel: links on mobile devices
2016-12-19 18:59:40 -08:00
zotlabs
231b70b987
call zidify_links() when formatting bbcode for internal consumption
2016-12-19 16:06:49 -08:00
zotlabs
1798ebd395
improve oembed cache security
2016-12-19 15:38:42 -08:00
zotlabs
350627988e
zidify private mail
2016-12-19 14:35:13 -08:00
zotlabs
96260ba26d
deprecate bb_iframe
2016-12-18 22:34:02 -08:00
zotlabs
ca2e2f5f45
deprecate bb_iframe
2016-12-18 22:33:23 -08:00
zotlabs
92f3d863fa
re-factor item_photo_menu - there is some room for future development, currently it was made compatible with minimal template changes
2016-12-18 16:26:00 -08:00
zotlabs
6cf17c7bcc
use array_shift - it's cleaner
2016-12-15 16:41:01 -08:00
zotlabs
a89772652d
z_fetch_url incorrect variable
2016-12-15 16:04:07 -08:00
zotlabs
95485a0da2
z_fetch_url incorrect variable
2016-12-15 16:02:52 -08:00
zotlabs
f67acc82cf
html2plain warnings
2016-12-15 13:45:27 -08:00
zotlabs
e70dbec6b9
postgres is picky about this stuff
2016-12-14 20:55:26 -08:00
zotlabs
00fc66d8e8
postgres is picky about this stuff
2016-12-14 20:51:10 -08:00
zotlabs
9daa97f279
Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge
2016-12-14 14:33:03 -08:00
zotlabs
4094c47e29
markdown regex
2016-12-14 14:28:59 -08:00
zotlabs
63efbdffe6
markdown regex
2016-12-14 14:27:00 -08:00
Mario Vavti
a7af6d8a3c
fix regex
2016-12-14 13:18:02 +01:00
Mario Vavti
ee1fe95ee5
fix regex
2016-12-14 13:17:33 +01:00
Mario Vavti
f79c619065
wiki: do not show revert buttons if we do not have write perms and minor cleanup
2016-12-14 11:56:42 +01:00
Mario Vavti
028935a318
wiki: do not show revert buttons if we do not have write perms and minor cleanup
2016-12-14 11:55:52 +01:00
zotlabs
cbffd32d8e
use absolute namespace in case this gets moved
2016-12-13 20:05:36 -08:00
zotlabs
0394a3e939
tag and mention handling in private mail (which required refactoring the bbcode cleanup stuff in mod_item)
2016-12-13 20:01:38 -08:00
zotlabs
66a53c6d3c
add plugin hook to zot_best_algorithm()
2016-12-13 18:43:47 -08:00
zotlabs
c4a9b61da6
restructuring include/message for mail preview
2016-12-13 16:34:08 -08:00
Mario Vavti
29bf6e5d32
bring lockview to wikilist
2016-12-13 11:15:05 +01:00
Mario Vavti
0927af40c3
bring lockview to wikilist
2016-12-13 11:14:22 +01:00
Mario Vavti
68bdd26426
simplify wikilist widget
2016-12-13 10:09:56 +01:00
Mario Vavti
342c4384e4
simplify wikilist widget
2016-12-13 10:09:26 +01:00
zotlabs
0f7d36cfa0
move the rest of superblock out of core
2016-12-11 16:27:43 -08:00
zotlabs
9e27559bdb
clone sync missing for some item delete operations
2016-12-11 14:39:06 -08:00
Mario Vavti
65a26958f7
fix embed-image for fullscreen mode and some adjustments for /help
2016-12-10 21:33:29 +01:00
zotlabs
0a6916e1b9
superblock issue + string update
2016-12-09 00:49:55 -08:00
zotlabs
8b57add891
don't alter received/changed timestamps when editing
2016-12-08 16:18:40 -08:00
zotlabs
5833bb3bd4
only update the 'changed' timestamp for recent item_store events
2016-12-08 11:16:23 -08:00
zotlabs
b407074281
always check api_user
2016-12-07 19:04:24 -08:00
zotlabs
07706b41f4
document the api filedata call
2016-12-07 15:22:26 -08:00
zotlabs
b3963456c0
attach_list_files bugfix
2016-12-06 21:11:39 -08:00
zotlabs
641e9ff508
api files improvements/fixes and documentation
2016-12-06 20:34:23 -08:00
Andrew Manning
8ba5cbc2b9
Merge remote-tracking branch 'upstream/dev' into doco
2016-12-05 20:16:19 -05:00
zotlabs
fbf13dde21
minor changes to config api and markdown_to_bb
2016-12-05 14:50:34 -08:00
zotlabs
bdd713413a
typo
2016-12-04 20:24:55 -08:00
zotlabs
e896592261
minor optimisation to reduce code duplication
2016-12-04 17:48:31 -08:00
zotlabs
df23ef36c7
api_zot: implement /api/z/1.0/network/stream and fix /api/z/1.0/channel/stream
2016-12-04 17:07:25 -08:00
zotlabs
16e48a859c
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-12-04 11:43:27 -08:00
zotlabs
6346c00527
bugfix for api group_members
2016-12-04 11:42:40 -08:00
Mario Vavti
bb7680dc51
implement content type in wiki list
2016-12-04 15:07:03 +01:00
Mario Vavti
161572b292
leave toc title for the author
2016-12-04 14:31:45 +01:00
Andrew Manning
3b3da24823
Merge remote-tracking branch 'upstream/dev' into doco
2016-12-04 08:08:22 -05:00
Mario Vavti
b12d4c03cb
fixes for toc bbcode and bbcode wiki toc
2016-12-04 12:51:23 +01:00
zotlabs
25ea754502
item_store: parent wasn't being returned in api call
2016-12-03 13:16:04 -08:00
zotlabs
a33a5771ed
Merge pull request #608 from redmatrix/jeroenpraat-patch-1
...
Fix full screen for embedded videos
2016-12-04 07:46:31 +11:00
Andrew Manning
153cd0a205
Remove classes from the doco content region to simplify the appearance. Instead of loading /doc/main.bb, redirect to /doc/about/about_hubzilla/. These edits are minimal for demo purposes and not the proper way to do it.
2016-12-03 15:17:31 -05:00
zotlabs
f5f1b9602a
rename api endpoint yet again. item/store appears to be blacklisted in some hosting environments.
2016-12-03 12:08:58 -08:00
Jeroen van Riet Paap
5aeb8305fc
Fix full screen for embedded videos
2016-12-03 11:47:10 +01:00
zotlabs
8e6ff32c97
more api work for item/store and doco
2016-12-02 23:09:25 -08:00
zotlabs
e776e79c1e
api function item/new renamed to item/store as that more closely reflects its purpose. It can also be used to store an edit of an existing item. I believe this is a reasonably safe change at this time as I don't believe there is any software currently making use of this call - instead using the Twitter API which is now a plugin.
...
Also some work to make the install documentation agnostic to project name variations. This is not yet complete.
2016-12-02 21:54:50 -08:00
zotlabs
e2660eaad3
fix the forum widget for forums with custom perms
2016-12-02 12:15:18 -08:00
zotlabs
59aae20aea
bb_highlight: if somebody enters an unsupported language for code syntax highlighting (like fortran or cobol or whatever) use 'php' instead of returning a completely unformatted code block. This choice was somewhat arbitrary. It could be difficult to analyse the intention which could be literally anything and provide the closest match.
2016-12-01 19:04:29 -08:00
zotlabs
97f9dedaa6
sql error in fetch conversation
2016-12-01 18:21:36 -08:00
zotlabs
7f730b81ff
trim both key and iv on other ciphers
2016-12-01 18:14:20 -08:00
zotlabs
e793fc9973
trim iv in STD_encapsulate
2016-12-01 18:12:18 -08:00
zotlabs
141b8495e2
allow plugins to cancel item_store() and item_store_update()
2016-12-01 14:15:34 -08:00
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
4ce1cccc4a
export issue
2016-11-16 14:13:58 -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
Florian Steinel
ca97130a29
add column display_path to inserts into attachment, as this column is a not null column
...
Conflicts:
Zotlabs/Storage/Directory.php
include/attach.php
amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path
2016-10-22 05:07:06 +02:00
zotlabs
331412ddff
remove more corporate code - https url conversion for youtube is now handled by std_embeds plugin
2016-10-20 17:53:15 -07:00
zotlabs
04ac04e0ad
allow a dsn override to the database via the server argument. This could be used to allow unix domain sockets and other unusual configurations.
2016-10-20 17:04:43 -07:00
zotlabs
29340152b6
pdo - cleanup
2016-10-20 16:21:15 -07:00
zotlabs
8a34f7ca7b
Merge branch 'dev' into pdo
2016-10-20 16:14:01 -07:00
zotlabs
e2e3b81f32
more pdo tweaks
2016-10-20 16:13:06 -07:00
zotlabs
b4b5eb5bab
pdo testing
2016-10-20 15:45:48 -07:00
zotlabs
81f3a5cf94
discover tab showing on network page using fresh site with no settings (it is disabled by default, but the admin setting has not yet been committed to disk).
2016-10-19 21:50:26 -07:00
zotlabs
3726b546d5
use pdo for postgres also
2016-10-19 19:24:12 -07:00
zotlabs
2702b82bc3
pdo fixes
2016-10-19 17:23:06 -07:00
zotlabs
aee4f8d2fe
pdo changes first cut
2016-10-19 16:58:26 -07:00
zotlabs
c79c1b3913
Merge branch 'dev' into pdo
2016-10-19 16:31:35 -07:00
zotlabs
b926a4c67e
when translating like activities, we're distinguishing comments from posts by mid and parent_mid; neither if which are present in the stored activity object
2016-10-18 21:42:54 -07:00
zotlabs
f2d1f1efd6
issue #553 - negative birthday from directory. This may not completely fix it and may take a profile update to register the change; but it's a start; specifically we need to store 0000-00-00 in the xprof table of the directory server if that's what we get over the wire. Birthday fields are string and are not subject to SQL strict_mode on dates. We want these to be the string '0000-00-00' if not set to a valid date.
2016-10-18 20:55:24 +02:00
zotlabs
a7fd4e96f1
issue #549 , ACL has 'public' selected even when restrictive ACL is being used.
2016-10-17 23:39:53 -07:00
zotlabs
f31ef3420d
issue #549 , ACL has 'public' selected even when restrictive ACL is being used.
2016-10-17 20:52:02 -07:00
zotlabs
b37184ae57
issue #553 - negative birthday from directory. This may not completely fix it and may take a profile update to register the change; but it's a start; specifically we need to store 0000-00-00 in the xprof table of the directory server if that's what we get over the wire. Birthday fields are string and are not subject to SQL strict_mode on dates. We want these to be the string '0000-00-00' if not set to a valid date.
2016-10-17 18:42:06 -07:00
zotlabs
716a83d1f7
some pdo work
2016-10-17 16:12:32 -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
3f7f5f9429
remove corporate codes from diaspora2bb, add plugin hook markdown_to_bb
2016-10-14 14:22:01 -07:00
zotlabs
40e03a05be
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-10-13 21:06:26 -07:00
zotlabs
bd70e6ae6d
try to filter any path information from leaking through to zot_finger; and log the url wherever called to track down where it might be called with a malformed webbie or complete path instead of hostname.
2016-10-13 21:01:54 -07:00
zotlabs
b9eb74a705
Merge pull request #547 from dawnbreak/docu
...
[TASK] Update Doxyfile and fix Doxygen errors.
2016-10-14 12:55:01 +11:00
zotlabs
daaefed61b
provide text log results of email success/failure rather than 1 and 0.
2016-10-13 16:47:45 -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
9a2f86e9ad
remove special handling of lookalike '@ char from attach path
2016-10-12 18:23:59 -07:00
zotlabs
513b8959f5
Merge pull request #545 from dawnbreak/atfix
...
Comment and code about UTF-8 @-sign do not match.
2016-10-13 12:21:27 +11:00
zotlabs
8a00b62cba
caught one typo from the last checkin
2016-10-12 18:17:34 -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
40bfce463d
add the twitter API 1.1 code points
2016-10-12 17:00:50 -07:00
zotlabs
fc7d29edd3
some more api work
2016-10-12 15:31:14 -07:00
zotlabs
cfc61a69ef
bbcode: remove the inserted <br /> between list elements due to linefeeds in the textarea.
2016-10-12 15:25:48 -07:00
Mario Vavti
cf547be1d6
Merge branch '1.14RC'
2016-10-12 12:13:44 +02:00
zotlabs
ae62d30811
more api work, mostly bringing the file up to speed with the project coding style guidelines
2016-10-11 21:43:37 -07:00
zotlabs
f59a0192b4
more api work
2016-10-11 21:09:26 -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
1a4a8f1ef7
more api cleanup
2016-10-11 18:37:47 -07:00
zotlabs
03aacc35b3
start on the API re-write
2016-10-11 16:13:52 -07:00
Klaus Weidenbach
d5cd6f9a51
Comment and code about UTF-8 @-sign do not match.
...
Changed code according to comment:
First AT is now full-width AT U+FF20.
Do we also need to replace small AT U+FE6B?
2016-10-11 11:48:16 +02:00
Mario Vavti
205bc96827
make diaspora w2w appear as a quote to make a little bit more clear what is happening
2016-10-11 10:30:49 +02:00
zotlabs
2bd61aed7a
spaghetti
2016-10-11 10:19:32 +02:00
Mario Vavti
6706bed676
make diaspora w2w appear as a quote to make a little bit more clear what is happening
2016-10-11 10:17:38 +02:00
zotlabs
81e704648f
api issues
2016-10-10 23:25:01 -07:00
zotlabs
c4debca11d
api issues
2016-10-10 23:24:30 -07:00
zotlabs
896b46d18e
spaghetti
2016-10-10 15:04:57 -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
zotlabs
2bdf135cbc
remove more backquotes
2016-10-09 16:13:49 -07:00
zotlabs
134b9fc466
don't show diaspora protocol info in the hcard if the diaspora protocol is not installed. This really needs to be moved to the plugin but this was a quick fix.
2016-10-08 15:30:06 -07:00
redmatrix
49fd53ee67
try naked embed before submission instead of at render time
2016-10-06 16:00:41 -07:00
redmatrix
48f70e55aa
try naked embed before submission instead of at render time
2016-10-06 15:59:27 -07:00
redmatrix
3250d75320
new hook bbcode_filter
2016-10-05 17:37:18 -07:00
redmatrix
21a0498a30
new hook bbcode_filter
2016-10-05 17:21:32 -07:00
redmatrix
4e07b4c0e8
even more backslashes
2016-10-03 22:01:14 -07:00
redmatrix
4b91d4b5c3
wrong resource (attach_change_permissions())
2016-10-03 17:24:21 -07:00
redmatrix
fe7b7773ba
wrong resource (attach_change_permissions())
2016-10-03 17:23:43 -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
1af56b1025
sync cloud storage permission changes (issue #538 continued)
2016-10-02 10:05:42 +02:00
redmatrix
e1df151d9b
sync cloud storage permission changes (issue #538 continued)
2016-10-01 16:01:22 -07:00
redmatrix
883828c6cc
change hook name and return results
2016-10-01 15:15:14 -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
56b12f6555
issue #538 continued
2016-09-30 13:00:15 -07:00
redmatrix
e48323775d
add another hook
2016-09-29 22:28:23 -07:00
redmatrix
2c1cd99738
issue #170
2016-09-29 19:26:58 -07:00
redmatrix
2728cdaf23
change notify param
2016-09-29 17:54:11 -07:00
redmatrix
3727bea29a
issue #538 continued
2016-09-29 16:20:26 -07:00
redmatrix
245c2d4eed
issue #519 continued
2016-09-28 18:37:05 -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
Mario Vavti
ffee413d2d
fix dbescdate()
2016-09-28 12:43:02 +02:00
redmatrix
dab3495751
check datatype to be sure
2016-09-28 02:16:05 -07:00
redmatrix
44a2cc872c
apply the same fix to our own DB as we did for hubzilla master and redmatrix.
2016-09-26 19:28:04 -07:00
redmatrix
ac6c43b5fb
translate null_date on all db fields
2016-09-26 18:59:01 -07:00
redmatrix
4663278f52
Merge branch 'nulldate' into dev
2016-09-26 18:17:38 -07:00
redmatrix
cacdac16aa
next wave of nulldate fixes
2016-09-26 18:16:43 -07:00
redmatrix
5716556766
allow a site to over-ride the help table-of-contents files
2016-09-26 16:34:53 -07:00
redmatrix
eae9774cb6
missing categories in preview mode
2016-09-26 16:20:36 -07:00
redmatrix
bba7fe24e9
subtle indicator of your own response verb activity
2016-09-25 20:34:36 -07:00
redmatrix
fb9544badd
null_date conversion; phase 1
2016-09-25 17:06:13 -07:00
redmatrix
39dc4fc992
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-24 16:40:36 -07:00
Mario Vavti
8333d41dbd
fix issue #528
2016-09-24 19:02:37 +02:00
redmatrix
dca4db9d4d
convert oembed tools to use json arrays rather than json objects
2016-09-24 05:15:06 -07:00
redmatrix
97d472380f
attach sql issue
2016-09-23 01:16:59 -07:00
redmatrix
9ab6029280
issue #527
2016-09-22 17:15:12 -07:00
redmatrix
7b90b0dfd9
issue #526
2016-09-22 17:08:16 -07:00
redmatrix
9981cbb72c
issue #519 continued
2016-09-22 16:58:29 -07:00
redmatrix
8b8712c15b
issue #524
2016-09-22 16:52:25 -07:00
redmatrix
4e85bc66b8
function to check for different values of NULL_DATE for backward compatibility
2016-09-21 17:16:54 -07:00
redmatrix
b5d093e5ca
finish the channel_reddress() conversion
2016-09-21 15:28:37 -07:00
redmatrix
10a52977f8
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-21 13:26:02 -07:00
redmatrix
c43eccf591
zot discovery wasn't returning in all cases (after discovering zot), which means that it could fall through and also discover other protocols and create xchans for them.
2016-09-21 13:24:16 -07:00
Mario Vavti
d9dc7f0f38
typo
2016-09-21 00:58:10 +02:00
redmatrix
007836f514
issue #519
2016-09-20 15:38:11 -07:00
redmatrix
83dd1c7be2
issue #520
2016-09-20 15:34:35 -07:00
redmatrix
f812866665
issue #515
2016-09-20 15:27:36 -07:00
redmatrix
299c46f118
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-20 06:14:40 -07:00
redmatrix
73bd65ead5
don't offer a settings/features link for techlevel 0 (basic or pro:0) even if there are level 0 features/categories. The definition of level 0 is "don't confuse me with options".
2016-09-20 06:05:20 -07:00
Mario Vavti
4b691703fe
remove redundant loop
2016-09-20 13:39:26 +02:00
redmatrix
8fd8ddcbc1
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-19 14:46:54 -07:00
redmatrix
0011b8fd48
probable fix for #509 - errant comment notifications provided on delayed (duplicate delivery) top level posts which are probably coming from clones
2016-09-19 14:42:56 -07:00
Mario Vavti
0cba82ce9c
if a feature category array has no items unset it
2016-09-19 15:09:19 +02:00
redmatrix
6c4f9f324b
pro: filter features by techlevel
2016-09-19 04:08:27 -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
31df7af61f
do not show hidden channels in /randprof issue #513
2016-09-15 10:36:46 +02:00
Mario Vavti
57dc362d5d
whitelist button tag in htmlpurifier
2016-09-09 14:29:20 +02:00
redmatrix
a90a0874b8
fix for old style version specifiers
2016-09-08 22:56:51 -07:00
redmatrix
956dab69b4
illegal offset errors in include/conversation:status_editor() when no permissions array is passed
2016-09-08 22:20:45 -07:00
redmatrix
d63cfb41f1
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-08 13:26:19 -07:00
redmatrix
9cfd0dd9d8
fix bookmarks in dev
2016-09-08 13:24:09 -07:00
Mario Vavti
1e8fec9385
add more foundation data- attributes
2016-09-08 11:22:58 +02:00
redmatrix
c2f83639d4
provide version info in /pubsites
2016-09-07 17:36:45 -07:00
redmatrix
1fa7e2994a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-09-07 13:41:14 -07:00
Mario Vavti
628187db16
upgrade foundation to version 6.2.3
2016-09-07 12:57:52 +02: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
57033bb599
custom/expert permissions bug
2016-09-06 16:18:06 -07:00
redmatrix
005186bf4a
custom/expert permissions bug
2016-09-06 16:15:45 -07:00
redmatrix
483952eb78
remove chatroom suggestions for the time being, until somebody decides it's worth fixing and rolls up their sleeves and does it. See the notes. There's a lot of useful technology involved and some valid use cases so we won't throw the code away. There's a lot of stuff in here worth saving. We just need to spend a bit more time working through the nitty-gritty bits.
2016-09-04 21:09:00 -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
a3171cd429
incutio xmlrpc library uses old-style (php4) constructors which have been deprecated for some time. They should still work on 7.0, but it's only a matter of time before they go away.
2016-09-04 16:38:35 -07:00
Mario Vavti
2b2f1f2746
fix register link if logged in
2016-09-04 10:29:33 +02: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
0998a108ea
wrong operator
2016-09-03 19:43:11 -07:00
redmatrix
f17eb946f6
pro: add system techlevel to new accounts
2016-09-02 16:14:33 -07:00
Mario Vavti
b00d084243
show home icon in first position in nav, provide register link also if register policy is set to approve and whitespace cleanup
2016-09-02 15:05:19 +02: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
Mario Vavti
24192ff1ef
introduce checklist BBcode for checklists
2016-09-01 13:57:45 +02: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
8ba1bf02a4
document that include/permissions is being deprecated but may still be needed.
2016-08-31 20:29:32 -07:00
redmatrix
c3fdd00aa4
allow public comments (sort of - see the notes)
2016-08-31 18:39:50 -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
Mario Vavti
e9462ba145
resolve merge conflict
2016-08-31 09:41:07 +02:00
Mario Vavti
2b9322fc7d
provide a possibility to create checklists in bbcode [x] creates a checked checkbox, [] creates an unchecked checkbox
2016-08-31 09:38:47 +02: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
85d8300421
increase timeout on oembed remote fetches. This is a balancing act. Too short and many sites won't show up. Too long and you could be watching a spinner anxiously waiting for the page to load even if your own site is blindingly fast.
2016-08-30 17:23:14 -07:00
Andrew Manning
ad5c93d673
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-30 06:14:22 -04:00
redmatrix
8b6230726f
add authors to post distribution; case insensitive sort apps
2016-08-29 18:06:39 -07:00
Andrew Manning
07e28a9757
Display text around the searched query in documentation search
2016-08-27 21:26:16 -04:00
Andrew Manning
69ca279101
Merge remote-tracking branch 'upstream/dev' into website-export
2016-08-27 14:14:28 -04:00
redmatrix
ebd3b965fc
vsprintf error on sql query
2016-08-27 05:07:07 -07:00
redmatrix
40b2e24c6d
vsprintf error on sql query
2016-08-27 05:06:12 -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
aea2fa1629
issue #186 ...different check for pubforum with expert permissions
2016-08-26 16:02:04 -07:00
redmatrix
8a2b96c2f9
- implemented but untested: duplicate detection for photo 'move to another folder'
...
- weekly string update
2016-08-26 01:37:46 -07: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
a969f18137
move premium channel to 'pro' since that's the only configuration where it works reliably.
2016-08-25 17:09:19 -07:00
redmatrix
8d94402d25
attach_move() function created to relocate files or photos to different directories in the cloud area and photo albums without deleting and recreating (which would create a new resource_id and invalidate any existing links).
2016-08-24 22:41:54 -07:00
redmatrix
d3369384d1
include port in pdo url when host is 'localhost'
2016-08-23 18:18:05 -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
b0d3c17f19
public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms
2016-08-22 17:06:40 -07:00
redmatrix
e967bc9c45
public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms
2016-08-22 17:04:13 -07:00
redmatrix
7045b920ef
make zid() do the right things when confronted with url fragments
2016-08-21 17:38:36 -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
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
redmatrix
9fe4bae52f
block backdoor delivery of bulk imported items
2016-08-19 17:12:48 -07: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
fa98f4c55d
import anomaly
2016-08-17 19:44:24 -07:00
Andrew Manning
f2e87a204d
Progress implementing zip file export
2016-08-17 21:25:50 -04:00
Andrew Manning
c98b91f514
Stash changes for merge with dev
2016-08-17 18:19:36 -04:00
redmatrix
537401cf27
don't set session theme unless logged in.
2016-08-16 22:15:51 -07:00
redmatrix
b2eede891a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-08-16 19:01:20 -07:00
redmatrix
a2873c18ca
get rid of ugly code construct
2016-08-16 19:00:38 -07:00
Mario Vavti
291b0edbe0
rename limited -> custom
2016-08-16 08:05:46 +02:00
hubzilla
752bb169ed
Merge pull request #487 from git-marijus/dev
...
implement groups in the acl select.
2016-08-16 06:59:52 +10:00
Mario Vavti
4b101c2240
provide group options serverside and minor cleanup
2016-08-15 22:54:07 +02:00
redmatrix
4facae674d
fix attached photo/file permissions on clones
2016-08-15 13:18:25 -07:00
redmatrix
000861da0d
event_store_event hook
2016-08-14 18:22:18 -07:00
Andrew Manning
6868403383
Context help for settings/features page
2016-08-14 13:34:52 -04:00
Andrew Manning
229cc2ac43
Change text for submenu on small screens to be static toggle statement
2016-08-14 06:55:02 -04:00
Andrew Manning
cb9ac6dd34
Replace hardcoded button title in javascript to translatable text
2016-08-14 06:46:48 -04: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
2c8a82713e
pending flag not being reset when using autoperms from custom role
2016-08-12 18:18:35 -07:00
redmatrix
165f442d70
pending flag not being reset when using autoperms from custom role
2016-08-12 18:17:39 -07:00
redmatrix
ebbe18a426
better method of dealing with api versions
2016-08-11 20:09:38 -07:00
redmatrix
6bc5dd75bd
more cleanup of api
2016-08-11 19:42:44 -07:00
redmatrix
0257d660ad
move error processing back inside the function
2016-08-11 18:09:48 -07:00
redmatrix
0637a71669
embed filter adjustments
2016-08-11 17:34:05 -07:00
redmatrix
c63deda71a
embed filter adjustments
2016-08-11 17:33:28 -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
redmatrix
45dc995967
forum detection was off for forums with custom perms
2016-08-10 20:50:32 -07:00
redmatrix
e985436b3b
forum detection was off for forums with custom perms
2016-08-10 20:49:51 -07:00
Mario Vavti
82e867a9a8
implement acl for folder creation
2016-08-10 16:17:09 +02:00
redmatrix
5238a27ab3
function order reversed
2016-08-09 20:50:33 -07:00
redmatrix
ec3ca11d0d
bad code format
2016-08-09 16:59:35 -07:00
redmatrix
07dca90352
updates to hcard parsing
2016-08-07 21:00:23 -07:00
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
redmatrix
fb61c4fb34
Merge branch '1.8RC'
2016-06-19 19:12:33 -07:00
redmatrix
30841d9470
Don't use count() to check DB results
2016-06-19 18:57:56 -07:00
Oda
5b92922516
When picktime is false, close date selector on date select
2016-06-18 23:03:06 -03:00
Mario Vavti
178b440f05
Merge branch 'dev' into sabre32
2016-06-18 11:10:40 +02:00
redmatrix
2e7606f569
the text link to a thing will take you to the local thing page, both as a link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
2016-06-17 21:44:08 -07:00
redmatrix
2793086c0d
1. string update, 2. pretty print json blobs
2016-06-17 14:58:03 -07:00
Andrew Manning
80d3a831f3
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-17 06:36:09 -04:00
Andrew Manning
961539258b
Wiki page revision comparison tool with diff displayed in modal dialog. Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
2016-06-17 06:33:39 -04:00
Mario Vavti
0324bc5cf0
Merge branch 'dev' into sabre32
2016-06-17 10:04:27 +02:00
redmatrix
f6d7628254
core changes to better support media migrations
2016-06-16 20:16:39 -07:00
Mario Vavti
28a7458e48
Merge branch 'dev' into sabre32
2016-06-16 10:26:47 +02:00
redmatrix
a2a87fec54
code comments
2016-06-15 22:36:00 -07:00
redmatrix
d457f11717
custom request methods for curl
2016-06-15 21:25:26 -07:00
redmatrix
bc5f73e6c3
provide a default for undefined languages
2016-06-15 20:51:55 -07:00
redmatrix
1dc35db1fe
ignore case in language names and add 'js' as an alias for 'javascript'
2016-06-15 20:25:19 -07:00
hubzilla
e0b705fd54
Merge pull request #422 from anaqreon/wiki
...
Wiki rename page feature added. Bug fixes related to git commits.
2016-06-16 13:01:49 +10:00
redmatrix
854c23a751
This was the reason for the large line widths - an extra linefeed after each li element
2016-06-15 19:59:30 -07:00
redmatrix
fa48de33c2
provide syntax based [colour] highlighting on code blocks for popular languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
2016-06-15 19:44:15 -07:00
Andrew Manning
fc7c4e64ff
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-15 21:48:47 -04:00
Mario Vavti
05ed20d336
Merge branch 'dev' into sabre32
2016-06-15 17:34:03 +02:00
redmatrix
ef1c01d968
add new connection to default group when auto-accepted
2016-06-15 05:30:03 -07:00
redmatrix
47fc0c7958
add new connection to default group when auto-accepted
2016-06-15 05:28:16 -07:00
Andrew Manning
688171d016
Rename page feature added. Fixed bug in git commit function and other minor fixes.
2016-06-15 06:25:31 -04:00
Mario Vavti
5c458e9111
Merge branch 'dev' into sabre32
2016-06-14 09:42:43 +02:00
redmatrix
0ef2622621
some work to provide propagation and honouring of the item_notshown flag.
2016-06-13 22:09:22 -07:00
redmatrix
1ff9abe1b4
missing iconfig conversion
2016-06-13 21:16:36 -07:00
redmatrix
1e68d4fb75
deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
2016-06-13 19:58:24 -07:00
Mario Vavti
e963714ad6
Merge branch 'dev' into sabre32
2016-06-13 09:18:39 +02:00
hubzilla
b18b9464a4
Merge pull request #416 from anaqreon/embedphotos
...
Add embed photos button with album browser to new post editor
2016-06-13 10:15:09 +10:00
redmatrix
7abfe716b4
DB schema issue with import
2016-06-12 16:35:17 -07:00
redmatrix
81b3c59711
DB schema issue with import
2016-06-12 16:34:27 -07:00
Andrew Manning
410f5389ae
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 15:18:43 -07:00
Andrew Manning
a1183bf09a
Merge remote-tracking branch 'upstream/dev' into embedphotos
2016-06-12 14:38:48 -04:00
Andrew Manning
e109abbef7
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
2016-06-12 07:17:23 -04:00
redmatrix
f41380de77
remove debugging
2016-06-11 15:28:52 -07:00
redmatrix
0e0a6f5f8d
Work supporting issue #411 , add an optional priority (int) as a second arg to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other
...
ordering.
2016-06-11 15:23:13 -07:00
Mario Vavti
bdbbe00bdf
Merge branch 'dev' into sabre32
2016-06-11 20:12:41 +02:00
redmatrix
96cd63cf1a
iconfig sharing not set correctly
2016-06-10 22:41:58 -07:00
Mario Vavti
86985b454f
Merge branch 'dev' into sabre32
2016-06-10 12:22:01 +02:00
Andrew Manning
7a242f829f
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-09 20:07:09 -04:00
Andrew Manning
7fc2b13fe6
Stashing changes. Not a functional state.
2016-06-09 20:06:36 -04:00
Mario Vavti
85e82e919e
more style work
2016-06-09 22:05:52 +02:00
redmatrix
40bba93a31
potential fix to hubzilla-addons issue 16
2016-06-08 19:34:11 -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
d43a814385
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-08 05:41:13 -04:00
redmatrix
e46e7002a8
block random_profile from accessing sys channels
2016-06-07 22:55:24 -07:00
redmatrix
5ef8199dae
Finish the config family
2016-06-07 18:17:39 -07:00
Andrew Manning
cf180f6142
Merge remote-tracking branch 'upstream/dev' into wiki
2016-06-07 20:43:49 -04:00
redmatrix
a50e555515
'recent photos' query was buggered, also fix issue #163 by adding configurable sort order to the album widget - default is album name ascending
2016-06-07 16:23:14 -07:00
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
redmatrix
adecd2960e
move pconfig to static class
2016-06-05 22:18:17 -07:00
Andrew Manning
4528becf4c
Remove debugging logger statements
2016-06-05 20:52:40 -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
dd6718c2cd
provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection
2016-06-04 18:10:42 -07:00
redmatrix
c1a24d44a3
another switch of type and ttype
2016-06-04 17:17:48 -07:00
redmatrix
bf438f67e1
the :tone variants are messed up, remove them
2016-06-04 17:13:55 -07:00
redmatrix
81f6511d34
return of the project smilie
2016-06-04 17:09:37 -07:00
redmatrix
a6012af00d
For emojis in posts, extend smilies and save a lot of duplication of effort
2016-06-04 17:06:12 -07:00
redmatrix
2c7ce20ccf
cross-site encoding issue with tags
2016-06-04 15:04:14 -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
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
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
20a79c7acf
allow bbcode emojis (at least the single unicode character forms)
2016-06-03 22:00:53 -07:00
redmatrix
e81ac9e063
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
2016-06-03 16:04:54 -07:00
redmatrix
624f4641e2
missed an object -> obj conversion in prepare_body
2016-06-03 15:09:58 -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
f9075e2a2f
some initial emoji reaction work
2016-06-02 18:42:51 -07: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
00b4843425
provide a sort of mutex lock around db logging so it can't possibly recurse. Previous attempts to do something similar using other methods haven't worked out satisfactorily.
2016-05-31 16:16:54 -07:00
redmatrix
701acf59e2
don't remove missing hooks while update_r1169 is happpening - temp fix
2016-05-31 13:22:47 -07:00
redmatrix
44d3dadb03
don't update hubloc_connected any more often than 15 minutes. We don't require that level of granularity and the frequent writes are causing issues with the stability of that table.
2016-05-30 20:59:46 -07:00
redmatrix
9e9f2e13fe
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-30 19:49:15 -07:00
redmatrix
6602ff83dd
start removing reserved words from database column names (this run: addon and hook)
2016-05-30 19:44:30 -07:00
Andrew Manning
8d284bab47
Created page history widget to dynamically fetch and display the git commit history for wiki pages.
2016-05-30 20:59:54 -04:00
redmatrix
490ab9e2c5
begin moving config to zotlabs. Leave procedural stubs for backward comaptibility
2016-05-30 16:42:29 -07:00
hubzilla
0757dbf07f
Merge pull request #405 from git-marijus/dev
...
render code bbcode inline if there are no linebreaks in the text.
2016-05-31 09:07:22 +10:00
redmatrix
f35609d26c
redundant dev line from an earlier modification causes issue #404
2016-05-30 13:25:58 -07:00
Andrew Manning
a52cdcb241
Replaced wiki item record object field with ActivityStreams information. Wiki git repo path is stored in iconfig instead.
2016-05-30 14:59:33 -04:00
Mario Vavti
d1efb59fcd
render code bbcode inline if there are no linebreaks in the text.
2016-05-30 16:12:48 +02: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
00d32f6b94
Only show wiki delete control if channel owner
2016-05-29 20:39:19 -04:00
Andrew Manning
75b169f391
Fixed bug where page file was not loaded because of urlencoding/urldecoding
2016-05-29 13:50:32 -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
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
Andrew Manning
97e6b7c4ba
Wiki deletion works
2016-05-27 20:20:33 -04:00
Andrew Manning
d554681174
Merge remote-tracking branch 'upstream/dev' into wiki
2016-05-27 06:35:15 -04:00
redmatrix
61304d80d2
track down some issues from the application logs
2016-05-26 18:45:47 -07:00
redmatrix
096fdfc61b
consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
2016-05-26 16:33:01 -07:00
redmatrix
7b91e551c4
kill off mcrypt
2016-05-26 13:21:43 -07:00
redmatrix
2f64684299
some event fixes, also change jquery-textcomplete to un-minified since the minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
2016-05-25 20:06:21 -07:00
redmatrix
66b6f8c0ff
app rendering issues, typo in class name and could not find icon 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
2016-05-25 17:30:15 -07:00
redmatrix
0d8dcdbbc9
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-25 13:46:55 -07:00
redmatrix
da19ac98dd
Just set it and forget it.
2016-05-25 13:46:19 -07:00
Mario Vavti
9908a7193a
remove the add others button for now - after some research it turned out not beeing so useful
2016-05-25 14:31:58 +02:00
redmatrix
c37eaff263
require token signatures in zot_refresh, also move channel specific stuff into include/channel.php from include/connections.php
2016-05-24 23:05:00 -07:00
redmatrix
80f2ba640e
code cleanup
2016-05-24 20:49:23 -07:00
redmatrix
f9a295a236
Add space between project name and server type
2016-05-24 19:25:10 -07:00
redmatrix
516c43ba15
more work associated with DBA and index.php shuffle
2016-05-24 17:54:45 -07:00
redmatrix
84ba6393ad
relocate index and db
2016-05-24 16:36:55 -07:00
Andrew Manning
e00b8a7082
Delete wiki (in progress)
2016-05-24 06:15:42 -04:00
redmatrix
29ba891809
moved enotify
2016-05-24 01:25:13 -07:00
redmatrix
bbc71343bd
change the signed token format. We don't folks to be able to submit random text for signing by us, as they could then use these to generate known signatures.
2016-05-22 22:44:13 -07:00
redmatrix
1aa3051e97
move chatroom stuff to zlib
2016-05-22 20:54:52 -07:00
redmatrix
2d06663490
move apps to zlib
2016-05-22 19:25:27 -07:00
redmatrix
5e0698ba87
turn the oft-repeated block_public ... check into a function observer_prohibited()
2016-05-22 17:52:30 -07:00
redmatrix
de006771c7
renamed include files identity.php (channel.php) and Contact.php (connections.php)
2016-05-22 16:54:30 -07:00
Andrew Manning
a36bef7979
List of wikis populates with links according to observer permissions.
2016-05-21 21:55:09 -04:00
redmatrix
1cb311cef9
finish updating zot_finger instances
2016-05-21 18:18:33 -07:00
redmatrix
ed56b6e67b
first cut at zot-finger request signatures
2016-05-21 18:02:14 -07:00
Andrew Manning
049147a9d7
Successful new wiki git repo and item table record
2016-05-21 19:02:23 -04:00
Andrew Manning
c6aa42773a
Trying to fix wiki branch starting fresh from dev
2016-05-21 14:56:42 -04:00
redmatrix
bf05012150
relocate the (unused currently) protocol driver
2016-05-20 23:12:06 -07:00
redmatrix
d8ace38041
rework the conversation object stuff at a high level - still needs a bit of refactoring
2016-05-20 22:52:47 -07:00
redmatrix
019250eff8
consolidate include/*_selectors.php (not touching acl_selectors for the moment, as it will likely end up with a different disposition)
2016-05-20 22:13:20 -07:00
redmatrix
f4da365abd
move template stuff to zotlabs/render
2016-05-20 19:11:14 -07:00
redmatrix
b2f0d2d085
cleanup proc_run after messing it up with debugging yesterday
2016-05-20 17:44:26 -07:00
redmatrix
cae380f068
case issue
2016-05-20 01:21:19 -07:00
redmatrix
a97e7b2758
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-19 22:48:58 -07:00
redmatrix
f228bf4555
typo uncovered during tests
2016-05-19 22:33:01 -07:00
redmatrix
a2cec8899a
daemon conversion continued...
2016-05-19 22:26:37 -07:00
redmatrix
39bc0664a7
Separate cron into periodic components and use that as the main interface for scheduled tasks instead of the quaint 'poller'.
2016-05-19 21:22:04 -07:00
redmatrix
853322e7d2
don't try to deliver empty hashes
2016-05-19 20:48:40 -07:00
redmatrix
9cb1ac3de5
daemon master: create some compatibility code
2016-05-19 20:36:32 -07:00
redmatrix
6e7d7c5017
minor
2016-05-19 16:48:10 -07:00
Mario Vavti
1f2bd00d93
whitespace
2016-05-19 23:39:05 +02:00
Mario Vavti
c7cad6ab60
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-19 23:35:48 +02:00
Mario Vavti
0f5eb65210
provide an acl select option for only me
2016-05-19 23:35:19 +02:00
Treer
6b69184554
fix permission string
2016-05-19 22:37:21 +10:00
redmatrix
3355210878
explain what we're doing and where we're going with this.
2016-05-18 22:03:43 -07:00
redmatrix
d38851023e
provide server role on pubsites page
2016-05-18 16:28:51 -07:00
Mario Vavti
c77732b8ed
only show $showall_origin if permission_role is custom. it does not make much sense otherwise since the member is merely using a preset of permissions.
2016-05-18 21:23:24 +02:00
redmatrix
16f79b70e4
experimental PDO DBA driver
2016-05-17 22:32:49 -07:00
redmatrix
43c2b22fca
cli utilities - argc and argv reversed. Not functionally incorrect since it was consistent but aesthetically incorrect.
2016-05-17 19:49:21 -07:00
hubzilla
9a64c6b9f7
Merge pull request #389 from sasiflo/dev_sasiflo_sync
...
Synchronization: Directory creation on sync import corrected.
2016-05-18 12:16:20 +10:00
redmatrix
20cb4130d4
support work for a long-term fix for issue #390 , essentially one can specify a theme:schema string anywhere a theme is input. It will be honoured unless an existing schema setting over-rides this behaviour. This should also be backward compatible but the theme selection code has been cleaned up slightly and there may be subtle differences in behaviour after this commit. On my site this required a page refresh as the first page load after this change was a bit confused.
2016-05-17 17:46:30 -07:00
sasiflo
bfbe6c1660
Synchronization: Directory creation on sync import corrected.
2016-05-17 12:27:15 +02:00
redmatrix
0d04a1221a
issue #386 (master)
2016-05-16 19:38:38 -07:00
redmatrix
883b1ff513
an issue related to #386
2016-05-16 19:23:42 -07:00
redmatrix
2dcedd6951
more work on sessions and cookies, as some anomalies appeared in caldav and firefox which suggested deeper issues
2016-05-16 17:07:39 -07:00
redmatrix
217db8f9b2
provide tools to extract a pdo constructor
2016-05-15 19:16:55 -07:00
redmatrix
b14dd0e066
issue #383
2016-05-14 21:05:24 -07:00
redmatrix
ec81ef7b8d
issue #383
2016-05-14 21:04:19 -07:00
Mario Vavti
1e00fa79b3
change wording restricted -> custom selection and add a label to the select
2016-05-13 17:38:50 +02:00
Mario Vavti
573dea42d0
instead of radio buttons use select to choose between public and restricted acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible.
2016-05-13 16:22:43 +02:00
redmatrix
522fec5763
split off feed handling stuff from include/items
2016-05-12 20:21:04 -07:00
redmatrix
f2fc7d25c5
remove the rarely if ever used filter_insecure() function. We will provide this functionality in other ways.
2016-05-12 20:02:16 -07:00
redmatrix
2d79e75788
SECURITY: edited comment to private post loses privacy info. Not visible in stream but may be visible in feeds
2016-05-12 16:51:20 -07:00
redmatrix
781716277b
SECURITY: a comment to a private post that has been edited (the comment has been edited) loses its privacy settings. This comment isn't visible in the stream but may be visible in feeds.
2016-05-12 16:47:03 -07:00
redmatrix
32ad8bbaac
Ensure that channels can't be created with DAV reserved paths as a redress. Sabre mentions in several places that trying to change these paths to other strings; while possible - is unsupported and likely to cause problems. So for now, we're stuck with 'principals', 'addressbooks', and 'calendars'. If you already have these redresses on your site, you're basically buggered.
2016-05-11 17:18:17 -07:00
redmatrix
4dd3839c41
provide repository versions on admin summary page and an upgrade message if you're behind master
2016-05-10 21:46:04 -07:00
redmatrix
915bd2ec77
sabre upgrade
2016-05-10 19:40:15 -07:00
redmatrix
0b02a6d123
initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)
2016-05-10 17:26:44 -07:00
redmatrix
f658a3cae1
more work on diaspora relay
2016-05-09 20:17:59 -07:00
Treer
ef97e5a063
minor cleanup. No functional changes
2016-05-10 00:15:57 +10:00
Mario Vavti
61909d2480
if we do not have a layout $layout should be empty not default
2016-05-09 12:24:48 +02:00
Mario Vavti
7aeff7505b
remove unused code and whitespace
2016-05-09 12:09:04 +02:00
Mario Vavti
a3e94591bc
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-09 11:58:10 +02:00
Mario Vavti
24c1dc528d
make editwebpage use status_editor() and fix storing of layout on webpage creation
2016-05-09 11:56:42 +02:00
redmatrix
6f486a3393
prevent recursion in the database driver when debugging is enabled and the system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log...
2016-05-09 01:12:24 -07:00
Mario Vavti
c8f686b8a5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-05-09 09:26:38 +02:00
redmatrix
b6e0d8dee0
clean up some cruft
2016-05-08 20:19:23 -07:00
redmatrix
2a14c71128
convert media embed functions that deal with rewriting specific corporate services to addon hooks
2016-05-08 19:12:52 -07:00
Treer
e7a65c1f8d
improve non-ACL option description in ACL dialog
2016-05-08 20:44:30 +10:00
Mario Vavti
75128e8f68
make editblock use status_editor()
2016-05-07 23:05:48 +02:00
redmatrix
5882714e23
missed one other place where we called comanche outside the page build
2016-05-06 00:43:37 -07:00
redmatrix
7101bbedcb
objectify comanche
2016-05-05 23:07:35 -07:00
redmatrix
712b2b1bb2
comments
2016-05-05 22:02:46 -07:00
redmatrix
5508feb6ce
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-05 18:19:20 -07:00
redmatrix
2e3da0cbbb
- Setup: check php version (5.4 required)
...
- Comanche: implement conditionals. Currently the only supported tests are true/false for system config settings
and supports the following forms:
[if $config.system.foo]
[widget=widget1][/widget]
[else]
[widget=widget2][/widget]
[/if]
[if $config.system.foo]
[widget=widget1][/widget]
[/if]
2016-05-05 18:15:07 -07:00
Treer
2174cdcd0e
Unify permissions dialog for network posts, channel posts, and remote posts
...
* changes the warning from being about when a post is "sent" to when it's "shared", to match the Share button.
* hyperlinks the "cannot be changed" part of the warning to the help file
* adds some more content to the help file
2016-05-06 01:44:46 +10:00
redmatrix
8ffdc4859b
replace app tagcloud with more traditional categories widget. One can always change this in the PDL
2016-05-05 00:45:38 -07:00
redmatrix
9eac9ef2b9
isolate all the tagadelic core code into a class and reuse it
2016-05-04 19:39:39 -07:00
redmatrix
566667a263
provide a tag cloud for app categories and allow filtering apps from this
2016-05-04 18:27:46 -07:00
redmatrix
1b6bc5394b
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-04 17:36:13 -07:00
redmatrix
50fb525b28
add categories to apps (wip)
2016-05-04 17:35:27 -07:00
Treer
e1e56936c9
add help to some permissions dialogs
2016-05-05 02:09:47 +10:00
Treer
33a8d845c1
Refine permissions dialog UI
2016-05-04 23:55:32 +10:00
redmatrix
7c57da3a28
Sync the current list of system apps with the built-in name translation table. Some of the names were changed in the past without the translation table being updated to reflect it.
2016-05-03 22:12:09 -07:00
redmatrix
191298ec93
more background work for app management - give every member a copy of all the system apps so that they can edit and delete them to taste/preference. This needs further work to pick up changes in system apps (additions, edits, deletions, etc.). Currently this is done once and never attempted again.
2016-05-03 20:37:05 -07:00
redmatrix
3df0bb5522
some preliminary structural work for app organisation
2016-05-03 18:41:16 -07:00
redmatrix
b371c028ad
more security stuff
2016-05-02 22:28:27 -07:00
redmatrix
2b7b26f4c0
a bit more oembed security - and document the shortcomings of this approach
2016-05-02 13:31:14 -07:00
redmatrix
559ed3f0a8
sort out the rest of the source categories
2016-05-02 01:18:18 -07:00
redmatrix
a10fe5f13e
a couple of bugfixes from earlier checkins and implementation of source tags
2016-05-01 22:45:38 -07:00
redmatrix
f284558007
use only the std_version
2016-05-01 19:29:30 -07:00
redmatrix
23bb4e8e15
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-05-01 19:20:09 -07:00
redmatrix
cd518625bf
some much needed work on oembed security
2016-05-01 19:19:17 -07:00
Mario Vavti
fa80a5c113
make weblink and attach button hideable and some minor fixes
2016-05-01 15:45:42 +02:00
redmatrix
84d93cca6e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-30 15:02:45 -07:00
redmatrix
9446d0cbb4
Merge pull request #362 from Treer/fontawesome
...
Update Font-Awesome to 4.6.1
2016-05-01 08:02:03 +10:00
Mario Vavti
c96b20c559
make mod editlayout use status_editor()
2016-04-30 21:56:52 +02:00
Treer
8f16e9ad33
update icon names in include/
2016-05-01 04:39:57 +10:00
git-marijus
80c9a8b8f6
Merge pull request #361 from Treer/bbcode
...
Add definition lists to bbcode
2016-04-30 19:24:43 +02:00
redmatrix
4c47d22f4b
trim engr_units string slight improvement to avoid subtle bugs
2016-04-29 23:47:13 -07:00
Mario Vavti
931a4fafe3
get rid of the unused ispublic variable
2016-04-29 21:38:36 +02:00
Treer
b5b21ecad7
improve whitespace control around definition list ([dl]) bbcode
2016-04-30 02:03:38 +10:00
Treer
9d079e5d2b
Add definition lists to bbcode
2016-04-30 01:13:34 +10:00
Mario Vavti
b797528b78
some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit
2016-04-29 13:18:42 +02:00
Mario Vavti
1fdac57d61
jot: cleanup unused variables
2016-04-29 09:58:44 +02:00
redmatrix
bb96f44861
allow engineering units (e.g. 400M, 1G) as service class limits
2016-04-28 21:02:27 -07:00
redmatrix
bdef71bda0
provide courtesy function for syncing one item. We'll probably be doing this a lot.
2016-04-27 21:26:52 -07:00
redmatrix
8e8df26066
Use / for album name in photo activities if no album present.
2016-04-27 13:25:58 -07:00
redmatrix
a67fa2651d
implement the singleton delivery stuff
2016-04-26 17:38:44 -07:00
redmatrix
509f25e46a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-26 16:14:10 -07:00
redmatrix
f99daf8ff9
move iconfig functions to include/config.php with all the rest of the configs, fix an issue with singleton discovery and start work on singleton delivery
2016-04-26 16:12:31 -07:00
Mario Vavti
ce50a429fa
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2016-04-26 11:41:23 +02:00
Mario Vavti
3446e68ac2
move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and add open tag to bbco_autocomplete
2016-04-26 11:41:08 +02:00
redmatrix
2e7028c976
some cleanup on the mysqli driver
2016-04-25 22:03:02 -07:00
redmatrix
d62f490814
Setup was horked after this commit and I couldn't easily make it right so reverting - will try again at a future date
...
Revert "remove global db variable"
This reverts commit c3b0c0f32a
2016-04-25 20:12:36 -07:00
redmatrix
c3b0c0f32a
remove global db variable
2016-04-25 16:55:33 -07:00
redmatrix
ce45a1cf94
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-23 16:57:32 -07:00
redmatrix
79c63e3cf4
this should work to call a hook for a string class method
2016-04-23 16:56:41 -07:00
redmatrix
df2990b27e
Class method support for hooks
2016-04-23 15:16:54 -07:00
Mario Vavti
b0a2e5d3f7
simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu.
2016-04-23 16:39:56 +02:00
redmatrix
540800da95
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-21 17:09:13 -07:00
redmatrix
1ff189ee90
new hook interface (the old one still works but requires handlers to have two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts.
2016-04-21 17:03:05 -07:00
Mario Vavti
d7f4bfedd5
some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
2016-04-21 23:03:09 +02:00
git-marijus
391ed8655e
Merge pull request #351 from anaqreon/toggle-context-help
...
Toggle context help
2016-04-21 18:44:50 +02:00
git-marijus
aa0c70e198
Merge pull request #348 from git-marijus/dev
...
add querystring to css and js which is added via head_add_{css, js}
2016-04-21 18:42:49 +02:00
Andrew Manning
82de68c3d3
Added admin/site setting that toggles context help panel. If disabled, original help menu button behavior is restored.
2016-04-21 06:41:55 -04:00
redmatrix
f00a701ad1
send the correct number of args
2016-04-20 19:56:01 -07:00
redmatrix
0d91f363cc
There is no longer a followup flag in the notifier. Remove all traces of it.
2016-04-20 19:03:56 -07:00
Andrew Manning
b96eb1c823
Merge branch 'dev' into toggle-context-help
2016-04-20 21:05:01 -04:00
redmatrix
2641980ac2
bb2d updates from testing signature changes
2016-04-20 01:40:09 -07:00
redmatrix
21b0128e9e
testing dmeta
2016-04-19 23:06:43 -07:00
redmatrix
d07afb54e4
rework bb2diaspora for eradicating the diaspora comment virus
2016-04-19 21:43:12 -07:00
Mario Vavti
6941fbb182
add querystring to css and js which is added via head_add_{css, js}
2016-04-19 13:38:06 +02:00
Andrew Manning
7594796ee1
Try toggling context help using onclick attribute
2016-04-19 05:52:16 -04:00
redmatrix
2a4e8972e0
module updates
2016-04-18 20:38:38 -07:00
redmatrix
d1ecf3f323
some issues with GNU-Social's implementation of events in feeds. The summary element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later.
2016-04-18 00:59:42 -07:00
redmatrix
521d404013
remove the date hack on public feeds which was a temporary fix for an issue limiting the number of posts returned and no longer needed.
2016-04-17 16:37:44 -07:00
redmatrix
521641f3a8
filter out a bit more dreport noise - especially for private posts to multiple recipients.
2016-04-14 21:53:39 -07:00
redmatrix
a8f7af2079
provide general purpose verification class, remove include/session.php (no longer used)
2016-04-14 18:51:06 -07:00
redmatrix
ed0bff798b
fix marked bug in code
2016-04-13 22:58:37 -07:00
redmatrix
5cb3143c04
issue #331 use timeago.js for reshared publish date instead of relative_date() which does not play well with other networks.
2016-04-10 21:30:35 -07:00
redmatrix
d1a2aecfa0
move more session related stuff such as paranoia handling (IP address changes) into the session object and extend remember_me cookies once a day so that they will never expire (theoretically). The DB session driver will extend its expiration on every session write (in the case of persistent sessions).
2016-04-10 19:20:41 -07:00
redmatrix
e9f1bac062
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-10 17:03:30 -07:00
redmatrix
abfbe9c937
a few issues: block public not blocking mod_cal, typo in sql for one clone file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session.
2016-04-10 16:56:08 -07:00
Mario Vavti
e2b4d33627
some work on comanche autocomplete
2016-04-09 12:16:42 +02:00
redmatrix
9b66b5eee3
objectify all the session management stuff
2016-04-08 04:44:10 -07:00
redmatrix
279f32b13d
send file sync packets for all known file operations
2016-04-07 18:54:48 -07:00
redmatrix
3a6187af3d
implement updates of attach data to sync'd clones.
2016-04-07 16:44:53 -07:00
redmatrix
aa678ba0ff
reset profile photo and cover photo bits for existing photos if a new one arrives from a clone
2016-04-06 22:14:05 -07:00
redmatrix
e4391e6336
missing profile photo in export data
2016-04-06 21:36:47 -07:00
redmatrix
aa0412d83b
use the explicit form of build_sync_packet so that file/photo sync will work even when the actual observer is a guest (with permission to upload).
2016-04-06 20:25:52 -07:00
redmatrix
861f5232d3
more work on file sync to clones, 60-70% test coverage, mostly working but many changes made during testing which themselves have not yet been tested
2016-04-06 19:56:38 -07:00
redmatrix
9831ad515d
file sync testing continued
2016-04-06 18:46:29 -07:00
redmatrix
6650916435
file sync testing
2016-04-06 18:38:48 -07:00
redmatrix
29363a185d
file sync work
2016-04-06 18:07:29 -07:00
redmatrix
a20ef706fd
issue #340
2016-04-06 05:44:40 -07:00
redmatrix
adad8f2ebc
getting file sync data - missed parent folder
2016-04-06 05:20:55 -07:00
redmatrix
fb9c12df15
rework the "remember me" fix to be a bit less hackish
2016-04-06 02:33:11 -07:00
redmatrix
5a2a8717e3
provide function to collect file/photo sync data per help/filesync
2016-04-05 23:11:24 -07:00
redmatrix
0d50d29538
Merge branch 'master' into dev
2016-04-05 22:15:29 -07:00
redmatrix
54aa998b52
undeclared static property App::$stringsave (push_lang() and pop_lang())
2016-04-05 22:13:56 -07:00
redmatrix
fd07940b10
provide stream resource pointer option to z_fetch_url() and z_post_url() per earlier doco commit on syncing files/photos across clones.
2016-04-05 18:24:24 -07:00
Mario Vavti
bd29551f9a
fix contextual help
2016-04-05 16:59:32 +02:00
redmatrix
ec41170121
Merge pull request #338 from anaqreon/contextual-help
...
Contextual help
2016-04-05 22:43:15 +10:00
redmatrix
222ace3770
For GNU-social discovery, use the URI in the feed (author.uri) rather than try to pick out which of the aliases in webfinger are likely to be the right one. If we get it wrong, our communications with them will be discarded and there is no rhyme or reason to the logic about which representation is likely to be the one true account URI. It appears to vary with the clean_url setting of the site and this info isn't available to us except with a sequence of expensive probes and testing various ways of re-writing URLs to see if we get a response.
2016-04-03 20:55:38 -07:00
Andrew Manning
0523b4b2f1
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
2016-04-03 21:36:29 -04:00
redmatrix
a703835b5c
Bug: "remember me" doesn't
2016-04-03 17:38:17 -07:00
redmatrix
bf3f3564e0
issue #138 ; make ajaxchat optional and configurable. For reasons we've discussed repeatedly the ajax chat will not be removed from core as XMPP chat does not provide decentralised access control compatible with nomadic identity.
2016-04-03 16:41:40 -07:00
redmatrix
cfad5ba8b8
Merge branch 'master' into dev
2016-04-03 16:17:31 -07:00
Mario Vavti
b8d8be7013
show chat expiration time in overview and minor fixes
2016-04-03 11:34:07 +02:00
redmatrix
8b3c099a12
use constant
2016-04-02 21:06:41 -07:00
Mario Vavti
ebac0bdcca
Chat Rooms -> Chatrooms
2016-04-01 09:46:41 +02:00
redmatrix
44283dbbbb
change the App constructor
2016-03-31 20:24:30 -07:00
redmatrix
0cda431456
create miniApp to convert existing settings files to the static App class
2016-03-31 20:15:47 -07:00
redmatrix
36b388ab8c
issue #336
2016-03-31 18:53:05 -07:00
redmatrix
c0b3d7e1b4
Merge branch 'static'
2016-03-31 17:32:51 -07:00
redmatrix
9abd95fad3
static App
2016-03-31 16:06:03 -07:00
Mario Vavti
6c2673ae2a
various fixes regarding mod chat
2016-03-31 22:42:28 +02:00
Mario Vavti
3fdd110e07
mod chat rework continued
2016-03-31 13:21:48 +02:00
redmatrix
1cd3b41825
deprecate $a->get_baseurl()
2016-03-30 22:13:24 -07:00
redmatrix
6a6dbec033
issue #319 - NOTE: this does not fix the issue, it only reports it and continues. We need to examine any logger statements that contain 'stack:' as a result of reporting this issue and find and fix the original problem - which is that set_pconfig is being called without a valid $uid. I'm worried that since we will now continue on without throwing a PHP error that nobody will ever notice or find the problem that is causing this.
2016-03-30 16:33:23 -07:00
Mario Vavti
08461c7049
more on mod chat
2016-03-30 14:44:03 +02:00
Mario Vavti
5462453bf2
some work on mod chat
2016-03-30 14:31:55 +02:00
redmatrix
d3f38c9f43
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-26 14:34:19 -07:00
redmatrix
971e7321c6
issue #319 part 2
2016-03-26 14:33:36 -07:00
Mario Vavti
97eef2b88c
removed link to connected apps by accident
2016-03-26 19:34:38 +01:00
Andrew Manning
c25ef1d9a8
Search docs/context/ hierarchically for help.html files to reduce redundancy
2016-03-26 14:31:41 -04:00
Mario Vavti
f714e97d63
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-26 18:46:07 +01:00
Mario Vavti
a507063174
move link to /locs to settings menu if we have more than one location and some template work on locs
2016-03-26 18:43:38 +01:00
redmatrix
531710142c
add hook to allow plugins to perform a follow activity from an activityfeed
2016-03-23 20:04:09 -07:00
Andrew Manning
59827b6dfd
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
2016-03-23 21:17:23 -04:00
redmatrix
f200dd4395
atom specifies a uri or iri for the id. message_id isn't suitable here.
2016-03-23 16:36:27 -07:00
redmatrix
6f2ba0c619
rewrite the webfinger discovery logic
2016-03-22 19:58:59 -07:00
redmatrix
51a840f46a
update network_to_name (reserve DFRN for future use)
2016-03-21 22:02:18 -07:00
redmatrix
ec99e3ed62
attempting to work with braindead lighttpd gnusocial servers
2016-03-21 21:31:28 -07:00
Andrew Manning
56c86b6567
Override navbar help button to open contextual help panel. Contextual help for mail written.
2016-03-21 06:33:02 -04:00
redmatrix
28599fe652
more federation work
2016-03-20 21:41:19 -07:00
redmatrix
d3e7ef70e8
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-20 19:56:36 -07:00
redmatrix
fea532af4d
rework salmon - important, update addons also if you have enabled gnusoc addon
2016-03-20 19:55:53 -07:00
Mario Vavti
9fcd470aca
fix #328 by using a seperate query instead of group_concat
2016-03-20 20:26:55 +01:00
redmatrix
77094f8d2b
make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move.
2016-03-19 16:17:19 -07:00
redmatrix
df61970b39
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-17 12:16:25 -07:00
redmatrix
f82afca84d
no xchan here if using zot protocol
2016-03-17 12:15:28 -07:00
jeroenpraat
eca119d695
See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: enable the Diaspora protocol for all channels (if addon is enabled) - I had to do this during channel creation and not in the addon itself, or else the member can't change this after the channel is created. Tested it on UNO and normal Hubzilla. If this is not the right place for this, please move it. If not wanted at all, please discuss.
2016-03-17 15:48:44 +01:00
redmatrix
a83cdbeb39
typo
2016-03-16 22:02:19 -07:00
redmatrix
3a8f6e6576
more federation backend
2016-03-16 21:05:52 -07:00
redmatrix
38eb79705e
lots of work on federated channel discovery
2016-03-16 18:00:13 -07:00
redmatrix
4188419b30
more federation backend work
2016-03-15 17:54:06 -07:00
redmatrix
e8d19659c0
some heavy lifting porting the old salmon code
2016-03-15 00:50:03 -07:00
redmatrix
b673b6835d
federation work
2016-03-14 22:14:17 -07:00
redmatrix
ef7494359f
some re-working of webfinger and hcard parsing which will be necessary going forward.
2016-03-14 18:12:35 -07:00
redmatrix
cc29e27acc
issue #320 - regression, after removing channel attached to an authenticated session the session was not completely cleared.
2016-03-12 19:53:07 -08:00
redmatrix
70ad69d38c
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-12 16:47:11 -08:00
Mario Vavti
2d8deb6082
some janitor work on profiles
2016-03-12 22:13:46 +01:00
redmatrix
32c23ef562
some minor cleanups
2016-03-10 15:43:59 -08:00
jeroenpraat
107f80892a
UNO: Hide bookmark tools in items (#^ and in menu)
2016-03-10 19:40:28 +01:00
redmatrix
7732532964
handle UNO move channel operation
2016-03-09 15:56:51 -08:00
redmatrix
b9b46a3f88
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-09 14:18:11 -08:00
Mario Vavti
c2cdd41e81
Issue #316 make /display updates work. Basically copy and paste what we do on load and add $simple_update to the query.
2016-03-09 10:04:33 +01:00
redmatrix
256cd6baac
work on implementing account/channel move (as opposed to clone)
2016-03-09 00:46:17 -08:00
redmatrix
843cc1481a
isue #315
2016-03-08 16:46:47 -08:00
redmatrix
9debfa348a
add syslog loglevels to dba functions
2016-03-07 20:43:52 -08:00
redmatrix
32e903e956
a bit of page cleanup for edit profiles
2016-03-07 18:49:17 -08:00
jeroenpraat
7162403292
Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more
2016-03-06 17:02:58 +01:00
redmatrix
dd4a66353a
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-03 14:49:34 -08:00
redmatrix
2cf54c465d
remove the markdown feature. Do not re-enable unless you are willing to support it.
2016-03-03 14:47:39 -08:00
Mario Vavti
b704f977da
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-03 12:08:21 +01:00
Mario Vavti
59e04aed1b
move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template.
2016-03-03 12:07:58 +01:00
redmatrix
436e91a1e1
rename the menu entry and page to 'Profile Fields' to maintain consistency
2016-03-02 16:39:34 -08:00
redmatrix
157bbb14b5
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-02 11:35:48 -08:00
redmatrix
5c22f59c4f
issue #305
2016-03-02 11:32:32 -08:00
Mario Vavti
22729da2a2
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-02 12:31:46 +01:00
Mario Vavti
c97cc1487c
a simple cover-photo implementation for redbasic default template
2016-03-02 12:31:25 +01:00
redmatrix
428b4dbad6
sort out the with and howlong dependencies
2016-03-01 22:47:07 -08:00
redmatrix
548bf884a4
profile field admin page (functional only: still needs a lot of HTML/CSS cleanup)
2016-03-01 21:06:27 -08:00
redmatrix
a0baa480e3
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-03-01 15:01:48 -08:00
redmatrix
765dd5569b
Allow configuration of the display order of profile fields. This is an important piece of a more general profile configuration framework which will eventually be accessible via the admin page.
2016-03-01 14:55:04 -08:00
jeroenpraat
8b61e546fe
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-03-01 22:09:06 +01:00
jeroenpraat
7206e8af3a
Small fix for deleted forum channels showing in the forum widget (had this after migration from RM on 1 or 2 channels)
2016-03-01 22:08:50 +01:00
redmatrix
91bb4bdf50
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-29 19:34:23 -08:00
redmatrix
be2b7c0b5f
abconfig
2016-02-29 19:31:52 -08:00
Mario Vavti
2d45f9f385
provide footer bbcode
2016-02-29 23:58:32 +01:00
Mario Vavti
3f90da5643
remove unused variable
2016-02-29 22:07:14 +01:00
Mario Vavti
d27a627c4f
simplify profile edit button(s) and make it useful for multiple profiles
2016-02-29 22:01:13 +01:00
Mario Vavti
bfeeb76143
fix deletion of files from filesystem
2016-02-29 15:37:34 +01:00
Mario Vavti
f2d3be2e67
do not process update activity if there is no item to update and simplify code a little
2016-02-29 14:22:35 +01:00
redmatrix
ebe70a41b9
build_sync_packet - no need to sleep after the last sync delivery.
2016-02-28 18:26:08 -08:00
redmatrix
da79662081
stop the PHP warnings from Thomas's buggered sitekey
2016-02-28 16:33:52 -08:00
redmatrix
cd5630476f
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-27 16:29:13 -08:00
redmatrix
f7f20c5917
z_fetch_url and z_post_url returning false
2016-02-27 16:27:37 -08:00
Mario Vavti
a2fe22412f
missing include
2016-02-27 16:51:54 +01:00
Mario Vavti
58cf9d832c
make attach_delete() return and comment out album rename functionality since this is not supported by the backend at the moment.
2016-02-27 12:31:07 +01:00
redmatrix
6126070a1d
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-26 12:49:02 -08:00
redmatrix
459166116d
turn timezone aware birthdays into a feature for those who want an uncluttered calendar - at the expense of possibly sending somebody's birthday greeting on the wrong day if they are in a different timezone.
2016-02-26 12:45:44 -08:00
Mario Vavti
776bc51172
fix link to photo album and make sure that small photos are not overwritten by body text.
2016-02-26 15:21:14 +01:00
Mario Vavti
5a563b8e76
some improvement for file activity
2016-02-26 11:17:21 +01:00
Mario Vavti
0653a2e0a9
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-02-26 09:21:01 +01:00
Mario Vavti
d19dfc87a6
get rid of duplicate function
2016-02-26 09:20:44 +01:00
redmatrix
dc8c7a2d2e
small improvements to profile like activity
2016-02-25 16:21:38 -08:00
redmatrix
ba2ede0a8f
this reverts ea54987ca4
2016-02-25 15:41:52 -08:00
redmatrix
6892ba4cd8
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-25 15:14:57 -08:00
Mario Vavti
5ad9b48f1d
revert f62ec4132e - allow one self to be added to a privacy group.
2016-02-25 23:59:57 +01:00
redmatrix
7972de13ca
backtrace openssl_verify errors so that we can find bad keys - as there is very little relevant context available at this level.
2016-02-25 14:34:30 -08:00
Mario Vavti
ea54987ca4
in update_birthdays() we should probably set adjust to 0 instead of 1 since a birthday is more a kind of a global holiday
2016-02-25 23:03:38 +01:00
Mario Vavti
b2474334a7
provide an edit button for the profile page
2016-02-25 22:50:16 +01:00
Mario Vavti
be27fb5644
we have got a button for events in the nav. no need for it in the tabs if we are local.
2016-02-25 13:40:15 +01:00
redmatrix
ebfa1a12b9
when creating an event from a post in our stream, if the original post was private, set the event permissions to "just me". If it was a public event, set the event permissions to the channel default permissions.
2016-02-25 00:36:35 -08:00
redmatrix
c95d7c69eb
issue #216 - calendar sharing
2016-02-24 18:54:52 -08:00
redmatrix
7e6febe2a6
add 'requires' field to plugin info to list other dependent plugins/addons and disable if dependencies are not installed/enabled
2016-02-24 15:19:28 -08:00
redmatrix
b101a8f6fb
missing function
2016-02-24 11:20:46 -08:00
redmatrix
d074c53889
function to process atom stream without actually storing anything
2016-02-23 16:34:53 -08:00
redmatrix
edc7c0837b
remove bookmark identifier from embedded links since they aren't bookmarkable without an associated taxonomy entry.
2016-02-21 18:14:28 -08:00
redmatrix
f1564b4cff
retry the move of AccessList to composer format (one or more third-party plugins will likely break as a result)
2016-02-21 16:49:49 -08:00
redmatrix
411abdf8a7
fix double encoding
2016-02-21 14:54:34 -08:00
redmatrix
dfbe2eaf98
Revert "move accesslist class to namespace"
...
This reverts commit a9711895cf
2016-02-20 00:49:37 -08:00
redmatrix
a9711895cf
move accesslist class to namespace
2016-02-20 19:39:54 +11:00
redmatrix
8882ffc0de
ensure auto_channel_create() is executed for all workflows when UNO is set.
2016-02-19 19:21:57 -08:00
redmatrix
d004017b01
issue #288 allow relative_date() to be translated into languages with more than two plural forms, such as pl.
2016-02-19 19:07:07 -08:00
redmatrix
cfa2ac2d0a
move dreport to zotlabs\zot namespace
2016-02-19 14:02:55 -08:00
redmatrix
ebc66d7008
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-19 13:36:48 -08:00
redmatrix
3f0eb84ecf
get_feature_default() was using filtered view, preventing it from working in all cases
2016-02-19 13:34:29 -08:00
Mario Vavti
fbc6c60805
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-02-19 22:28:57 +01:00
Mario Vavti
02e82e496e
pimp up mod new_channel
2016-02-19 22:28:21 +01:00
redmatrix
ca52d39abe
finish up the storage move
2016-02-19 11:58:17 -08:00
redmatrix
28d07fd6b2
move storage assets to zotlabs/storage
2016-02-19 00:06:10 -08:00
redmatrix
4512a4cdd4
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-02-18 15:26:50 -08:00
redmatrix
342fda94e4
Provide Zotlabs\Project and System class for querying details about the project/version info. Move these out of /boot.php
2016-02-18 15:24:58 -08:00
jeroenpraat
fe392a3144
Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings.
2016-02-18 16:53:04 +01:00
redmatrix
c107bcfbd9
some necessary doco for set_iconfig()
2016-02-18 00:51:36 -08:00
redmatrix
76bf892f9f
iconfig - add sharing variable
2016-02-18 00:20:08 -08:00
redmatrix
3a84e7051e
Merge branch 'iconfig'
2016-02-17 16:21:22 -08:00
redmatrix
161050df07
format atom event renderings so they are reasonably compatible with GNU-social
2016-02-17 15:56:30 -08:00
redmatrix
62e141a89c
provide del_iconfig for completeness
2016-02-17 14:14:42 -08:00
redmatrix
696c6e88ea
iconfig debugging - federation now working
2016-02-17 01:05:28 -08:00
redmatrix
a83eb14ff6
iconfig debugging
2016-02-17 00:42:51 -08:00
redmatrix
41ec5403e1
slight changes to set_iconfig - if passed an item structure only update the structure. Update the DB only if passed an item_id. This makes a clean separation of behaviour that's easy to document. One could get into some weird situations the original way which tried to update and sync both.
2016-02-16 22:53:27 -08:00
redmatrix
77eb6c5761
more work on iconfig
2016-02-16 20:49:32 -08:00
redmatrix
89c6cda303
allow admin to set and lock features when UNO is enabled
2016-02-16 18:58:29 -08:00
redmatrix
64f5d80ff2
some iconfig basics
2016-02-16 18:15:19 -08:00
redmatrix
bb381daae3
update fr strings from transifex
2016-02-15 20:32:42 -08:00
redmatrix
4f285911f0
form cleanup (profile_photo and cover_photo), admin 'user_approve' not found, missing close div in mood_content.tpl
2016-02-14 16:15:55 -08:00
redmatrix
ade91f8190
directory modes reversed
2016-02-12 14:02:50 -08:00
redmatrix
af7c7642bb
whitespace
2016-02-11 20:37:30 -08:00
redmatrix
83b5adf194
feed dates are always UTC. This means we will need another mechanism to pass localised dates to items_fetch()
2016-02-10 23:05:47 -08:00
redmatrix
a26d1794fe
feed dates weren't being honoured. When that was fixed they turned out to be reversed.
2016-02-10 23:00:40 -08:00
redmatrix
06a1258a9a
put a sane lower time limit on content search for public feed requests
2016-02-10 19:29:00 -08:00
redmatrix
d31d3df4ea
hook changes to support pubsubhubbub
2016-02-10 19:12:28 -08:00
redmatrix
91801d2e2c
rev update
2016-02-10 13:55:51 -08:00
redmatrix
f984502499
need to re-arrange a few things for a short vcard
2016-02-08 19:33:25 -08:00
redmatrix
315ce6d880
lots more zcard tweaks
2016-02-08 18:16:42 -08:00
redmatrix
d8e6fd5df0
provide get_server_role() to abstract different roles and capabilities
2016-02-07 18:11:10 -08:00
redmatrix
021584d782
fix uno import by disabling for now
2016-02-05 23:45:16 -08:00
redmatrix
a5c111ef4f
uno stuff
2016-02-05 23:13:33 -08:00
redmatrix
7868e47643
more uno groundwork
2016-02-05 13:32:15 -08:00
redmatrix
b4e3cd000f
rev update
2016-02-05 00:06:35 -08:00
redmatrix
9c3568800c
remove blackout setting now that the keepout plugin performs the same tasks (plus a lot more)
2016-02-04 23:59:09 -08:00
redmatrix
a8456782b5
will probably need this to make it work
2016-02-04 22:39:56 -08:00
redmatrix
bfeb89075f
comment buttons hook
2016-02-04 19:06:11 -08:00
redmatrix
40b00ab362
add system black/white list for embeds ahead of personal config
2016-02-04 16:09:36 -08:00
redmatrix
18208fab84
poke basic config setting
2016-02-04 11:58:56 -08:00
redmatrix
c598bbb8a9
Merge branch 'embedsec'
2016-02-03 20:33:34 -08:00
redmatrix
c75f76f740
heavy lifting on admin security page
2016-02-03 20:24:46 -08:00
redmatrix
006efbd906
change view_storage from perms_public to perms_specific in the social_private role
2016-02-03 15:44:36 -08:00
redmatrix
a7ed50ecd4
more zcard tweaks
2016-02-02 19:39:47 -08:00
redmatrix
06dcaaa821
some zcard cleanup - still eneds a lot more work
2016-02-02 17:14:07 -08:00
redmatrix
7f453949a1
minor tweaks
2016-02-01 23:09:45 -08:00
redmatrix
38f385f67d
slight formatting improvements
2016-02-01 21:23:47 -08:00
redmatrix
5edbc00865
profile embeds (still needs a bit of work)
2016-02-01 21:09:50 -08:00
redmatrix
723a49ccee
add photos to the profile "likes this" dropdowns
2016-02-01 17:42:53 -08:00
redmatrix
ff487a0271
more oembed provider work - channel articles
2016-02-01 14:52:08 -08:00
redmatrix
f26c698f4a
add zid
2016-01-31 16:33:25 -08:00
redmatrix
a341c889b7
add oembed provider for photos
2016-01-31 15:55:27 -08:00
redmatrix
08aeeadd71
move permission check before global block check
2016-01-29 14:07:10 -08:00
redmatrix
35a9a468ce
widget_item - provide ability to use the page title instead of the message_id to locate the desired item. You can use either, but the page title is often easier to use and discover.
2016-01-28 15:23:42 -08:00
redmatrix
5f1eb18da4
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-27 23:03:05 -08:00
redmatrix
ae3ca2b7df
block_public_blackout setting
2016-01-27 23:02:36 -08:00
Jeroen van Riet Paap
9ea904c12d
remark in the private notes encrypted
...
Notes are not encrypted and are readable in the database by the admin. Made a remark about that. Probably this needs to be fixed, but till than, it's better to warn people.
2016-01-28 00:21:43 +01:00
redmatrix
d83b907cdc
rename collections to privacy groups
2016-01-26 23:44:15 -08:00
redmatrix
9b08051703
bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops.
2016-01-26 16:57:36 -08:00
redmatrix
9c71b74d37
Merge https://github.com/redmatrix/hubzilla into pending_merge
2016-01-26 15:39:25 -08:00
redmatrix
535a54040f
add abook_account to cloned abook records, was missing
2016-01-26 15:38:56 -08:00
jeroenpraat
68030d12cf
Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits.
2016-01-27 00:24:05 +01:00
redmatrix
3494fddd7c
change help text on other channel expiration setting to inform that there is a system limit. Ignore imported feed content that is older than expiration interval.
2016-01-26 15:12:34 -08:00
redmatrix
424af13891
fix undefined variable reference in widget_item
2016-01-26 14:14:18 -08:00
redmatrix
7d7ef5ac4e
add a fixme
2016-01-21 18:42:44 -08:00
redmatrix
8847e39fb7
regression: public forums granting send stream permissions to all connections
2016-01-21 14:03:46 -08:00
Mario Vavti
b711c050db
make contact block look widget alike
2016-01-21 11:48:10 +01:00
Mario Vavti
2b3b6268dd
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2016-01-21 10:42:41 +01:00
Mario Vavti
97ebf9021c
bootstrapify rating and connect buttons. position the connect button more prominent right under the profile image
2016-01-21 10:42:20 +01:00
redmatrix
1d89198444
issue #263 - account_default_channel not set to 0 when last channel of an account is removed
2016-01-20 23:16:12 -08:00
redmatrix
d3bec0b2f9
honour poco_rating_enable in item_photo_menu
2016-01-19 15:30:17 -08:00
redmatrix
24bffd4418
Separate item_photo_menu() into links which deal with the post and those which deal with the author. We should probably also make this info available to themes so they could for instance provide a visual separator.
2016-01-19 15:15:34 -08:00
jeroenpraat
a036d88a4e
Added a feature to hide rating buttons from a members channel and profile pages.
2016-01-18 21:37:47 +01:00
redmatrix
be83855acf
generalise the site icon
2016-01-17 16:50:37 -08:00
redmatrix
10ed334e8c
various issues from the forums
2016-01-17 16:29:32 -08:00
redmatrix
da9a8d54de
minversion issue
2016-01-17 00:17:23 -08:00
redmatrix
110ef6201e
add $deliver flag to item_store() and item_store_update() [default true]. If false, do not send any notifications or process tag_deliver. This should avoid any network activity from happening as the result of a channel (actually item) import. Other minor fixes in the handling of the $allow_exec flag and further protecting CSS passed to widgets from rogue code and XSS.
2016-01-16 14:00:22 -08:00
Mario Vavti
63ee0daac5
provide more contact infos and update some protocol type definitions
2016-01-15 10:42:44 +01:00
redmatrix
f888548e0e
issue with plugin loadable layouts
2016-01-14 20:51:59 -08:00
redmatrix
64753effd1
cover photo fetch and widget
2016-01-14 17:25:27 -08:00
Mario Vavti
e2b79c34bc
some work on connections
2016-01-14 13:50:47 +01:00
Mario Vavti
69573c6afe
some template work on follow widget
2016-01-14 10:36:45 +01:00
redmatrix
9584ca080c
some initial work on uploading and cropping cover photos
2016-01-13 17:32:09 -08:00
redmatrix
baedd25309
'auto channel creation' - if the corresponding config variable is set, create a channel when an account is created.
...
Plugins can provide the necessary channel details (probably from an extended registration form). If no details are provided, a social (mostly public) channel will be created using the LHS of the email address and you will be directed to your channel page (unless email verification is required, in which case this step will be delayed until successful validation and login). If the reddress is already assigned a random name(1000-9999) reddress will be assigned.
2016-01-12 15:43:08 -08:00
redmatrix
9327ac0ba7
"aconfig" or account configuration storage, needed for some upcoming work. Built on top of xconfig.
2016-01-11 23:54:53 -08:00
redmatrix
a8a5cb05a7
logic reversal in version checking
2016-01-11 17:29:27 -08:00
redmatrix
66c8658898
plugin version compatibility checking. To use, set MinVersion, MaxVersion or MinPHPversion in the plugin header block. Case is not important. We check the project versions against STD_VERSION, which should be rolled to a new y of x.x.y if the plugin interface or project code changes in an incompatible way.
2016-01-11 16:34:12 -08:00
redmatrix
d79d6c7055
the mail_isreply flag wasn't being set in the right cases
2016-01-10 17:39:18 -08:00
redmatrix
23c7086605
add locked features to siteinfo to assist in debugging
2016-01-09 23:39:53 -08:00
redmatrix
b00c22916a
fix relative urls on some Diaspora profile photos
2016-01-09 14:02:58 -08:00
redmatrix
bf99906386
provide admin toggle to disable delivery reports
2016-01-07 14:27:06 -08:00
redmatrix
93565ea768
features management page for hubmins
2016-01-06 13:01:28 -08:00
redmatrix
c076e72cbf
provide an option to toggle the view of locked features so we can use the same list in an admin feature set & lock page.
2016-01-05 20:38:32 -08:00
redmatrix
1f0e603992
expire delivery reports at 10 days by default instead of 30.
2016-01-04 22:12:36 -08:00
redmatrix
374aadc97e
Provide a mechanism for a hub admin to lock features in the on or off state. Locked features will not be available in the UI on the Additional Features page to be set by members. If all features are locked, the link to the Additional Features page will not be displayed.
2016-01-04 01:02:10 -08:00
redmatrix
c38edfcb32
issue #241 (redmatrix issue 405)
2016-01-01 16:12:43 -08:00
redmatrix
1964fa05e1
issue #239 , provide 'Public' text on ACL selector when appropriate to do so.
2015-12-31 15:10:36 -08:00
redmatrix
caf3a69d99
yearly license update
2015-12-31 13:25:23 -08:00
redmatrix
062c03c9f7
comment clarification
2015-12-31 12:30:49 -08:00
redmatrix
2cf4ac26fd
log API improvements and queue optimisation for singleton networks
2015-12-31 12:26:41 -08:00
redmatrix
fbeb33479b
store perms_accept on channel creation
2015-12-29 11:16:13 -08:00
redmatrix
cf5df259e5
refresh issue
2015-12-27 21:08:28 -08:00
redmatrix
6db6fef29f
spelling
2015-12-25 14:56:06 -08:00
redmatrix
36717e5f32
start on refactor of plugin/theme/widget info block parsing
2015-12-22 19:53:00 -08:00
redmatrix
7a9fe0907a
make the queue api accessible to addons
2015-12-21 17:00:42 -08:00
redmatrix
bc5a675cdf
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-12-20 14:57:01 -08:00
redmatrix
f23e8f8d41
merge hell
2015-12-20 14:55:43 -08:00
wave72
598a428c6b
Added 'invitation_only' to site info
2015-12-20 14:41:49 +01:00
redmatrix
ed5ca9e4cc
use realpath to bypass symlinks and check actually directory
2015-12-18 14:55:19 -08:00
redmatrix
8d61efa0e8
allow widget 'packages' as well as individual files
2015-12-18 14:10:06 -08:00
redmatrix
a99d28dea9
sql delete with limit
2015-12-18 13:46:03 -08:00
redmatrix
1b9722c65a
loop detection
2015-12-17 18:16:46 -08:00
redmatrix
62a60e5542
more work on media uploads via api
2015-12-17 16:22:13 -08:00
redmatrix
9c23fe5ab6
issue #228
2015-12-17 14:26:42 -08:00
redmatrix
4cacfe59bd
queue/notification/delivery refactor continued
2015-12-16 22:42:33 -08:00
redmatrix
b155f2260f
some notifier optimisations. Also put a fixme on the invite total generations for new accounts, which is incorrect and now commented out.
2015-12-16 14:47:30 -08:00
redmatrix
9b4e6e1ec0
some more minor api tweaks
2015-12-15 20:21:40 -08:00
redmatrix
2aa3acae6b
remove deprecated table
2015-12-15 19:46:24 -08:00
redmatrix
8514789da9
additional fix for the array_key_exists message in #221
2015-12-15 17:50:14 -08:00
redmatrix
20dcf37976
issue #221
2015-12-15 17:42:49 -08:00
redmatrix
f121b74bec
enhance whitespace
2015-12-15 15:17:10 -08:00
redmatrix
cb8cccc537
fix typos before merging
2015-12-15 15:13:16 -08:00
redmatrix
2924b9182e
revise the photo activity a bit so that we always have a valid activity body. Several network connectors can get empty posts or posts that don't contain any reference whatsoever to the actual photo. Since this can cause duplicate images on our own site, just provide the activity summary and any included body text to the activity by default. Provide a function to enhance this activity with an actual photo which can be applied on demand for any network connectors that desire it. Otherwise they'll just get a link to the photo in the activity statement - which is better than an empty post. Have applied this "add actual photo to the post" function to both Diaspora and RSS feeds. Also provide the album as the activity target.
2015-12-15 15:01:54 -08:00
redmatrix
ba463afbdc
even more queue api
2015-12-15 00:42:19 -08:00
redmatrix
6f2a5117dc
more queue api
2015-12-15 00:04:30 -08:00
redmatrix
b13241564b
more work on queue api
2015-12-14 22:44:05 -08:00
redmatrix
76816de3aa
simplify queue insertion for normal items
2015-12-14 20:49:12 -08:00
redmatrix
49108c230b
regenerate the item body for linked photo items that now have no body to provide legal activities when going to other networks. Remove the signature since the signed text was an empty string and we've just replaced it with content that will not verify.
2015-12-14 17:58:39 -08:00
redmatrix
b32bba47c8
set following to false
2015-12-14 17:25:40 -08:00
redmatrix
dcf7946673
revert include/photos.php:L380
2015-12-14 02:34:18 -08:00
redmatrix
fdd2da905a
more work on api media uploads
2015-12-13 19:15:42 -08:00
redmatrix
bb0e4044bf
remove the unqualified "OAuth" namespace from the project. We need to reference either OAuth1 or OAuth2.
2015-12-13 15:35:45 -08:00
redmatrix
395268da22
a couple of api improvements
2015-12-11 21:10:20 -08:00
redmatrix
1f4c596841
add deprecated update_with_media endpoint
2015-12-11 17:00:45 -08:00
redmatrix
9fb7a12849
incorrect obj_type on several items
2015-12-11 02:52:43 -08:00
redmatrix
f73c82632f
some minor cleanup - change the default of the discover tab (public stream access)
2015-12-10 19:18:55 -08:00
redmatrix
8389d8677d
some major cleanup of api authentication stuff - still needs much more and this still may not solve #206
2015-12-10 16:39:46 -08:00
redmatrix
72edc9cd6c
start working on the singleton setting
2015-12-09 18:30:30 -08:00
redmatrix
4b6dcbb057
provide paths for include files
2015-12-09 14:56:08 -08:00
jeroenpraat
2e73e6bfb6
Fix #109 .
2015-12-09 14:37:14 +01:00
redmatrix
0f4ceedbb4
remove duplicated code
2015-12-08 20:47:55 -08:00
redmatrix
656e5fd052
use killme() instead of die() so that any sessions are closed cleanly.
2015-12-08 20:42:46 -08:00
redmatrix
29ac533cc9
remove some unused stuff
2015-12-08 16:32:06 -08:00
redmatrix
241607e7d7
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-12-07 16:15:52 -08:00
redmatrix
bd7d851758
a loose end
2015-12-07 16:11:39 -08:00
redmatrix
8b974f8f74
abstract the message handlers
2015-12-07 16:01:54 -08:00
Mario Vavti
0174cb10ae
fix issue #210
2015-12-07 19:11:32 +01:00
Mario Vavti
0df4f9c114
change album_id logic to make it work with ajax calls
2015-12-07 13:27:35 +01:00
Mario Vavti
69c9f4588c
make justify gallery work with more than one albums per page (eg album widget)
2015-12-07 12:13:51 +01:00
redmatrix
f7f0d2b265
provide plugin hooks for blacklist checking functions.
2015-12-06 20:45:21 -08:00
redmatrix
aa5b7eb98a
minor optimisation
2015-12-06 19:48:46 -08:00
redmatrix
4ccd9ae6da
start of v4
2015-12-06 19:16:38 -08:00
redmatrix
10db51e6c2
Merge branch 'master' into dev
2015-12-05 12:48:46 -08:00
Mario Vavti
8a9d743f6f
fix rendering of unseen forum posts count
2015-12-04 10:17:13 +01:00
redmatrix
4cab74c18c
use the channel blacklist for items and mail, still todo: directory and stuff
2015-12-03 21:05:48 -08:00
redmatrix
ca55bbdaed
use the std_version where applicable instead of matching to the git.
2015-12-03 17:09:05 -08:00
redmatrix
ed5405d4f7
prevent function name re-declaration in widget space
2015-12-02 18:25:09 -08:00
redmatrix
8dd4270a6a
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-12-02 16:23:28 -08:00
redmatrix
c29f622b90
introduce STD_VERSION and get_std_version() [in include/plugin.php], we begin with 0.11.1 since it is an incompatible interface change to 0.11.
2015-12-02 16:21:15 -08:00
Mario Vavti
bb995f1bb6
fix mail attachment and photo permissions. issue #202
2015-12-02 11:34:40 +01:00
Mario Vavti
857e13e9b8
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-12-02 09:44:42 +01:00
Mario Vavti
593423434c
fix attachment rendering for mail
2015-12-02 09:44:25 +01:00
redmatrix
25caeee854
issue #204
2015-12-01 20:21:44 -08:00
redmatrix
1ba74d824b
usercache is no longer used
2015-12-01 15:51:15 -08:00
redmatrix
650f882265
generalise the site black|white allow lists, also add a channel black|white list for future use
2015-11-29 20:26:00 -08:00
redmatrix
a2747403f2
report correct directory mode for standalone directories in siteinfo
2015-11-29 19:45:29 -08:00
redmatrix
3f9412add2
create get_site_info() function so we can have a siteinfo.json module instead of or actually in addition to siteinfo/json
2015-11-29 19:37:03 -08:00
redmatrix
29877963be
issue #189
2015-11-29 18:07:59 -08:00
redmatrix
302c5afdee
don't try to pull public content from dead sites
2015-11-29 16:28:35 -08:00
redmatrix
9f90806027
log whatever is showing up in the delivery hash array since it seems that one site has something unusual there and it is throwing errors.
2015-11-29 15:23:29 -08:00
Mario Vavti
bcfa72ed31
move events tools to aside widget
2015-11-27 22:45:28 +01:00
Mario Vavti
f691e8981a
fixes #194 - New directory server is selected on every directory page reload
2015-11-27 20:55:27 +01:00
redmatrix
fa5a382c4b
don't show item_delayed_publish items in tag clouds
2015-11-26 17:35:41 -08:00
Mario Vavti
91b35c5349
various css fixes
2015-11-26 23:19:06 +01:00
Mario Vavti
056db37c66
beautify event item code
2015-11-26 22:14:20 +01:00
Mario Vavti
5cb71fa5da
default timepicker to 15 min steps. abbr -> span
2015-11-26 21:00:04 +01:00
Mario Vavti
17e7b276f6
we also need nofinish in the object. css fices
2015-11-26 14:45:22 +01:00
Mario Vavti
f80aff4a65
also catch the other object
2015-11-26 13:28:31 +01:00
Mario Vavti
c7cbd41c16
first iteration on the event item
2015-11-26 12:26:27 +01:00
Mario Vavti
3ea84d7eab
some basic event styling
2015-11-25 22:55:07 +01:00
redmatrix
bae7b034e6
add (blank?) label param to other instances of datetimesel
2015-11-24 14:54:13 -08:00
Mario Vavti
5a12944b39
oups :)
2015-11-24 14:18:29 +01:00
Mario Vavti
987619130b
some event heavy lifting - please test and report issues
2015-11-24 14:15:28 +01:00
redmatrix
167e754a1b
issue #184
2015-11-23 15:17:38 -08:00
redmatrix
a7e4553ea7
delivery report tweaks
2015-11-22 17:12:30 -08:00
redmatrix
6f27e8db38
Merge https://github.com/redmatrix/hubzilla into pending_merge
...
Conflicts:
version.inc
2015-11-22 14:08:20 -08:00
redmatrix
292b02b58c
webpages and design elements weren't being included in the item export query.
2015-11-22 14:06:52 -08:00
Mario Vavti
18e0e4b597
do not hide scrollbars
2015-11-21 23:51:50 +01:00
Mario Vavti
74b574d0b1
datetimepicker should also respect first day of week setting
2015-11-21 23:49:29 +01:00
ken restivo
fabf7081d3
Use http_status() instead of homegrowing it. Adapt http_status to handle replies with data.
2015-11-20 18:56:41 -08:00
redmatrix
427652e9bd
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-20 14:41:16 -08:00
redmatrix
106b4fdd2d
add v4 project roadmap, partial fix for cloning of profile photos on alternate profiles
2015-11-20 14:38:32 -08:00
ken restivo
f164ddf155
Report correct HTTP error code, i.e. for API callers.
2015-11-20 13:03:16 -08:00
redmatrix
37368bda65
change _newwin to _blank because the window named _newwin may be hard to find if you have lots of windows/tabs open.
2015-11-20 12:49:38 -08:00
redmatrix
301072a86c
issue #85 , community tags and file tags lost during edits. This required splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits.
2015-11-20 00:15:48 -08:00
redmatrix
a44795e6c3
change action label from 'stop following' to 'unfollow thread'
2015-11-19 17:27:07 -08:00
redmatrix
8f94c721bf
new feature: 'suppress_duplicates' issue #146 triggered with less than two minutes between posts having identical content.
2015-11-19 16:05:47 -08:00
Mario Vavti
ba52af786e
move today button from aside to section title
2015-11-19 11:38:34 +01:00
Mario Vavti
a17f280f7d
rename some menus
2015-11-19 00:10:32 +01:00
Mario Vavti
0c163c4d03
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-11-18 23:51:00 +01:00
Mario Vavti
e4145deeb7
some events refacturing
2015-11-18 23:50:42 +01:00
redmatrix
179730e485
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-18 02:45:39 -08:00
redmatrix
106b3257e4
wsod viewing photo widget
2015-11-18 02:45:22 -08:00
ken restivo
312cc415ce
Pass in account_id. Required for bulk identity importer.
2015-11-18 00:26:18 -08:00
redmatrix
68da4d90dc
fix admin plugin hooks
2015-11-17 20:44:57 -08:00
redmatrix
a089064588
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-17 15:04:04 -08:00
redmatrix
a06f7fbe2e
photo album widget permissions issue
2015-11-17 15:03:27 -08:00
Mario Vavti
7c4d9519c8
whitespace
2015-11-17 23:08:35 +01:00
Mario Vavti
6fa0807550
more css fixes
2015-11-17 23:01:24 +01:00
Mario Vavti
868a0d8a90
missing closing " for src attribute
2015-11-17 13:45:00 +01:00
redmatrix
6df98f080b
fix api/direct_messages/new at least for the json case. We seem to have a missing template for XML
2015-11-16 19:17:39 -08:00
redmatrix
0cb5f009b4
tag_deliver of an edit to an already uplinked item wasn't resetting permissions and ownership bits before starting delivery chain on the edit.
2015-11-15 20:52:50 -08:00
redmatrix
c7b2ec8bba
allow plugins to also log to a different named logfile and also alter the log message
2015-11-15 19:40:01 -08:00
redmatrix
fff30b1c3d
permission issues editing wall-to-wall posts
2015-11-15 19:36:17 -08:00
redmatrix
6ad35e3d84
issue with dead hub detection
2015-11-15 18:12:53 -08:00
redmatrix
3d80073a0e
revert html in markdown for posts, but trim the input before processing the markdown
2015-11-15 18:03:37 -08:00
redmatrix
1029939f56
issues connecting to local forum
2015-11-15 17:28:45 -08:00
redmatrix
dba38821bc
superblock enhancements
2015-11-13 15:28:34 -08:00
redmatrix
93e5449c08
really basic photo album widget for content regions
2015-11-12 20:22:36 -08:00
redmatrix
888bf76e4b
allow pdl content
2015-11-12 17:47:38 -08:00
redmatrix
22a650ade8
issue #154
2015-11-12 16:57:02 -08:00
redmatrix
6e04dd96a1
will also need api doco
2015-11-11 20:51:15 -08:00
ken restivo
75c10eaff5
Merge pull request #144 from kenrestivo/api-auth-fix
...
api_auth.php must be included since the function moved.
2015-11-11 11:18:41 -08:00
ken restivo
ffb8059c24
api_auth.php must be included since the function moved.
2015-11-11 02:26:12 -08:00
redmatrix
f1492945ec
Merge pull request #140 from kenrestivo/move-export-to-plugin
...
Moving this out into a plugin; hopefully one that will work with RM
2015-11-11 18:08:03 +11:00
ken restivo
ddce0412ac
Move api_auth() out to a file that can be included from plugins/modules to allow them to expose their own programmatic API.
2015-11-10 22:50:18 -08:00
ken restivo
741afeea41
Moving this out into a plugin; hopefully one that will work with Redmatrix as well.
2015-11-10 14:48:50 -08:00
redmatrix
c4a3487f0c
remove the obsolete avatar_img function (gravatar/libravatar lookup)
2015-11-09 20:29:36 -08:00
redmatrix
e6de9bfa4e
get rid of the pre-comanche widget placement and wgl code
2015-11-09 19:42:37 -08:00
redmatrix
fba2603304
add avatars to likes/dislikes/etc.
2015-11-09 15:58:19 -08:00
redmatrix
862a310075
thwart attempts to use an external private directory as a directory server
2015-11-09 14:53:58 -08:00
ken restivo
49d6605377
First pass at endpoints for exporting users and channels in bulk as admin.
2015-11-08 20:50:36 -08:00
redmatrix
dfb49558f4
Merge pull request #132 from kenrestivo/test-for-email
...
Add unit tests for valid email function.
2015-11-09 14:39:00 +11:00
redmatrix
4e1c308162
make jotnets modal
2015-11-08 17:48:43 -08:00
redmatrix
5c2692a8ea
no comment permission bug, also implement delete() in RedDirectory per Waitman
2015-11-08 16:36:36 -08:00
ken restivo
9c240de303
Add unit tests for valid email function.
2015-11-08 14:37:48 -08:00
redmatrix
4620eb32d2
version and string update
2015-11-06 12:35:43 -08:00
redmatrix
9cad4c11fe
typo
2015-11-05 16:36:19 -08:00
redmatrix
a26d8609a9
handle old files with partial paths
2015-11-05 16:28:10 -08:00
redmatrix
001e4276d3
first cut at some much better hook documentation derived from bamfic's automated list (doc/hooks.html)
2015-11-05 16:08:18 -08:00
redmatrix
58fe4f5cb3
fix the file chunking api now that we've got working data to test with
2015-11-05 00:00:41 -08:00
redmatrix
f8b612a2c0
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
install/update.php
2015-11-04 23:17:09 -08:00
redmatrix
f7468ab473
re-arrange file api calls so the api pathnames don't shadow each other
2015-11-04 20:50:43 -08:00
redmatrix
1213893a71
api calls to fetch file (attach) meta data and to chunk file content fetching which will eventually allow us to clone large videos without hitting memory limits
2015-11-04 19:49:41 -08:00
redmatrix
b6b2420ff7
protocol upgrade
2015-11-03 23:54:53 -08:00
redmatrix
77a03e376c
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/photo/photo_driver.php
include/text.php
mod/post.php
2015-11-03 20:46:47 -08:00
redmatrix
877b3361c8
better re-install detection/protection. This necessitated a slight protocol change but should not introduce any compatibility issues with older software. Things just work better if you use an up-to-date server.
2015-11-03 20:28:56 -08:00
redmatrix
2fbfc2a8f1
need better peer verification due to re-install issue, this is temporary
2015-11-03 19:50:40 -08:00
redmatrix
e09b49288f
provide admin setting to change directory server
2015-11-03 18:34:16 -08:00
redmatrix
c1cfcc78fe
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-03 14:59:43 -08:00
redmatrix
2c299a9f37
implement unfollow thread
2015-11-03 14:59:14 -08:00
Mario Vavti
43d8090182
timeago() works best with iso format. fix #118
2015-11-03 11:19:22 +01:00
redmatrix
d13dae6b06
bug in hub/location sync
2015-11-02 21:02:30 -08:00
redmatrix
954957bd8a
provide discovery for local deletes in zot-finger and mark the hublocs invalid/deleted
2015-11-01 19:07:32 -08:00
redmatrix
d3183467e0
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-11-01 15:52:35 -08:00
redmatrix
b62614bbd4
improve /locs page with some field notes and the ability to do a forced sync
2015-11-01 15:51:45 -08:00
Mario Vavti
7ce3ebc46d
make sure we only have one profile photo for a cloned channel
2015-11-01 21:04:55 +01:00
Mario Vavti
0353b0e04f
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-11-01 11:17:04 +01:00
jeroenpraat
ca81ab784a
Fix youtube and vimeo for Diaspora posts. Remove empty zrl's from Diaspora posts (fixes also the not working and only translated into default hub language 'view full size'). Please revert when wrong.
2015-10-31 22:38:16 +01:00
Mario Vavti
d6d96e8c89
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-10-31 12:04:20 +01:00
redmatrix
7a87343c71
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-10-30 22:46:31 -07:00
redmatrix
5f80121637
add hubloc repair script (needed for deadsuperhero, probably temporary)
2015-10-30 22:43:38 -07:00
Mario Vavti
5920a96da7
make attachments appear in a dropdown in wall-item-tools-left
2015-10-31 00:38:01 +01:00
Mario Vavti
f8b767ed32
fix photo item for search_item.tpl and a minor css fix
2015-10-30 18:46:16 +01:00
Mario Vavti
d0b0d0ec72
possibly improve cloned profile images a bit - mod/photo would pick some random photos if there are more than one kind of PHOTO_PROFILE
2015-10-30 15:08:28 +01:00
redmatrix
e0463f5a74
Merge pull request #107 from kenrestivo/fix-audio-preload
...
Save bandwidth on mobile networks.
2015-10-30 15:25:18 +11:00
ken restivo
1b30210120
Save bandwidth on mobile networks.
2015-10-29 20:50:52 -07:00
Mario Vavti
ec28dee728
update to latest object
2015-10-29 12:58:32 +01:00
Mario Vavti
3e459ed434
move it up
2015-10-29 11:34:56 +01:00
Mario Vavti
d66be62516
move it up
2015-10-29 11:34:30 +01:00
Mario Vavti
98fd919647
possibly better fix for profile photo image type issue
2015-10-29 11:30:45 +01:00
Mario Vavti
0a9b2b6b15
possibly better fox for profil photo image type issue
2015-10-29 11:29:11 +01:00
redmatrix
b5dfc54be3
fix the typo
2015-10-28 19:45:02 -07:00
redmatrix
848e3f6c5d
photos linked item visibility issue
2015-10-28 19:43:35 -07:00
redmatrix
1f5818cec8
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-10-28 16:59:23 -07:00
redmatrix
06ec5424c7
restrict sslify to img tags by default - set config system.sslify_everything if you want to proxy media files also.
2015-10-28 16:58:13 -07:00
Mario Vavti
e0a75f68d5
re-enable pathinfo() check and try with getimagesize() if we have not got a result
2015-10-28 21:52:56 +01:00
Mario Vavti
a5f1fa3168
re-enable pathinfo() check and try with getimagesize() if we have not got a result
2015-10-28 21:52:15 +01:00
Mario Vavti
1375ed6aea
pathinfo() does not work in this case. getimagesize() seems more reliabel. this fixes transparent png avatars having a black background.
2015-10-28 20:01:50 +01:00
Mario Vavti
f1a3b281d4
pathinfo() does not work in this case. getimagesize() seems more reliabel. this fixes transparent png avatars having a black background.
2015-10-28 19:59:50 +01:00
Mario Vavti
59da3dfe03
do not treat profile photo change posts like photo-items
2015-10-28 15:03:34 +01:00
redmatrix
612efe56f1
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-10-27 21:18:03 -07:00
redmatrix
07c0bc7b04
api posting with htmlstatus fails if it doesn't contain any html tags issue #104
2015-10-27 21:16:59 -07:00
ken restivo
b3528c314a
Support files with names like foo.0.1.3.ogg
2015-10-27 19:48:14 -07:00
ken restivo
869735e4b5
Correct mime types via https://wiki.xiph.org/MIME_Types_and_File_Extensions
2015-10-27 15:35:39 -07:00
Mario Vavti
3f1dc22c0e
fix sharing of photo items
2015-10-27 11:07:40 +01:00
redmatrix
917d0ced4a
new feature: delayed posting
2015-10-25 16:54:18 -07:00
redmatrix
7f3df847a2
make use of http_host vs. server_name configurable in script_path()
2015-10-25 15:37:09 -07:00
Stefan Krauth
2030aea175
Better handling for SSL reverse proxy
2015-10-25 20:10:35 +01:00
Mario Vavti
4442da306a
hubzilla compatibility: improve photo item object - we now provide the infos for all available photo sizes
2015-10-25 18:02:45 +01:00
Mario Vavti
911fd6c654
improve photo item object - we now provide the infos for all available photo sizes
2015-10-25 18:01:44 +01:00
Mario Vavti
123fe58c26
new line between photo and description
2015-10-24 22:16:08 +02:00
Mario Vavti
ab8b4d5c36
another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload
2015-10-24 21:44:25 +02:00
Mario Vavti
5395b173aa
implement the new anchor target behaviour
2015-10-22 12:09:19 +02:00
Mario Vavti
735f9c7a45
define $photo
2015-10-22 11:37:34 +02:00
Mario Vavti
9cbca24f7a
photo object compatibility revamped
2015-10-22 10:56:24 +02:00
Mario Vavti
6f8d29ad80
move photo object stuff from itemObject to prepare_body() so we can do more stuff with it
2015-10-22 10:52:10 +02:00
redmatrix
eb947acebe
set link target window for many links that are included in posts, but not in rest of application
2015-10-21 18:34:09 -07:00
redmatrix
01e84edd0a
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-10-21 15:02:32 -07:00
redmatrix
b7538b6ada
turn relative links in app_render() into absolute links, without affecting the install.
2015-10-21 15:00:41 -07:00
Mario Vavti
232742a5e6
warn if quota exceeds 90% of storage limit
2015-10-21 12:52:03 +02:00
Mario Vavti
a33ddf373b
move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation
2015-10-21 12:40:09 +02:00
Mario Vavti
beae28f2db
add obj_type and object again
2015-10-20 13:19:05 +02:00
Mario Vavti
81b2c5ac68
fix jot photo upload
2015-10-20 13:03:28 +02:00
Mario Vavti
35b5f60f99
update large photo feature setting description
2015-10-20 09:58:48 +02:00
Mario Vavti
96f23758b4
hubzilla photo object compatibility
2015-10-20 09:40:32 +02:00
Mario Vavti
f7601756e9
create photo object if feature large photos is enabled and display those slightly different
2015-10-20 09:36:15 +02:00
redmatrix
08a5884c9f
revert - we can't guarantee what project name the fallback directory server has and this could cause bugs later
2015-10-19 17:03:34 -07:00
redmatrix
0f3b7dd6e9
update site on initial directory setup
2015-10-19 17:01:59 -07:00
redmatrix
bab73edcef
extened the earlier fix
2015-10-19 16:50:53 -07:00
redmatrix
8aadc2837c
typo
2015-10-19 16:19:00 -07:00
redmatrix
ea37882b95
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
install/schema_mysql.sql
install/schema_postgres.sql
install/update.php
mod/zfinger.php
2015-10-19 16:18:04 -07:00
redmatrix
57e0bfc5a9
add the project name to site info packet
2015-10-19 16:07:14 -07:00
Mario Vavti
4b300f8274
fix typo in include/notifier.php
2015-10-19 14:53:13 +02:00
redmatrix
f0a33c00bc
separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected.
2015-10-18 20:13:12 -07:00
redmatrix
9b3662e5ad
issues with "the Register" feed
2015-10-18 16:29:09 -07:00
redmatrix
76d41fc250
re-organise the protocol disabled logic
2015-10-18 15:49:52 -07:00
redmatrix
4b984f9819
filter delivery reports
2015-10-17 13:26:55 -07:00
redmatrix
e8882a5167
remove one more Friendica table reference from the API
2015-10-16 15:24:48 -07:00
Mario Vavti
b7408fa39e
we now provide images for all suffixes (0-3) -> simplify photo item body creation and provide width x height for any size
2015-10-16 16:27:51 +02:00
redmatrix
c07f694a07
another try at issue #89 - rotating photos
2015-10-16 04:21:40 -07:00
redmatrix
550cab41fb
missing xchan_mail_query
2015-10-15 21:39:33 -07:00
redmatrix
45bd81fe8c
missed the xchan_mail_query
2015-10-15 21:38:16 -07:00
redmatrix
3f7ee613fc
mail sync debugging
2015-10-15 20:40:24 -07:00
redmatrix
93f061f78a
mail sync/migrate continued; also abstract delivery loop to make it re-usable, change refresh_all to use delivery loop.
2015-10-15 18:52:04 -07:00
redmatrix
7517c76ae4
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
install/update.php
2015-10-15 16:02:37 -07:00
redmatrix
bf5a1f662a
generate all (non-square) photo scales - even if the original photo is smaller than the scale target sizes.
2015-10-15 14:18:40 -07:00
Mario Vavti
391b98f72c
fix webpages
2015-10-15 20:57:05 +02:00
Mario Vavti
d40a087ec2
really fix label name
2015-10-15 16:07:13 +02:00
Mario Vavti
138c14d43f
wrong logic
2015-10-15 15:48:13 +02:00
Mario Vavti
dc6a594277
fix label name
2015-10-15 15:41:08 +02:00
Mario Vavti
73082a338b
(re)add default image-size 320px - it is good for gallery preview. this size has the suffix -3 now
2015-10-15 12:56:22 +02:00
Mario Vavti
2413968021
double up default photo sizes - even the mos simple camera can now do images > 1024px
2015-10-15 11:20:56 +02:00
Mario Vavti
44b542814a
if photo deleted from /cloud or /dav also delete from /photos
2015-10-15 10:29:39 +02:00
Mario Vavti
2848f5dab4
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-10-15 09:36:51 +02:00
redmatrix
0563ce93a1
change name of matrix app
2015-10-14 18:03:05 -07:00
redmatrix
c8e3ea955d
more mail sync work
2015-10-14 17:49:35 -07:00
redmatrix
b33a9a71f6
more work on import & sync of private mail and conversations
2015-10-14 17:40:50 -07:00
redmatrix
8af3dc140e
issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud
2015-10-14 15:08:07 -07:00
redmatrix
de697a4267
issue #86 - like/dislike in photos not working
2015-10-14 14:16:16 -07:00
Mario Vavti
ca35db76b8
wrong variable
2015-10-14 23:07:49 +02:00
Mario Vavti
b6eded1119
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-10-14 22:57:03 +02:00
Mario Vavti
c8d8ae89d7
remove $item from $prep_arr - we probably do not need it
2015-10-14 22:46:40 +02:00
redmatrix
b2d949ce9a
issue #82 - args not defined (should be arr)
2015-10-14 13:25:58 -07:00
Mario Vavti
f12ebffa39
really check for large photos feature
2015-10-14 22:24:13 +02:00
redmatrix
9b4d32b68c
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-10-14 13:19:52 -07:00
redmatrix
f4e708a02f
port of mail encoding
2015-10-14 13:19:28 -07:00
Mario Vavti
b4e83b6537
allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.
2015-10-14 22:14:19 +02:00
redmatrix
c7637a0c53
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-10-14 13:13:12 -07:00
redmatrix
732c6134dd
support for mail sync
2015-10-14 13:11:24 -07:00
redmatrix
d616099de6
Merge pull request #80 from git-marijus/master
...
fix /channel not updating after posting comment
2015-10-14 18:19:32 +11:00
redmatrix
edeba4ca34
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/api.php
2015-10-13 16:19:25 -07:00
redmatrix
7e03f612b3
file migration - continued
2015-10-13 16:16:51 -07:00
redmatrix
578f1b8ece
api extenesions for file migration
2015-10-13 16:15:34 -07:00
Mario Vavti
e2a15d0ec9
fix photo visibility switch on photo upload
2015-10-13 14:05:27 +02:00
redmatrix
136e5fdf95
port of file detail api call
2015-10-12 23:39:55 -07:00
redmatrix
75fe9f9cc4
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-10-12 23:37:35 -07:00
redmatrix
73dad85867
file detail api call (will not work for huge files)
2015-10-12 23:36:26 -07:00
redmatrix
91895c52ca
missing underscore
2015-10-12 19:54:01 -07:00
redmatrix
fc28af8518
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/attach.php
2015-10-12 19:52:21 -07:00
redmatrix
3545626950
attach_list_files had some problems - wasn't used until now apparently
2015-10-12 19:49:06 -07:00
redmatrix
6a7079a594
small change to allow a person with sufficient privileges the ability to import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process.
2015-10-12 18:55:02 -07:00
redmatrix
c76da2e77d
functions to update urls in items when doing migrations
2015-10-06 20:30:49 -07:00
Mario Vavti
26b97722c6
remove check mail - it just reloads the page. we get a notification in the panel if we get new mail
2015-10-04 13:43:16 +02:00
jeroenpraat
ab59e41e1a
Red:Notify > Hubzilla:Notify
2015-10-03 15:51:12 +02:00
redmatrix
6171d164d7
need full path to deliver_hooks.php
2015-10-02 04:51:57 -07:00
redmatrix
982ff8733f
one more change
2015-10-01 19:54:28 -07:00
redmatrix
ebe374d572
notification changes to support testdrive
2015-10-01 19:49:06 -07:00
redmatrix
dd45e7b4eb
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-10-01 17:30:15 -07:00
redmatrix
63eb0e3a38
allow additional uses for xtags
2015-10-01 17:28:03 -07:00
redmatrix
986244eeea
issue #63 - missing table fields in db query
2015-09-30 21:38:21 -07:00
redmatrix
9bdb7bef5d
add delivery reports to mail (not backported to redmatrix)
2015-09-30 19:27:53 -07:00
redmatrix
54e7d5d260
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
view/de/messages.po
view/de/strings.php
2015-09-30 16:31:06 -07:00
redmatrix
5265c190d4
document the issue with cloned delivery to self vs normal delivery to self
2015-09-30 16:27:24 -07:00
redmatrix
4b7c052ed8
undo self deliver check
2015-09-30 12:59:13 -07:00
redmatrix
fd290882fd
undo self-deliver check
2015-09-30 12:57:02 -07:00
redmatrix
e769fbaffb
another error from the db logs
2015-09-29 22:56:29 -07:00
redmatrix
5721f9f3a9
wrong table column names
2015-09-29 22:51:06 -07:00
redmatrix
cca9f2392e
queue cleanup, and report issues
2015-09-29 22:11:10 -07:00
redmatrix
928fa44154
more work on the notifier
2015-09-29 21:08:12 -07:00
redmatrix
a795f03c48
improve the sys channel location repair to check key issues and re-installs and/or site moves
2015-09-29 17:21:14 -07:00
redmatrix
8f7b869c08
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-09-29 16:56:50 -07:00
redmatrix
c5294f994e
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
2015-09-29 16:55:51 -07:00
Mario Vavti
2a2da48d18
fix typo in 0b1cd826b0
2015-09-29 11:56:43 +02:00
Mario Vavti
0b1cd826b0
do not store a recalled mail if we can not find the original mid
2015-09-29 11:48:41 +02:00
redmatrix
8d5556764c
add one more level of parentheses to ensure operator precedence is correctly evaluated
2015-09-28 20:03:11 -07:00
redmatrix
f965209eee
check public scopes against visitor in item_permissions_sql()
2015-09-28 19:45:57 -07:00
redmatrix
5c526995d8
resolve conflicts
2015-09-28 19:07:31 -07:00
redmatrix
50ee82e8bd
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-28 19:06:10 -07:00
redmatrix
8a3c909c74
ignore self delivery in process_delivery
2015-09-28 19:05:45 -07:00
redmatrix
3a8e1e0484
process_delivery: ignore self
2015-09-28 19:04:36 -07:00
redmatrix
3b53cd56ef
Merge branch 'deadsite'
2015-09-28 17:15:34 -07:00
redmatrix
30e88a4f6b
typo
2015-09-28 17:15:04 -07:00
redmatrix
e5f47cd14b
create site records for all queued sites and check for death
2015-09-28 17:13:11 -07:00
Mario Vavti
b97102da01
private mail: bring additional inbox/outbox views and ajaxify single message drop
2015-09-28 17:40:38 +02:00
redmatrix
dbeae16dc1
add site_type to queries, first few - several more to go.
2015-09-28 04:21:29 -07:00
redmatrix
ed876a9c52
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-27 18:03:40 -07:00
redmatrix
67fe8fc4a7
well there's one problem...
2015-09-27 18:00:37 -07:00
redmatrix
55b530f0fd
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
util/messages.po
2015-09-27 17:00:41 -07:00
redmatrix
aae51a9b23
add some safety checks on the sending side of sync
2015-09-27 16:47:25 -07:00
redmatrix
cd2b811555
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
2015-09-26 23:44:30 -07:00
redmatrix
9ab335626c
import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
2015-09-26 13:25:34 -07:00
redmatrix
8aec437c23
remove redundant code
2015-09-24 23:02:41 -07:00
redmatrix
98f656cfcb
delivery optimisations
2015-09-24 22:51:47 -07:00
redmatrix
2c665e5e4c
add Diaspora (actually any external service which uses the queue) to delivery reports
2015-09-24 17:41:05 -07:00
redmatrix
2fe3d16bbe
Merge https://github.com/redmatrix/hubzilla into pending_merge
2015-09-24 16:58:32 -07:00
redmatrix
2844f276b9
Document the additional content export options
2015-09-24 16:57:17 -07:00
Mario Vavti
b9723aa85b
some heavy private mail restructuring - work in progress
2015-09-24 14:07:44 +02:00
redmatrix
b553ffd55d
timezone tweaks
2015-09-23 20:59:19 -07:00
redmatrix
e45958b967
add plugin hooks to channel sync/import/export
2015-09-23 18:27:04 -07:00
redmatrix
7734bbfe4d
problems with extended item import and signatures
2015-09-22 22:30:09 -07:00
redmatrix
d35c5bcb2f
merge issue
2015-09-22 19:16:13 -07:00
redmatrix
c699d3a17a
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-22 19:14:21 -07:00
redmatrix
d16ac62a51
don't send sync packets to deleted hubloc locations
2015-09-22 19:13:10 -07:00
redmatrix
15feeb7bfe
inverted logic syncing deleted hublocs
2015-09-22 18:40:03 -07:00
redmatrix
02ecc93998
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-22 16:50:55 -07:00
redmatrix
34291d5938
add names to delivery report for sync delivery
2015-09-22 16:50:08 -07:00
redmatrix
e726adc27b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-22 16:45:14 -07:00
redmatrix
642f460dca
report the channel sync
2015-09-22 16:43:36 -07:00
redmatrix
1d7d9818fa
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/items.php
include/zot.php
2015-09-22 16:26:28 -07:00
redmatrix
c2dcc68803
backport item sync
2015-09-22 16:19:08 -07:00
redmatrix
7dd61c05dc
allow self delivery until we figure out why clone sync of posted items isn't doing it's thing
2015-09-22 04:39:36 -07:00
redmatrix
1c1155513a
add one more test
2015-09-22 04:28:05 -07:00
redmatrix
f84151e1fe
fix foreach warning
2015-09-22 04:24:54 -07:00
redmatrix
2869ccfe39
delivery reports - crude but mostly functional at least for zot deliveries
2015-09-22 04:04:51 -07:00
redmatrix
0b1b11ea53
heavy lifting for delivery reports
2015-09-22 02:32:04 -07:00
redmatrix
146ff6f703
more progress on delivery reports. Store the remote results from zot sites locally.
2015-09-21 22:30:28 -07:00
redmatrix
9baaa6fa56
issue #51
2015-09-21 20:05:54 -07:00
redmatrix
d2565d0f61
looks like chat has been neglected a bit recently
2015-09-20 21:37:18 -07:00
redmatrix
4fde0bf62e
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-20 20:58:55 -07:00
redmatrix
a679081993
new delivery report format
2015-09-20 20:21:54 -07:00
redmatrix
177292de13
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-20 18:10:25 -07:00
redmatrix
efcb4abfd0
improve on the last attempt
2015-09-20 18:08:06 -07:00
redmatrix
1501d1c570
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-20 18:03:41 -07:00
redmatrix
59a56ac77f
catch the timestamp also
2015-09-20 17:47:41 -07:00
redmatrix
35f09f4f74
remove system flags from channel import packet
2015-09-20 17:45:23 -07:00
redmatrix
b240c15014
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-20 16:55:24 -07:00
redmatrix
9de8df496a
we need the xchan record also
2015-09-20 16:52:21 -07:00
redmatrix
996cd7e2ab
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-20 00:28:22 -07:00
redmatrix
77df590f65
initial checkin delivery report class
2015-09-20 00:27:25 -07:00
redmatrix
ce064188c6
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-19 22:48:22 -07:00
redmatrix
5d6f59a598
clone new connections
2015-09-19 22:46:59 -07:00
redmatrix
f4a4cf1402
clone new connection requests
2015-09-19 15:36:07 -07:00
redmatrix
63146821d7
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-18 23:02:49 -07:00
redmatrix
9ed8eac8c6
include site identitfier on redmatrix delivery reports also
2015-09-18 23:02:03 -07:00
redmatrix
43251ed8ce
add reporting site to delivery report
2015-09-18 22:00:33 -07:00
redmatrix
fdd4c1b9d1
more work on surviving hub re-installs
2015-09-18 14:31:29 -07:00
redmatrix
f2fefb91d5
change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos.
2015-09-18 01:53:04 -07:00
redmatrix
cc95c3e9c8
start hooking in the new webfinger/zot merged discovery
2015-09-17 18:36:19 -07:00
redmatrix
f0a7a6a1e2
consolidate zotfinger and webfinger
2015-09-17 17:51:31 -07:00
redmatrix
c34d8286a3
change matrix to grid, begin webfinger optimisation
2015-09-16 21:27:58 -07:00
redmatrix
fae43010c5
nit
2015-09-14 21:35:41 -07:00
redmatrix
021c81cb62
don't deliver to dead hubs
2015-09-14 20:43:39 -07:00
redmatrix
97b990c9bf
site checking stuff
2015-09-14 19:16:25 -07:00
redmatrix
8fb4f37670
remove xchan_instance_url - it needs to be an abook field, not an xchan field
2015-09-14 16:05:58 -07:00
redmatrix
fd708b28b8
ping site function (taken from admin/hubloc)
2015-09-13 22:48:18 -07:00
redmatrix
df0fa9883c
check for empty word after trim
2015-09-12 14:37:55 -07:00
redmatrix
692e117c8a
Merge pull request #38 from MicMee/master
...
ensure that living sites are marked as alive
2015-09-12 08:25:27 +10:00
redmatrix
d96ca61f2b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-11 14:57:26 -07:00
redmatrix
fc58b8cc0d
log the remote message if there was one
2015-09-11 14:56:31 -07:00
redmatrix
45e1f93e56
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
util/messages.po
2015-09-11 14:33:07 -07:00
redmatrix
e062c4e6b5
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 14:30:07 -07:00
Michael Meer
755edd2110
ensure that living sites are marked as alive
2015-09-11 14:06:37 +02:00
redmatrix
4abfd4053a
sync likes
2015-09-10 19:18:12 -07:00
redmatrix
00b480527a
provide remote delivery report at logger_debug level
2015-09-10 17:53:06 -07:00
redmatrix
922d2165b3
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-10 16:51:22 -07:00
redmatrix
50e32c3d8a
zot_refresh: always try the hubloc pointed to by xchan_addr first
2015-09-10 16:48:08 -07:00
redmatrix
2d94a038a5
ensure connections have a name
2015-09-10 01:21:18 -07:00
redmatrix
db58b62235
don't auto-open the editor in forum mode. Save the forum selection text until we open it.
2015-09-09 19:54:16 -07:00
redmatrix
43e064749c
major changes to "forum mode" on the network/matrix page
2015-09-09 18:50:15 -07:00
redmatrix
4af339da63
slight hack to improve public forum detection in the forum widget
2015-09-09 18:18:27 -07:00
redmatrix
0a051ff2cd
preserve code blocks on item import if channel has code rights. When importing the channel itself,
...
turn code access off unless this is the admin.
2015-09-08 22:46:34 -07:00
redmatrix
d702133ded
move mod_admin to Comanche finally
2015-09-08 20:48:35 -07:00
redmatrix
f13a8f725c
export TERM_FILE when mirroring
2015-09-08 19:14:29 -07:00
redmatrix
e6690c818d
export TERM_FILE when mirroring
2015-09-08 19:13:43 -07:00
redmatrix
f0847e6f32
debugging menu sync
2015-09-08 18:40:56 -07:00
redmatrix
50d7554ccd
add sync packets for menus
2015-09-08 18:40:19 -07:00
redmatrix
b28d3015fe
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
2015-09-08 17:53:43 -07:00
redmatrix
75d521d42a
menu import and sync
2015-09-08 17:52:39 -07:00
redmatrix
1ebaacfd5e
menu export
2015-09-08 17:50:24 -07:00
redmatrix
c6bdf7e891
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-07 22:55:42 -07:00
redmatrix
11e19a06b7
export events
2015-09-07 22:54:43 -07:00
redmatrix
650e98b2a9
work on event sync
2015-09-07 21:01:49 -07:00
redmatrix
508969a183
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-07 20:29:13 -07:00
redmatrix
c39e3613a8
create event sync packets
2015-09-07 20:28:02 -07:00
redmatrix
4eec9a2fba
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
2015-09-07 18:20:47 -07:00
redmatrix
6d1b64065a
consolidate import_items/sync_items
2015-09-07 18:14:30 -07:00
Habeas Codice
6711ceb662
fix postgres zotfeed
2015-09-07 16:28:42 -07:00
redmatrix
2f52b6c164
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
util/messages.po
2015-09-07 04:06:27 -07:00
redmatrix
1b09c64856
PRIVACY: item_private seems to have been removed from permissions_sql checking with an observer.
2015-09-07 03:59:38 -07:00
redmatrix
55ab968edf
make js_upload work with hubzilla. It still needs a rewrite.
2015-09-05 17:35:00 -07:00
jeroenpraat
fc804751a2
Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla/include/items.php on line 3325
...
Please review if this is correct?
2015-09-04 12:39:47 +02:00
redmatrix
d79e81a069
import and sync chatrooms
2015-09-03 18:44:40 -07:00
redmatrix
f7d9523c7d
export chatrooms
2015-09-03 18:43:44 -07:00
redmatrix
d93e1c84ac
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
2015-09-03 17:28:51 -07:00
redmatrix
2a7ff3018b
channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked.
2015-09-03 17:21:20 -07:00
redmatrix
f3cb17ac3b
app sync
2015-09-02 23:09:51 -07:00
redmatrix
669e111118
add timestamps for syncing apps
2015-09-02 21:07:24 -07:00
redmatrix
837b9224cc
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
doc/credits.bb
mod/thing.php
2015-09-02 20:33:58 -07:00
redmatrix
c22da3da1c
start to modularise the clone import and sync functions
2015-09-02 20:12:40 -07:00
redmatrix
d9a67d64b1
Update the credits
2015-09-02 18:04:22 -07:00
redmatrix
2a26c898ca
protect from sql injection
2015-09-02 15:52:54 -07:00
redmatrix
69fc10d5ad
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-02 15:49:50 -07:00
zottel
441946b9d3
really fix post filtering
2015-09-02 15:49:07 +02:00
redmatrix
9328edfdcd
obscure mail subject in conversation structure
2015-09-01 22:59:06 -07:00
redmatrix
23213a91ed
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-01 22:27:00 -07:00
redmatrix
184c544a24
export apps
2015-09-01 22:26:21 -07:00
redmatrix
6cc60ba477
initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.
2015-09-01 22:03:10 -07:00
redmatrix
c5578d7964
match the redmatrix output format for objects (which is the hubzilla table format)
2015-09-01 21:08:02 -07:00
redmatrix
95cf1aafa0
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-01 21:04:57 -07:00
redmatrix
f72a3113f5
add the baseurl so we can easily relocate objects
2015-09-01 21:03:55 -07:00
redmatrix
3c29b46c42
use different obj export output format for hubzilla compatibility
2015-09-01 20:57:53 -07:00
redmatrix
515f3bf111
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
install/update.php
2015-09-01 17:08:59 -07:00
redmatrix
3852b5ce7f
separate objs/things from taxonomy
2015-09-01 17:06:58 -07:00
redmatrix
1447499776
don't log the mundane - especially at normal levels.
2015-08-31 22:41:48 -07:00
redmatrix
69dc1b03c3
typo in sql
2015-08-31 21:01:47 -07:00
redmatrix
d7089ab471
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
2015-08-31 21:00:28 -07:00
redmatrix
039f56f390
mostly doc tweaks, some import/export work
2015-08-31 20:58:05 -07:00
redmatrix
d7cf7316be
change the likes db structure to make it more easily importable/exportable
2015-08-31 20:55:25 -07:00
redmatrix
5fe9021375
rename 'register_account' hook to 'create_identity'.
2015-08-31 16:26:29 -07:00
redmatrix
c0cb21a07c
unclosed link tags
2015-08-30 23:01:39 -07:00
redmatrix
c865f17dc0
schedule a doco update once weekly
2015-08-30 22:46:00 -07:00
redmatrix
e23f86faa9
more work on doco search
2015-08-30 22:39:33 -07:00
redmatrix
a42b236587
more AccessList stuff - this time it's mod-item, which is a biggie
2015-08-28 14:21:49 -07:00
redmatrix
d05fd9632e
now we get to the heavy lifting with AccessList stuff
2015-08-27 23:04:17 -07:00
redmatrix
ca0bc2bb7b
more work on AccessList integration
2015-08-27 22:20:30 -07:00
redmatrix
3fbb955cf2
start conversion to AccessList object
2015-08-27 21:22:59 -07:00
redmatrix
04b4897dd8
First attempt to turn access control into an object class. The access control manipulation is getting too complex and this will help keep it manageable and reduce a lot of code duplication.
2015-08-27 18:55:30 -07:00
redmatrix
7b28c42693
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-08-26 23:00:59 -07:00
redmatrix
58ffa31e91
redphotos updates
2015-08-26 23:00:33 -07:00
redmatrix
0b5bad4aa7
use extended export format for items in api photo_detail
2015-08-26 22:58:53 -07:00
redmatrix
2bce61d18b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-08-26 22:14:19 -07:00
redmatrix
9cebd24987
change attach_store to allow a predefined item to accompany a photo
2015-08-26 22:13:20 -07:00
redmatrix
0d2c90cc2e
add item info to photo detail in api
2015-08-26 22:11:50 -07:00
redmatrix
54c88dfae9
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/diaspora.php
2015-08-26 20:22:50 -07:00
redmatrix
d1c23477df
support likes on comments with diaspora owner by sending as activity
2015-08-26 20:20:41 -07:00
redmatrix
8fb1356623
required for future work
2015-08-26 17:49:57 -07:00
redmatrix
5fa2aa6d48
lots of stuff that was needed for successful photo import from red
2015-08-24 20:58:12 -07:00
redmatrix
0edac8810b
don't try to optimise the session table. Just let it fragment and let the DB worry about it.
2015-08-24 16:05:51 -07:00
redmatrix
d256e8e9f2
edited event showing bad signature and null_date for edit timestamp
2015-08-24 01:46:54 -07:00
redmatrix
250d286f1d
remove orphan mod_connections editing code (now done in mod/connedit)
2015-08-24 01:28:13 -07:00
redmatrix
eac9c8a7e6
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
install/update.php
util/messages.po
2015-08-23 20:23:55 -07:00
redmatrix
a67213627c
provide a comment_policy of "network: diaspora" to handle their special case public-posts-are-commentable-by-anybody permission without breaking any other permissions.
2015-08-23 18:48:33 -07:00
redmatrix
b1f091e4d7
issues with abook sync between hubzilla and red
2015-08-23 17:40:47 -07:00
redmatrix
8cd583fd8c
sync abook flags in memory after altering them
2015-08-23 17:36:00 -07:00
redmatrix
bf190be5b4
issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync
2015-08-23 13:27:34 -07:00
redmatrix
7688bf3f21
support ical priority
2015-08-20 22:24:33 -07:00
redmatrix
49c4aa1a54
cleanup of task widget - make jquery workflow a bit smoother
2015-08-20 20:40:42 -07:00
redmatrix
afbbc9cd72
more work on tasks
2015-08-20 18:43:01 -07:00
redmatrix
a322254f2a
do ical export before checking logged in channel
2015-08-20 04:51:03 -07:00
redmatrix
fd7b668a16
add carriage return to newlines for exported events (rfc2445:4.1)
2015-08-20 02:07:51 -07:00
redmatrix
5786fd2221
extra encoding on mail titles
2015-08-20 01:12:35 -07:00
redmatrix
419b4ecfde
use consistent terminology
2015-08-19 21:17:24 -07:00
redmatrix
69920fb717
fix photo location
2015-08-19 19:17:17 -07:00
redmatrix
8d66fbccfa
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/api.php
2015-08-19 16:54:12 -07:00
redmatrix
a4caaefd32
event integration improvements
2015-08-19 16:50:32 -07:00
redmatrix
c96f121d41
add photo_detail api call
2015-08-18 22:14:16 -07:00
redmatrix
4e3d295c90
import and export tasks (calendar todo items)
2015-08-18 19:06:50 -07:00
redmatrix
9763c46b7e
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/identity.php
2015-08-17 22:23:23 -07:00
redmatrix
f682325924
provide ability to export by month as well as by year
2015-08-17 22:20:10 -07:00
redmatrix
ea331b043c
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-08-17 21:41:14 -07:00
redmatrix
1a4a921528
provide module for importing yearly content dumps
2015-08-17 21:40:40 -07:00
redmatrix
1982fc807f
add item_id to yearly dump files
2015-08-17 21:38:43 -07:00
redmatrix
18bc12c21c
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
util/messages.po
2015-08-14 22:24:15 -07:00
Alexandre Hannud Abdo
73b30de9cb
Properly fix which perms get checked for comments, Mike's solution
2015-08-14 12:21:05 -03:00
redmatrix
d140620008
add item validation function
2015-08-13 19:35:57 -07:00
redmatrix
50a1e0c618
attach_store needs a lot of documenting to understand what's going on and how it got to be this way. Here's the bird's eye view.
2015-08-13 17:11:59 -07:00
redmatrix
ef73880459
reverting 36b5f6ac
2015-08-12 22:48:08 -07:00
redmatrix
0b7365e2db
revert 36b5f6ac
2015-08-12 22:37:24 -07:00
redmatrix
2d9d4dfeb3
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
doc/history.md
mod/import.php
2015-08-11 22:35:36 -07:00
redmatrix
0e8991fec2
more consistent output on forum widget
2015-08-11 22:23:20 -07:00
redmatrix
b651604e8b
remove the forum limit
2015-08-11 20:58:03 -07:00
redmatrix
1932e72603
arghh
2015-08-11 20:25:52 -07:00
redmatrix
be4eb4eeb8
typo
2015-08-11 20:25:02 -07:00
redmatrix
89fa36ce2a
wrong cid
2015-08-11 20:24:06 -07:00
redmatrix
80df97e734
don't show '0' results, like notifications
2015-08-11 20:18:34 -07:00
redmatrix
8dd7fab38d
order by name
2015-08-11 20:16:17 -07:00
redmatrix
400d5790f3
make sure we only get forums attached to the channel
2015-08-11 19:58:31 -07:00
redmatrix
c8e83d6edc
set font-weight back to normal on forums widget
2015-08-11 19:27:22 -07:00
redmatrix
c8b8c6cb14
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/items.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
2015-08-11 19:24:31 -07:00
redmatrix
44dcbeaaa4
forum widget
2015-08-11 19:22:14 -07:00
redmatrix
0c23843b61
untested forum widget
2015-08-11 17:39:29 -07:00
Alexandre Hannud Abdo
36b5f6acfe
Require comment perms only for own posts, allow senders to deliver comments using stream perms.
2015-08-10 18:20:18 -03:00
redmatrix
58c9f516b3
private mail isues
2015-08-09 01:18:36 -07:00
redmatrix
8ce4814835
convert diaspora_signature to json for storage
2015-08-08 15:19:50 -07:00
redmatrix
2656aeaf9c
ensure diaspora_signature is converted to json before we store it.
2015-08-08 15:18:34 -07:00
redmatrix
7e43da43a1
more file permissions inheritance work
2015-08-06 17:42:53 -07:00
redmatrix
91bbfcf554
photo permission inheritance. We want to use the folder permissions unless specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.
2015-08-06 17:09:09 -07:00
redmatrix
880dec5a4e
don't throw errors or do the wrong thing if photos have no album (placed on your dav rootdir)
2015-08-05 22:07:51 -07:00
redmatrix
dfb8a1b2d4
photo album is decided in dav or attach modules now - don't set it in photos_upload
2015-08-05 21:42:00 -07:00
redmatrix
cb8f0a0e0f
uploaded photo from dav (file put, not dav create) not showing in photo album
2015-08-05 20:54:32 -07:00
redmatrix
03a833f2f8
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-08-05 16:13:42 -07:00
redmatrix
6413ba3230
connection filter fixes
2015-08-05 16:12:05 -07:00
redmatrix
ea63f3312f
personal oembed black/white list
2015-08-04 20:07:55 -07:00
redmatrix
5344431fc0
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-08-04 16:02:12 -07:00
redmatrix
a61fc00fa4
unobscure item before applying connection filter
2015-08-04 15:59:18 -07:00
redmatrix
f594a7776c
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/it/messages.po
view/it/strings.php
2015-08-03 21:17:00 -07:00
redmatrix
6826b4ad32
these were some really difficult bugs to find
2015-08-03 21:13:17 -07:00
redmatrix
b737e224b1
more work separating Diaspora from core
2015-08-03 16:52:51 -07:00
redmatrix
db70c76494
diaspora_meta getting double json encoded
2015-08-02 23:05:15 -07:00
redmatrix
9f5dfe797b
begin moving diaspora to plugin
2015-08-02 17:38:34 -07:00
redmatrix
c1a953f960
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-07-31 15:45:13 -07:00
redmatrix
6f9771768d
event parse cleanup
2015-07-30 22:49:43 -07:00
redmatrix
acc9a8e43b
escape $ in events
2015-07-30 22:29:10 -07:00
redmatrix
1d218784d1
undefined function
2015-07-30 20:37:32 -07:00
redmatrix
f45cb8cf1f
minor - add all the newly supported table columns
2015-07-30 20:04:02 -07:00
redmatrix
4035c6f161
incorrect photo permissions when uploaded via /cloud; issue #21
2015-07-30 19:50:06 -07:00
redmatrix
fd947c205b
make /cloud work again after all the shuffling this morning
2015-07-30 18:34:30 -07:00
redmatrix
d5a40cac25
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
several dav fixes
Conflicts:
include/items.php
2015-07-30 17:11:16 -07:00
redmatrix
1097cd2583
minor cleanup
2015-07-29 19:01:25 -07:00
redmatrix
b1ceb33ae0
Merge branch 'vobject'
...
Conflicts:
include/event.php
2015-07-29 18:59:28 -07:00
redmatrix
00fa2e2fe8
convert ics import to sabre/vobject
2015-07-29 18:57:52 -07:00
redmatrix
df41ce9536
incorrect function name
2015-07-29 17:04:50 -07:00
redmatrix
845024e1e7
add connection filter to non-zot posts
2015-07-29 17:04:17 -07:00
redmatrix
e3f605e242
PRIVACY: imported events
2015-07-29 16:30:00 -07:00
redmatrix
4c83e9b6b4
initial work on using sabre as a vcalendar parser
2015-07-28 21:55:28 -07:00
redmatrix
03756c65fc
make superblock block a channel if it's an owner as well as the current author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
2015-07-28 17:55:21 -07:00
redmatrix
3269d4632f
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-07-27 18:01:20 -07:00
redmatrix
0b232a610c
logic issue in connection filter
2015-07-27 13:48:41 -07:00
redmatrix
85f546e691
crude but more or less functional event import from thunderbird ics files
2015-07-26 22:44:49 -07:00
redmatrix
9e6aea7382
backend code for importing events from "simple" ics calendar files.
2015-07-26 21:39:46 -07:00
redmatrix
cc5b0cde1d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/diaspora.php
2015-07-23 21:07:35 -07:00
redmatrix
bd131433b6
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-07-23 18:50:08 -07:00
redmatrix
27fa908233
patch to allow theme based widgets
2015-07-23 18:49:37 -07:00
redmatrix
c0e67db070
refresh diaspora xchan every month or so since receiving profile update messages from that network reliably are just as unlikely as receiving any other kind of message from that network reliably. The problem is that if somebody changes their profile name or photo once every few years and you miss it because of their shitty unreliable communications, your data could be stale for a long time.
2015-07-22 19:02:45 -07:00
zottel
5c52120fb4
make content filter by language work for excludes
2015-07-22 09:34:32 +02:00
redmatrix
c90f14c066
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
doc/to_do_code.bb
2015-07-21 17:13:48 -07:00
redmatrix
3ec6a431b6
ics calendar export - commas need to be escaped
2015-07-21 17:07:16 -07:00
redmatrix
5146e6e76b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-07-20 19:35:00 -07:00
redmatrix
d87c7ceeb0
there is no stricmp() in php, use strcasecmp() - also only detect language if we plan to use it.
2015-07-20 19:33:42 -07:00
Mario Vavti
4d45bc9da1
Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.
2015-07-20 21:01:11 +02:00
redmatrix
6645846ad3
allow per-connection content filter to specify a detected language to include/exclude (in addition to text, tags, and regexes)
2015-07-20 02:04:51 -07:00
redmatrix
24ec104819
silence warning about non array diaspora_meta but report it in the logs so we can find out what it actually is and why.
2015-07-19 21:18:13 -07:00
redmatrix
15b6e8faa4
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/identity.php
include/widgets.php
util/messages.po
view/it/messages.po
view/it/strings.php
2015-07-19 21:08:34 -07:00
redmatrix
fd8e6f3130
typo
2015-07-19 21:04:02 -07:00
redmatrix
ec00c5b18a
the view_photos and post_photos permissions are redundant and are now mapped to view_storage and write_storage
2015-07-19 17:53:52 -07:00
redmatrix
ed3d9d1f80
some photo/attach permissions issues
2015-07-18 16:39:12 -07:00
redmatrix
fd16de335c
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-07-16 20:21:20 -07:00
redmatrix
3c60a0c22c
provide any single year of exported items
2015-07-16 20:20:42 -07:00
redmatrix
ec249d465b
provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import)
2015-07-16 20:19:20 -07:00
redmatrix
4299ae65a4
abook clone sync - change logic to also unset existing cross-project flags besides just setting them
2015-07-16 18:07:23 -07:00
redmatrix
c3dbacfb88
don't including rating stuff from cloned abooks
2015-07-16 17:53:59 -07:00
Mario Vavti
39a09eb525
fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos
2015-07-16 22:04:52 +02:00
zottel
2bd05971ab
fix observer tags for now (issue #17 )
2015-07-16 08:28:37 +02:00
redmatrix
498e2f7279
since we've got a fresh start without a lot of legacy sites to support, provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided.
2015-07-15 22:59:55 -07:00
redmatrix
070397ef14
make tagadelic results (including categories in wall-to-wall posts) visible to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree.
2015-07-15 21:43:42 -07:00
redmatrix
964e461e09
allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system.
2015-07-15 21:01:18 -07:00
redmatrix
b9fd8b4614
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-15 18:41:50 -07:00
redmatrix
7db515b77c
fix for empty recip array resulting from a mangled xchan
2015-07-15 18:31:37 -07:00
redmatrix
7f6e4d5f4a
more clone sync issues across projects
2015-07-15 18:21:04 -07:00
redmatrix
95cf1668de
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-15 18:15:25 -07:00
redmatrix
59b67d52e6
clone sync fixes across red/hz
2015-07-15 18:14:19 -07:00
redmatrix
10406c6d15
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-14 17:17:45 -07:00
redmatrix
46aacfe64d
stream_perms_xchans() set to empty quoted string when no results rather than return an empty string
2015-07-14 17:15:53 -07:00
redmatrix
e8f19c1e15
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/connedit.php
2015-07-14 17:10:13 -07:00
redmatrix
3687fef53c
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-07-14 16:55:58 -07:00
redmatrix
a5989b0f31
coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
2015-07-14 16:54:16 -07:00
Mario Vavti
7f71297383
cleanup connedit
2015-07-14 12:46:40 +02:00
redmatrix
800eec5bee
merge from redmatrix
2015-07-13 17:48:11 -07:00
redmatrix
6916c1076c
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-13 17:43:10 -07:00
zottel
a07be48017
change account_default_channel if default channel is removed
2015-07-13 17:30:04 +02:00
redmatrix
b7d3eb1605
Only let local logins install webpage elements
2015-07-11 16:36:58 -07:00
redmatrix
a497d8ee66
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/editpost.php
util/messages.po
view/nl/messages.po
view/nl/strings.php
2015-07-10 14:27:41 -07:00
Mario Vavti
efa55437d4
increase width of the aside area and make default profile image size 300x300
2015-07-09 13:59:16 +02:00
redmatrix
43354ab385
inconsistent naming of block item types
2015-07-08 18:05:38 -07:00
Mario Vavti
e12d58a75c
fix typo to make directory safe mode default to on work again
2015-07-08 21:28:36 +02:00
redmatrix
6b41074396
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-07 16:50:25 -07:00
redmatrix
dad4ac6c89
incorrect value for hubloc_deleted in zot_get_hublocs() query
2015-07-07 16:06:34 -07:00
Mario Vavti
f6cf992aee
fix sorting of channel suggestions
2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af
rename function get_directory_settings => get_directory_setting and move sort options to directory title bar
2015-07-07 22:29:27 +02:00
Mario Vavti
9c577e0422
make public forums only setting sticky and simplify function to get directory settings
2015-07-07 21:41:37 +02:00
Mario Vavti
cc7eaa0d05
code style correction
2015-07-07 14:52:06 +02:00
Mario Vavti
b50151d7bf
make directory suggest work with directory options
2015-07-07 14:46:47 +02:00
redmatrix
f20933e1e0
more work on db storage of doco
2015-07-05 19:52:41 -07:00
redmatrix
a74631b554
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
boot.php
include/items.php
util/messages.po
2015-07-03 15:03:56 -07:00
redmatrix
37c78bcf05
start doco cleanup
2015-07-03 14:56:48 -07:00
redmatrix
0b9332fde9
in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly.
2015-07-03 14:30:42 -07:00
redmatrix
90a31f4ad5
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix
1a5898bf80
sync abook entries from redmatrix
...
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
2015-07-02 21:58:28 -07:00
redmatrix
065a50c920
a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix
2015-07-02 21:55:36 -07:00
redmatrix
8b2b92fe32
provide compatibility with redmatrix extended item export
2015-07-01 18:50:37 -07:00
redmatrix
3f38e52caf
provide backward compatibility with hubzilla extended item export
2015-07-01 18:49:34 -07:00
redmatrix
86b12ea750
lots of work on clone/import from redmatrix to hubzilla (won't go back the other way)
2015-06-30 20:18:48 -07:00
redmatrix
97e8275dc2
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14
turn the connection filter into a feature.
2015-06-29 20:35:56 -07:00
redmatrix
a7135b5ecd
fix the postgres schema with all the changes to date
2015-06-29 19:58:44 -07:00
redmatrix
6e8ad5089e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-06-29 18:01:51 -07:00
redmatrix
0b012e2995
some prep work
2015-06-29 16:56:18 -07:00
redmatrix
63f2e9b412
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
de13497333
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-28 21:16:56 -07:00
redmatrix
8d84472b4c
bring single instance file storage to dav and cloud uploaded photos
2015-06-27 16:36:30 -07:00
redmatrix
a3d7e8456a
undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more.
2015-06-25 20:07:10 -07:00
redmatrix
70975dda4a
remove all QR-code stuff from core - now in qrator addon
2015-06-25 19:05:49 -07:00
redmatrix
b06b6f798f
localise event calendar
2015-06-25 18:23:48 -07:00
redmatrix
86588bdd6c
more work on photos, including os_storage for the size '0' photo and numbering duplicate filenames
2015-06-23 22:46:39 -07:00
redmatrix
1a0655f34e
more work on mail flags
2015-06-23 21:01:59 -07:00
redmatrix
cb76fb8b9b
item flag fixes discovered after a few merges
2015-06-23 19:45:39 -07:00
redmatrix
833098e346
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
mod/item.php
2015-06-23 17:30:35 -07:00
redmatrix
9879cf3c6c
ensure we always sign a trimmed item body.
2015-06-22 16:09:02 -07:00
redmatrix
0d8fcbe48d
discovered a couple of loose ends in the per-member enable diaspora setting
2015-06-22 15:03:47 -07:00
redmatrix
ae6612025d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
util/messages.po
2015-06-21 20:51:07 -07:00
redmatrix
68534fd5dc
some diaspora import issues uncovered during dry-run tests
2015-06-21 17:30:23 -07:00
redmatrix
e1caf77480
Merge pull request #352 from solstag/store_update_fix
...
Make item_store_update only affect the data we requested
2015-06-21 10:07:58 +10:00
redmatrix
9dfb8a3401
ensure the photo driver is included
2015-06-20 16:24:10 -07:00
redmatrix
dd950baa82
import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction
2015-06-20 16:21:25 -07:00
Alexandre Hannud Abdo
ec23a94b6d
Make item_store_update only affect the data we requested
2015-06-20 02:21:25 -03:00
redmatrix
ddbaabd62d
wrong logic
2015-06-19 18:08:10 -07:00
redmatrix
94e7a425e6
import_diaspora - a few more atypical settings
2015-06-19 18:06:55 -07:00
redmatrix
e85d2c4b90
import_diaspora: add all the friends
2015-06-19 17:07:31 -07:00
redmatrix
0a9d3b4025
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-19 16:44:16 -07:00
redmatrix
6bd90816dd
very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.
2015-06-19 16:39:03 -07:00
Mario Vavti
de84f48e2f
bring some more generic-content-wrappers and fix some of them
2015-06-19 12:44:11 +02:00
redmatrix
33c9d8e06b
all file attachments are now stored natively, still have photos-0 to store natively
2015-06-18 22:12:26 -07:00
redmatrix
6aa159e2ac
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-18 19:15:01 -07:00
redmatrix
7e59580812
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-06-18 16:36:47 -07:00
redmatrix
1a9c059062
issues with markdownify and escaped HTML
2015-06-18 16:35:40 -07:00
redmatrix
2963be60e5
more photos work
2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5
lots of work on merging photo and file albums/folders
2015-06-17 17:44:31 -07:00
redmatrix
c6c17182e5
attach_mkdirp - implement force option to return success if dir exists
2015-06-17 01:18:55 -07:00
redmatrix
4ecee713d5
recursive mkdir (ala mkdir -p) for file and photo storage
2015-06-16 22:58:26 -07:00
redmatrix
39309ad45c
start work on photo directories
2015-06-16 19:05:09 -07:00
redmatrix
65661b7ec3
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/photos.php
mod/siteinfo.php
2015-06-16 18:43:03 -07:00
redmatrix
d84b3cfc3c
remove file/attachments when their associated photos are removed
2015-06-16 17:50:15 -07:00
Mario Vavti
40ee0d41dc
fix deleting of album for remote channel
2015-06-16 12:54:29 +02:00
redmatrix
bc72d3fd26
move profile photos to new methods
2015-06-15 23:37:51 -07:00
redmatrix
bdedda7c6b
fix attachment permissions when they also contain an image.
2015-06-15 20:43:49 -07:00
redmatrix
2adc7a51ad
photo upload: pass in the contact_allow and resource_id via include/attach.php
2015-06-15 19:52:17 -07:00
redmatrix
859a2ac8ef
DB changes for some channel flags
2015-06-15 17:28:52 -07:00
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
redmatrix
f0b255b1a9
more file/photo merge work
2015-06-14 17:28:51 -07:00
redmatrix
9642728e7d
first cut at merging files and photos, not yet well integrated but they are integrated
2015-06-14 16:50:24 -07:00
redmatrix
b7be79c5e7
isolate the os_storage flag
2015-06-13 15:57:28 -07:00
redmatrix
3f0009ccd7
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
util/messages.po
2015-06-13 15:02:51 -07:00
redmatrix
e838647e3a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-11 22:48:01 -07:00
redmatrix
6562820175
make cloud work again
2015-06-11 22:47:45 -07:00
redmatrix
485b19958e
don't provide a connect button on the sys channel profile sidebar
2015-06-11 22:46:37 -07:00
redmatrix
41085ae03f
start on the DAV/photos merger
2015-06-11 22:32:08 -07:00
redmatrix
5733491ac8
more work on items
...
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
2015-06-11 17:56:56 -07:00
redmatrix
8812f183a2
the hubzilla version of this function
2015-06-11 16:11:59 -07:00
redmatrix
dc7de12991
hubzilla compatibility function
2015-06-11 15:52:37 -07:00
redmatrix
b2c5020af7
diaspora disallowed by default
2015-06-10 18:51:39 -07:00
redmatrix
ca870dbf31
more work on item table optimisation
2015-06-10 16:59:04 -07:00
redmatrix
2128d5a256
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-10 15:47:23 -07:00
redmatrix
29d9d38d7f
retire old Friendica RINO encryption functions
2015-06-09 22:24:24 -07:00
redmatrix
eb6a1f8387
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-09 19:39:21 -07:00
redmatrix
d08c43d80c
toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.
2015-06-09 18:50:11 -07:00
redmatrix
03357481f7
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
2015-06-09 16:52:00 -07:00
redmatrix
39f0e6fe62
add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public".
2015-06-08 16:55:17 -07:00
redmatrix
7cbc504874
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-02 17:47:47 -07:00
redmatrix
b2fde73952
asjld work
2015-06-02 17:46:22 -07:00
redmatrix
c1e139a550
error in directory bbcode image filter
2015-05-31 22:22:37 -07:00
redmatrix
84c085dcd7
bare bones ASLD
2015-05-31 22:16:14 -07:00
redmatrix
f3b95f591a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-31 19:26:00 -07:00
redmatrix
5cc5e0fafd
some basic background work for activitystreams-json-ld-2.0 conversions
2015-05-31 18:35:35 -07:00
redmatrix
cd3284d081
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-30 15:04:11 -07:00
redmatrix
edd228decb
strip images from directory text entries
2015-05-30 15:03:44 -07:00
Mario Vavti
5040506184
should not redefine $var in the function call
2015-05-29 17:59:31 +02:00
Mario Vavti
2514af6524
fix menu render for menu item edit - menu preview
2015-05-29 17:51:50 +02:00
Mario Vavti
b8d3280763
some fixes to make menu sharing work and expose it in the ui.
2015-05-29 13:08:01 +02:00
redmatrix
3a9139f76e
there was a reason we included that file
2015-05-28 22:06:22 -07:00
redmatrix
9ff988e3d7
parse error
2015-05-28 21:27:48 -07:00
redmatrix
07203c1de3
another case of committing with unsaved changes in a second window
2015-05-28 20:54:57 -07:00
redmatrix
8fe3daab21
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
2015-05-28 19:06:31 -07:00
redmatrix
0f09a4499b
add menu_created, menu_edited fields to DB
2015-05-28 16:59:56 -07:00
redmatrix
12c17f1265
menu encoding for sharing/exchange
2015-05-27 21:09:21 -07:00
redmatrix
b381ec5734
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/impel.php
2015-05-27 19:27:38 -07:00
redmatrix
11301d51a5
some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
2015-05-27 17:30:36 -07:00
redmatrix
5a889558aa
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-27 16:02:16 -07:00
redmatrix
3ecc9efd8d
fix for forked thread on diaspora
2015-05-27 16:01:51 -07:00
Mario Vavti
33a7f76ebc
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-27 15:26:12 +02:00
Mario Vavti
3d79d4f577
define some custom attributes and html5 elements for htmlpurifier
2015-05-27 15:25:45 +02:00
Mario Vavti
5ccc9e1b8d
make it possible to include menus in blocks - this will only work in html blocks of course
2015-05-27 15:21:30 +02:00
redmatrix
3fdf1ac458
revert for now
2015-05-27 01:49:47 -07:00
redmatrix
07e8fe1b1c
Comments need to have some kind of routing instructions.
2015-05-26 21:00:27 -07:00
jeroenpraat
ae69bf54a6
Update api.php
...
one comma to much
2015-05-26 22:20:45 +02:00
redmatrix
06eae98e53
placeholder for dynamic rego
2015-05-25 22:50:36 -07:00
redmatrix
9e6e41c6cb
slow but forward progress on dynamic client registration
2015-05-25 21:31:23 -07:00
redmatrix
9a0264f5d2
some work on issue #329
2015-05-25 19:17:35 -07:00
redmatrix
851f2f64df
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
index.php
mod/setup.php
2015-05-24 15:50:05 -07:00
Habeas Codice
1354616787
one more
2015-05-24 09:30:31 -07:00
Habeas Codice
b15a68f05d
avoid db compatibility issues
2015-05-24 09:26:12 -07:00
Mario Vavti
57d520e69f
logic has changed - this is not needed anymore
2015-05-24 15:09:30 +02:00
Mario Vavti
125cd5e32b
should not call prepare text here anymore
2015-05-24 14:57:01 +02:00
Klaus
1ce3d01bb8
Merge pull request #332 from solstag/zotfeedcleanup
...
Import security only when necessary, use correct variable in log
2015-05-24 03:12:25 +02:00
redmatrix
7f9e4d6add
federation problem from diaspora comments relayed through red channels due to typo
2015-05-23 15:24:16 -07:00
redmatrix
11861949bb
add channel_id to local_dir_update hook
2015-05-23 15:19:50 -07:00
redmatrix
45259fed14
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-23 15:10:18 -07:00
redmatrix
ee14657863
add local_dir_update hook
2015-05-23 15:07:24 -07:00
Mario Vavti
f575ef551d
use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation
2015-05-23 22:19:02 +02:00
Alexandre Hannud Abdo
760f17b173
Import security only when necessary, use correct variable in log
...
Just some cleanup, seemed like the intent of previous changes was so
2015-05-22 10:27:17 -03:00
redmatrix
5795e2a58b
more migration of page types
2015-05-21 22:17:17 -07:00
redmatrix
3763f74a10
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
2015-05-20 20:49:06 -07:00
redmatrix
c10a4ca9c7
re-arrange the html cache a bit
2015-05-20 20:28:16 -07:00
redmatrix
62df06b3d6
cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken.
2015-05-20 20:20:35 -07:00
redmatrix
0826c5fd96
don't allow item_id to update without a valid post id
2015-05-20 19:18:32 -07:00
redmatrix
c55d13a836
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-20 18:48:05 -07:00
redmatrix
6466774b6e
PRIVACY: possible privacy leakage under a defined set of circumstances
2015-05-20 18:46:23 -07:00
Mario Vavti
578d21120a
make design elements translateable
2015-05-20 08:34:40 +02:00
redmatrix
e68a00d381
more db structure
2015-05-19 22:43:24 -07:00
redmatrix
507dfb9f85
add rot47 to the mix. This shouldn't affect the speed to any measurable degree.
2015-05-19 21:51:48 -07:00
redmatrix
c78869e437
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-05-19 17:36:11 -07:00
Mario Vavti
3471e98989
remove dbg code
2015-05-19 21:09:35 +02:00
Mario Vavti
5641d81f03
be verbose about what type of element (block, layout, webpage) is beeing installed
2015-05-19 21:07:43 +02:00
redmatrix
77e2ef45f0
mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements.
2015-05-19 02:16:12 -07:00
redmatrix
c11b1f8b0d
vsprintf error
2015-05-18 22:07:38 -07:00
redmatrix
e521da05da
consensus items not working correctly and make the collections widget abide by the corresponding feature setting. This needs to be backported as it is borken in redmatrix. Also provide the ability to change the number of most recent expanded comments to conversations on a site-wide basis, increase it to 3 by default. We may also want this as a personal setting.
2015-05-18 21:32:55 -07:00
redmatrix
da7abbb089
bring the new photo schema into play
2015-05-18 19:43:53 -07:00
redmatrix
4c319a98a8
fix some merge errors
2015-05-18 17:20:59 -07:00
redmatrix
2dd0e7f6bd
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
view/nl/messages.po
view/nl/strings.php
2015-05-18 15:58:13 -07:00
Mario Vavti
9b1e540880
if block title contains $content but $content title is empty do not show an empty <h3> tag
2015-05-18 22:29:13 +02:00
Mario Vavti
9b64301e0c
remove dbg code
2015-05-18 22:19:08 +02:00
Mario Vavti
4e3583ab45
allow block title to contain $content title
2015-05-18 22:18:01 +02:00
redmatrix
7c7a5cba8f
Merge branch 'master' into tres
2015-05-17 19:49:36 -07:00
redmatrix
76558df966
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/bb2diaspora.php
include/diaspora.php
include/enotify.php
mod/admin.php
mod/cloud.php
mod/dav.php
mod/home.php
mod/invite.php
mod/like.php
mod/mitem.php
mod/p.php
mod/pubsites.php
mod/setup.php
mod/siteinfo.php
util/messages.po
2015-05-17 19:48:57 -07:00
redmatrix
ac3b886cc4
missing $
2015-05-17 19:00:17 -07:00
redmatrix
f985c08d12
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-17 18:19:49 -07:00
redmatrix
3b859aa9ef
Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied.
2015-05-17 18:14:50 -07:00
redmatrix
7233967ad5
Merge pull request #322 from dawnbreak/master
...
Add functions to parse and get some values from php.ini.
2015-05-18 09:41:53 +10:00
redmatrix
1cca24dfdc
Merge pull request #323 from dawnbreak/docu
...
Add some more documentation to attach_store()
2015-05-18 09:41:32 +10:00
redmatrix
a7071b17c0
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-17 16:35:17 -07:00
redmatrix
91d7b0f7eb
more work isolating the projectname from core.
2015-05-17 16:28:16 -07:00
Klaus Weidenbach
6757e86e85
Add some more documentation to attach_store()
2015-05-17 01:24:47 +02:00
Klaus Weidenbach
e2980e871f
Add functions to parse and get some values from php.ini.
...
Get upload limits from php.ini. These functions will be used for checking
against upload limits and to give information in the frontend.
Wasn't sure in which file to put these functions, so I created a new
one include/environment.php.
2015-05-16 11:25:32 +02:00
Mario Vavti
70fa00c014
allow a block to contain $content
2015-05-15 22:20:45 +02:00
redmatrix
a6cb90c81c
Merge branch 'master' into tres
...
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
2015-05-14 18:02:29 -07:00
redmatrix
475dc7b686
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
boot.php
include/api.php
include/enotify.php
2015-05-13 17:07:12 -07:00
redmatrix
d6f98e6511
product was a bad string to use because we may require it for e-commerce, and RED_PLATFORM is equally problematic for other reasons.
2015-05-13 16:01:00 -07:00
redmatrix
018e702281
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/mitem.php
view/nl/strings.php
2015-05-12 19:00:54 -07:00
redmatrix
1e0e812440
provide a method for loading site/custom widgets
2015-05-12 18:11:54 -07:00
redmatrix
1970670596
replace project name with $product or $Product in strings to avoid merge issues across different project names. Currently a place-holder. The strings themselves have not yet been modified.
2015-05-12 17:06:47 -07:00
redmatrix
f2a0dac653
fix a couple of miscellaneous errors which showed up in the logs
2015-05-11 22:57:12 -07:00
redmatrix
0a644a2f41
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/mitem.php
view/de/messages.po
view/de/strings.php
2015-05-10 13:26:44 -07:00
redmatrix
2cb8b19972
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-10 13:18:04 -07:00
redmatrix
3140650b8f
rev update
2015-05-10 13:17:41 -07:00
Mario Vavti
70e5bf04e1
uid > channel id to make submenus visible for observers
2015-05-10 21:52:48 +02:00
Mario Vavti
616338c17e
provide ability to create submenus
2015-05-10 15:00:18 +02:00
redmatrix
37a63365f1
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-07 16:44:28 -07:00
Mario Vavti
cd8ecb8649
provide wrap variable for comanche menus
2015-05-07 23:02:14 +02:00
Mario Vavti
4f235de3c5
provide a possibility to include js/css libs
2015-05-07 13:26:14 +02:00
Mario Vavti
8ca10dcbab
adjust icon size
2015-05-07 10:35:22 +02:00
redmatrix
90591bcbc9
missed one...
2015-05-06 22:56:08 -07:00
redmatrix
d01206af5a
forgot to save
2015-05-06 21:43:52 -07:00
redmatrix
e85593e970
Hopefully this will make item_cache the default
2015-05-06 21:43:15 -07:00
redmatrix
25b599a4bd
convert ITEM_WALL from bitfield to standalone
2015-05-06 21:03:33 -07:00
redmatrix
75b8bfc07a
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-05-06 18:39:12 -07:00
redmatrix
f17c1f9694
no need to obscure the diaspora signature if we're not obscuring the posts
2015-05-06 18:38:30 -07:00
Mario Vavti
9391f6f905
allow blocks to have custom classes and add a new template called zen which gives you an empty page to work with
2015-05-06 10:53:26 +02:00
redmatrix
245080a6d7
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-05-05 19:24:35 -07:00
redmatrix
f559c91b7a
turn consensus items into diaspora polls for that network
2015-05-05 19:23:21 -07:00
redmatrix
c9ec4f46b6
for hubzilla we won't be obscuring items, only private mail, this will allow us to search and cache private posts
2015-05-05 18:36:05 -07:00
redmatrix
5b5f0666f9
second pass name change
2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07:00
Mario Vavti
ad7a629b96
remove obsolete linebreak
2015-05-04 15:04:21 +02:00
friendica
b467dc4f00
Merge branch 'master' into tres
2015-05-01 13:19:19 -07:00
friendica
e4fe068ed5
more performance work
2015-04-30 18:16:54 -07:00
friendica
9fc87d43c9
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-30 17:53:47 -07:00
friendica
097002910e
just a test, please do not try to implement this as there are severe security issues
2015-04-30 17:52:34 -07:00
friendica
c4221f3273
Merge branch 'master' into tres
...
Conflicts:
include/notifier.php
2015-04-29 21:49:43 -07:00
Mario Vavti
310d122901
disable voting in blocks, layouts and webpages
2015-04-29 21:36:53 +02:00
Mario Vavti
31b5b06e42
Provide webpage layout description
2015-04-25 22:35:24 +02:00
friendica
e01873b4cf
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-24 15:01:59 -07:00
friendica
268307b534
zotfeed issues
2015-04-24 15:01:37 -07:00
Mario Vavti
cc3c1107bd
add widget class to blocks again by default. we have the wrap variable now to remove the div wrapper if necessary.
2015-04-24 22:41:56 +02:00
Mario Vavti
b7f6cceaea
provide block titles in blocklist
2015-04-24 22:37:22 +02:00
friendica
b3ac1cd993
mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.
2015-04-24 00:56:06 -07:00
friendica
41343b32c5
block unfederated posts from zot_feed
2015-04-23 21:45:42 -07:00
friendica
5ac177391b
disconnect
2015-04-23 21:13:59 -07:00
friendica
6679734135
Merge branch 'master' into tres
...
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
2015-04-23 19:49:41 -07:00
Mario Vavti
9e490d022b
fix webpage perms
2015-04-22 12:00:15 +02:00
friendica
2cef6c3ac5
use PERMS_SPECIFIC for anything that hasn't been specified. This way there's nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos.
2015-04-21 21:41:39 -07:00
friendica
6bc2766d79
issue #162
2015-04-20 20:49:55 -07:00
friendica
53339d19a3
issue #176 , sender copy of item not obscured if using private mention
2015-04-20 20:14:07 -07:00
friendica
3eeea9d8f0
force event obj_type on update
2015-04-20 17:02:45 -07:00
friendica
9cc8b44579
issue #157 , provide default directory sort order
2015-04-19 23:04:14 -07:00
friendica
4383564777
doco updates
2015-04-19 21:39:45 -07:00
friendica
d5f4a19a77
add favorites/create and destroy to api
2015-04-19 20:37:24 -07:00
friendica
f315c55d32
api performance enhancer
2015-04-19 18:57:12 -07:00
friendica
185ce2da69
assorted fixes to api direct messages
2015-04-19 18:14:17 -07:00
friendica
6511d5ee2c
some api cleanup
2015-04-19 17:39:17 -07:00
friendica
82f2765f7b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-19 13:41:38 -07:00
friendica
01efda6850
api - unobscure mail
2015-04-19 13:41:12 -07:00
Mario Vavti
71117628bc
attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes
2015-04-19 15:22:50 +02:00
Mario Vavti
dd5b97639e
Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
2015-04-19 13:25:05 +02:00
friendica
0883512e30
log this since we may need it to track down failures
2015-04-18 17:40:44 -07:00
friendica
0ce8572fef
remove failed experiment
2015-04-17 23:04:58 -07:00
friendica
e1b9053563
add last post to api/account/verify_credentials
2015-04-17 20:22:10 -07:00
Mario Vavti
61e4ee753d
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
2015-04-17 11:20:22 +02:00
Mario Vavti
9addc4581e
provide a separate input field for rpost attachments
2015-04-16 23:26:11 +02:00
friendica
32f79374b0
don't show directory keywords widget if globaldir setting is off
2015-04-15 22:07:20 -07:00
Mario Vavti
834044b15b
title=>name
2015-04-15 09:20:27 +02:00
friendica
9942dec09c
match parens
2015-04-14 20:52:07 -07:00
friendica
32acb7f6e1
post_activity_item incorrectly setting the obj_type when a valid type was specified
2015-04-14 20:50:38 -07:00
Mario Vavti
2001ad94bd
dont suggest anything here it explains itself
2015-04-14 11:59:49 +02:00
Mario Vavti
bf2a97147e
some more on webpages
2015-04-14 11:50:21 +02:00
Mario Vavti
22c3202f22
remove widget class from webpage blocks and make titles h2 to match the rest of the matrix
2015-04-13 16:17:10 +02:00
Mario Vavti
70b109702e
make dropItem more universal and move delete up in the dropdown menu
2015-04-12 14:30:33 +02:00
Mario Vavti
962fdf08c0
make fs deletion of directories work
2015-04-12 13:58:04 +02:00
Mario Vavti
7c8b9397ae
reverse file activity logic
2015-04-12 13:13:22 +02:00
Mario Vavti
8138373973
move style to style.css
2015-04-10 14:14:19 +02:00
Mario Vavti
5457b417f8
make r# work better with different font sizes
2015-04-10 14:01:40 +02:00
friendica
d9807e34e5
don't warn folks about the webaddress observer tag. We need it in constructed urls.
2015-04-09 22:35:04 -07:00
friendica
8f22b927b1
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-04-09 19:52:19 -07:00
friendica
3fd2e4b716
program the affinity slider labels
2015-04-09 19:51:58 -07:00
Klaus Weidenbach
fdd6508019
Some documentation and whitespaces at line endings.
2015-04-10 00:28:23 +02:00
Mario Vavti
7e7678364b
make jRange behave again
2015-04-09 10:53:37 +02:00
friendica
4fd80304a5
that didn't work out well - let's do this instead
2015-04-08 23:20:28 -07:00
friendica
4289c8adb2
fix selector when sys channel active
2015-04-08 23:12:39 -07:00
friendica
7bec4b313a
system channel always has allow_code privileges
2015-04-08 23:05:36 -07:00
friendica
37afc81847
update features, allow sys account page deletion
2015-04-08 17:54:52 -07:00
Klaus Weidenbach
f03a937c4e
Renamed some functions to match other names in bbcode.php.
...
Some documentation.
Removed unused variables.
Removed empty spaces at line endings.
2015-04-07 22:47:36 +02:00
Habeas Codice
dbb3cda9a6
missed one
2015-04-07 05:45:24 -07:00
Habeas Codice
1162af4c0d
"PHP Strict Standards: Only variables should be passed by reference"
2015-04-07 05:42:47 -07:00
friendica
3c05af6553
make open tag work correctly for multiple invocations in the same text
2015-04-06 21:26:40 -07:00
friendica
3a3563a4b1
commit 59828593c broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted.
2015-04-06 19:00:13 -07:00
Klaus Weidenbach
754ac2cff7
Fix Design Tool navigation for sys channel.
...
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02:00
jeroenpraat
c2517eca56
Update/fix Dutch and removing an ugly space
2015-04-02 02:23:26 +02:00
friendica
41e7552225
open bbcode tag
2015-04-01 12:30:03 -07:00
friendica
6199af6a79
revert iconic change to collection list widget
2015-04-01 01:07:38 -07:00
friendica
6f78d7a85d
fix regdir
2015-03-31 21:06:48 -07:00
friendica
c98de44528
more logging for onepoll
2015-03-31 20:01:37 -07:00
friendica
cff7696e98
change "create new collection" to iconic, document the account table
2015-03-30 00:51:03 -07:00
friendica
c29d3fc08a
mod_connections ajax failure see http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression
2015-03-29 18:42:05 -07:00
friendica
f01757f0c2
move some lesser used features to plugins
2015-03-29 16:44:26 -07:00
friendica
b546f8d702
Merge https://github.com/friendica/red into pending_merge
2015-03-29 16:05:24 -07:00
friendica
505e5e90b2
fix os_mkdir
2015-03-29 16:05:08 -07:00
RedMatrix
9ae9aedb15
Merge pull request #944 from dawnbreak/docu
...
Correcting reported Doxygen syntax warnings.
2015-03-30 10:04:15 +11:00
Klaus Weidenbach
d0361582b0
Correcting reported Doxygen syntax warnings.
...
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
2015-03-29 22:23:00 +02:00
Klaus Weidenbach
42c820029e
Fixed two wrong variable usages in event.php.
...
I just checked the code, not the functionality.
2015-03-29 21:16:21 +02:00
friendica
76a6739b93
remove bogus grouping from fix for #938
2015-03-28 18:47:28 -07:00
friendica
1e4490079b
issue #938
2015-03-28 18:45:58 -07:00
friendica
0aba609ad4
issue #941
2015-03-28 14:53:00 -07:00
friendica
47292c612c
provide ways to over-ride the datetime pickers
2015-03-26 18:03:39 -07:00
friendica
b6d4f01ba9
Merge https://github.com/friendica/red into pending_merge
2015-03-25 15:33:50 -07:00
friendica
e33da588bd
comanche: move 'webpage' declaration to the first parser pass so it is set when content loads.
2015-03-25 15:32:49 -07:00
Mario Vavti
49005101c7
make postgresql happy
2015-03-25 11:03:37 +01:00
friendica
022305fe83
also allow service classes to set post expiration. These take priority over the site default.
2015-03-24 20:38:53 -07:00
friendica
63b8020969
more work on expiration, make system limits useful - even in retrospect
2015-03-24 17:09:42 -07:00
friendica
1f427e0e5b
make the log message reflect what's really happening
2015-03-24 16:30:14 -07:00
friendica
3d60008842
provide a site-wide expiration policy without loopholes - still need work to reduce the impact of expiration queries.
2015-03-24 15:53:55 -07:00
friendica
abf642be7f
Merge https://github.com/friendica/red into pending_merge
2015-03-24 12:41:37 -07:00
friendica
00b3c4c881
sql errors on postgres with yestderday's optimisation
2015-03-24 12:40:55 -07:00
Mario Vavti
c21a21be3e
we only need item mid. some documentation.
2015-03-24 11:38:54 +01:00
Mario Vavti
1821b099df
this query can take quite a while if there were many updates but it has not been called for a long time (eg nobody called mod sharedwithme). might be a good idea to have this in the poller to clean up on a regular basis and call it once more in mod sharedwithme. what do you think?
2015-03-24 10:56:02 +01:00
friendica
c024668cf2
catche edge case of tag "@abcdef +1", which tags the first entry in your abook, regardless of abcdef. This holds true for other similar patterns as well.
2015-03-24 02:36:45 -07:00
friendica
c2acab21d4
improve performance of the zotfeed queries
2015-03-23 19:56:10 -07:00
friendica
d32f63df82
explicitly unset delegate session vars on logout
2015-03-23 17:51:43 -07:00
friendica
f2127d4ba7
limit notification detail queries for items and events
2015-03-23 15:36:17 -07:00
friendica
62b2fa6ac7
operation snakebite, cont.
2015-03-22 20:30:23 -07:00
friendica
ccef9e5636
put a lower time limit on time travellers
2015-03-22 18:23:37 -07:00
RedMatrix
e72c3e3e05
Merge pull request #935 from dawnbreak/master
...
Two possible bugfixes in bb2diaspora.php.
2015-03-23 05:34:30 +11:00
Mario Vavti
e345d6793d
move the maintenance part to include/sharedwithme.php
2015-03-22 16:29:57 +01:00
Mario Vavti
47c055e7f3
do not override item_private here anymore
2015-03-22 14:24:07 +01:00
Klaus Weidenbach
96239b3648
Two possible bugfixes in bb2diaspora.php.
...
I have found two suspicious parts and tried to correct them. I have no
diaspora enabled hubs and I am also not sure what influence these two
changes will have:
$unset($item['author']) ==> unset($item['author']);
if(cnt) ==> if($cnt)
Before merging can someone with diaspora contacts test this.
2015-03-22 14:19:00 +01:00
friendica
b298bc8834
Merge https://github.com/friendica/red into pending_merge
2015-03-21 16:47:46 -07:00
friendica
a2e3ca6fd8
add loadtime search to channel and fix it for home. display and search need further investigation
2015-03-21 16:46:28 -07:00
Klaus Weidenbach
9d143e3f2d
Fixed an exit of a loop in builtin_activity_puller().
...
There was a "$return", but I think it should be "return".
2015-03-21 22:28:07 +01:00
Klaus Weidenbach
daed7fbead
Bugfix und variable initialization.
...
Fixed a wrong perm_is_allowed() parameter, commented some other places
where we use variables that are not set and should not work.
2015-03-21 22:28:07 +01:00
friendica
85dd08427c
change permission roles for things like channel admin to make them more easily manually settable from the connections edit page.
2015-03-20 18:50:45 -07:00
Mario Vavti
ead45292e1
some tabs title statuseditor restructuring
2015-03-21 00:06:18 +01:00
Mario Vavti
264b43db05
some cleanup
2015-03-20 17:46:13 +01:00
Mario Vavti
6698d7b03a
possible improvement regarding deletion
2015-03-20 17:37:01 +01:00
friendica
2010d6a332
Explicitly force link for 'All Collections' on the network page to gid=0 so it can be used with a default page over-ride for gid.
2015-03-19 16:22:08 -07:00
friendica
b1fd6c53a5
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 15:56:30 -07:00
friendica
24ebaaf0f7
ratenotif: loop oddity
2015-03-19 15:24:09 -07:00
friendica
63683734a2
make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.
2015-03-18 19:06:05 -07:00
friendica
5a7e35fbf8
Change wording on the photo location feature. When photos are merged with DAV storage we won't be stripping metadata by default.
2015-03-18 17:36:06 -07:00
friendica
6b3afb5eec
get the correct hemisphere for geotagged photos
2015-03-17 00:53:24 -07:00
friendica
fab8209ebd
turn photo location mapping into a feature
2015-03-17 00:33:43 -07:00
friendica
7af012b1f9
The random bad signatures are because something somewhere is trimming the body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
2015-03-17 00:13:47 -07:00
friendica
bc22df9057
display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
2015-03-16 22:06:03 -07:00
friendica
7c194c37b8
started to add the ability to geotag photos (default will be disabled) but my phone isn't outputting the GPS tags even after being explicitly enabled so I'll have to wait until I've got a device that I can reliably test against.
2015-03-16 20:08:05 -07:00
friendica
178b768e3c
openid cleanup
2015-03-16 17:08:50 -07:00
friendica
f660b7523b
also update the api to match
2015-03-16 15:35:46 -07:00
friendica
52374bcd6e
phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
2015-03-16 15:33:08 -07:00
Klaus Weidenbach
864116805b
Documentation and remove duplicate code.
...
Add a bit Doxygen documentation and remove some duplicate code from
account.php.
2015-03-16 00:20:14 +01:00
friendica
b76cdf82d2
create terms for Diaspora mention tags - which in Diaspora are handled differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
2015-03-13 19:24:17 -07:00
