Commit graph

457 commits

Author SHA1 Message Date
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
Stefan Parviainen
334d496bb1 Fix some issues with tagging. 2015-01-16 19:10:34 +01:00
friendica
d6ae124bbd ignore bbcode open tag (left bracket) in hash and mention tag regexes and turn it into a tag delimiter 2015-01-14 16:00:21 -08:00
friendica
dfdef0af0d provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account. 2015-01-13 18:30:30 -08:00
Stefan Parviainen
93735df2c7 Allow tags in mail, many profile fields, and admin info 2015-01-13 17:54:40 +01:00
Stefan Parviainen
adc9564b5c Refactor mention code to make it more reusable 2015-01-12 20:01:07 +01:00
friendica
aa490a39bb include channel clones in PM deliveries (also some whitespace edits) 2015-01-08 16:02:15 -08:00
friendica
1cfff44535 lines reversed in handle_tag() 2015-01-06 13:42:55 -08:00
Stefan Parviainen
7bf7f8180d Revert "Revert "Language names via intl library.""
This reverts commit 4f35efa0ba.
2014-12-31 10:42:08 +01:00
RedMatrix
4f35efa0ba Revert "Language names via intl library." 2014-12-31 10:43:19 +11:00
Stefan Parviainen
9cab8ae58a Language names via intl library. Fixes #773 2014-12-30 20:29:31 +01:00
friendica
2b3cc585a2 fix double encoding of homepage in profile activity - not as straight-forward as it looked 2014-12-21 14:43:06 -08:00
Stefan Parviainen
fe80dbb3a7 Access list of smilies over JSON 2014-12-20 17:33:35 +01:00
friendica
0f0f12a453 allow a variety of latitude/longitude delimiters since nobody can agree on them. 2014-12-17 16:11:21 -08:00
friendica
cc0df5bc24 ability to generate arbitrary map with [ map=lat/lon] and also free form location using [ map]somewhere[/map] but the second one currently has no plugins available to generate it. 2014-12-17 14:12:19 -08:00
friendica
789e025eab Add [ map ] element to bbcode, no closing tag. Requires a map generator plugin (like openstreetmap which was just updated) and also requires that the author has browser location enabled. 2014-12-16 15:50:20 -08:00
Klaus Weidenbach
233903c844 Add security logger to RedDAV.
Some smaller clean ups whitepsaces and tabs, use PHP_EOL, Doxygen, etc.
2014-12-14 01:50:56 +01:00
Stefan Parviainen
62dabecf97 Show tags in other channels profile field to make it easier to navigate to the channels 2014-12-07 16:19:22 +01:00
Habeas Codice
b224f8056c new system config reserved_channels
prevents members from creating channels in a reserved list
2014-11-21 15:35:59 -08:00
Habeas Codice
ac27db22c1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	include/dba/dba_driver.php
	include/diaspora.php
	include/follow.php
	include/session.php
	include/zot.php
	mod/photos.php
	mod/ping.php
2014-11-13 13:06:31 -08:00