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
f3eb9af046
more ZAT work
2016-07-14 19:43:47 -07:00
redmatrix
b3a785711c
deprecate/remove json_decode_plus
2016-07-13 22:11:06 -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
cbf009a95d
cleanup
2016-07-05 16:56:40 -07:00
redmatrix
e5c66d94f2
relocate the cache class
2016-06-23 05:18:58 -07: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
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
2793086c0d
1. string update, 2. pretty print json blobs
2016-06-17 14:58:03 -07:00
redmatrix
a2a87fec54
code comments
2016-06-15 22:36:00 -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
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
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
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
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
624f4641e2
missed an object -> obj conversion in prepare_body
2016-06-03 15:09:58 -07: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
61304d80d2
track down some issues from the application logs
2016-05-26 18:45:47 -07:00
redmatrix
80f2ba640e
code cleanup
2016-05-24 20:49:23 -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
redmatrix
de006771c7
renamed include files identity.php (channel.php) and Contact.php (connections.php)
2016-05-22 16:54:30 -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
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
2a14c71128
convert media embed functions that deal with rewriting specific corporate services to addon hooks
2016-05-08 19:12:52 -07:00
redmatrix
7101bbedcb
objectify comanche
2016-05-05 23:07:35 -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
cd518625bf
some much needed work on oembed security
2016-05-01 19:19:17 -07:00
redmatrix
84d93cca6e
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-04-30 15:02:45 -07:00
Treer
8f16e9ad33
update icon names in include/
2016-05-01 04:39:57 +10:00
redmatrix
4c47d22f4b
trim engr_units string slight improvement to avoid subtle bugs
2016-04-29 23:47:13 -07:00
redmatrix
bb96f44861
allow engineering units (e.g. 400M, 1G) as service class limits
2016-04-28 21:02:27 -07: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
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
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
29363a185d
file sync work
2016-04-06 18:07:29 -07:00
redmatrix
9abd95fad3
static App
2016-03-31 16:06:03 -07: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
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
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
18208fab84
poke basic config setting
2016-02-04 11:58:56 -08:00
redmatrix
7d7ef5ac4e
add a fixme
2016-01-21 18:42:44 -08:00
Mario Vavti
b711c050db
make contact block look widget alike
2016-01-21 11:48:10 +01:00
redmatrix
caf3a69d99
yearly license update
2015-12-31 13:25:23 -08:00
redmatrix
2cf4ac26fd
log API improvements and queue optimisation for singleton networks
2015-12-31 12:26:41 -08:00
redmatrix
6db6fef29f
spelling
2015-12-25 14:56:06 -08:00
redmatrix
f121b74bec
enhance whitespace
2015-12-15 15:17:10 -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
Mario Vavti
056db37c66
beautify event item code
2015-11-26 22:14:20 +01:00
Mario Vavti
c7cbd41c16
first iteration on the event item
2015-11-26 12:26:27 +01: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
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
888bf76e4b
allow pdl content
2015-11-12 17:47:38 -08:00
ken restivo
9c240de303
Add unit tests for valid email function.
2015-11-08 14:37:48 -08:00
Mario Vavti
5920a96da7
make attachments appear in a dropdown in wall-item-tools-left
2015-10-31 00:38:01 +01: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
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
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
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
bab73edcef
extened the earlier fix
2015-10-19 16:50:53 -07:00
redmatrix
9b3662e5ad
issues with "the Register" feed
2015-10-18 16:29:09 -07: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
2848f5dab4
Merge branch 'master' of https://github.com/redmatrix/hubzilla
2015-10-15 09:36:51 +02:00
redmatrix
de697a4267
issue #86 - like/dislike in photos not working
2015-10-14 14:16:16 -07:00
Mario Vavti
c8d8ae89d7
remove $item from $prep_arr - we probably do not need it
2015-10-14 22:46:40 +02: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
c76da2e77d
functions to update urls in items when doing migrations
2015-10-06 20:30:49 -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
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
d9a67d64b1
Update the credits
2015-09-02 18:04:22 -07:00
redmatrix
ca0bc2bb7b
more work on AccessList integration
2015-08-27 22:20:30 -07:00
redmatrix
5786fd2221
extra encoding on mail titles
2015-08-20 01:12:35 -07:00
zottel
2bd05971ab
fix observer tags for now (issue #17 )
2015-07-16 08:28:37 +02: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
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
1a0655f34e
more work on mail flags
2015-06-23 21:01:59 -07:00
redmatrix
6aa159e2ac
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-06-18 19:15:01 -07:00
redmatrix
1a9c059062
issues with markdownify and escaped HTML
2015-06-18 16:35:40 -07:00
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -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
Mario Vavti
3d79d4f577
define some custom attributes and html5 elements for htmlpurifier
2015-05-27 15:25:45 +02: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
6466774b6e
PRIVACY: possible privacy leakage under a defined set of circumstances
2015-05-20 18:46:23 -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
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
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
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
f2a0dac653
fix a couple of miscellaneous errors which showed up in the logs
2015-05-11 22:57:12 -07:00
redmatrix
e85593e970
Hopefully this will make item_cache the default
2015-05-06 21:43:15 -07:00
redmatrix
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07: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
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
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
friendica
01efda6850
api - unobscure mail
2015-04-19 13:41:12 -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
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
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
Klaus Weidenbach
754ac2cff7
Fix Design Tool navigation for sys channel.
...
Fix creating menu for sys channel.
2015-04-06 23:52:13 +02: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
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
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
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
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
178b768e3c
openid cleanup
2015-03-16 17:08:50 -07:00
Klaus Weidenbach
124b17dcf4
Some cleanups.
...
Fixed dbesc_identifier(), but it is not used yet.
Corrected some other variable names and variable initialization before
using them.
2015-03-13 00:36:32 +01:00
friendica
11df605c2e
support rel=me on channel "homepage" url
2015-02-24 00:45:03 -08:00
friendica
4b513d3322
issue #896
2015-02-12 19:22:07 -08:00
friendica
08b757a22c
Merge branch 'master' into tres
...
Conflicts:
mod/events.php
view/css/mod_events.css
2015-02-08 20:57:37 -08:00
friendica
7edab47658
get_rel_link broken - also weekly doc updates
2015-02-06 02:07:10 -08:00
friendica
4b348d2489
Merge branch 'master' into tres
...
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
friendica
3f50313862
garbage in garbage out
2015-02-03 16:03:05 -08:00
friendica
043ff33e43
issue #889 private tags for forums no longer recognised after tag refactor a few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality
2015-02-02 14:59:01 -08:00
friendica
aafed50a0e
Merge branch 'master' into tres
2015-02-01 20:30:47 -08:00
marijus
22ad8f413d
add multipart/mixed to getIconFromType()
2015-02-01 12:48:25 +01:00
friendica
912be23e16
Merge branch 'master' into tres
...
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
2015-01-29 15:09:35 -08:00
friendica
ff68ea6087
more message restrict conversions
2015-01-29 14:51:41 -08:00
friendica
a496036066
local_user => local_channel
2015-01-28 20:56:04 -08:00
friendica
a2cdd1499c
Merge branch 'master' into tres
...
Conflicts:
include/socgraph.php
2015-01-27 20:00:43 -08:00
marijus
65aa6cf708
move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
2015-01-27 19:00:16 +01:00
friendica
ac594183c6
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
...
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
2015-01-26 18:27:03 -08:00
Alexandre Hannud Abdo
2e783dbe79
Call sslify with an extra path element so files keep their names
...
The main motivation for this is when saving images one doesn't
need to inspect and manually input the file's actual name.
There might be other benefits, perhaps in automated downloads.
2015-01-25 02:08:59 -02:00
friendica
6e0e3b2433
more expanding item flags
2015-01-22 18:41:10 -08:00
friendica
51848c6190
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-20 19:33:19 -08:00
friendica
ee3eee425c
that should take care of the bitfields in hubloc
2015-01-20 16:13:18 -08:00
