friendica
312c175045
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
2012-03-09 00:31:17 -08:00
friendica
2050f886cc
keep tony from talking to himself
2012-03-08 21:14:41 -08:00
friendica
395a9530dc
still getting parent relays on remote systems
2012-03-07 18:23:55 -08:00
friendica
dd3b3c2454
revup
2012-03-07 15:54:37 -08:00
friendica
7ad2dd6565
fix photos after permissions_sql change
2012-03-06 17:52:00 -08:00
friendica
1224e256b1
Merge branch 'pull'
2012-03-06 17:22:13 -08:00
friendica
88cd5800cf
[privacy] rework latest fix
2012-03-06 17:21:14 -08:00
Simon L'nu
415ca107fd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
2012-03-06 18:38:44 -05:00
Simon
1fae778421
Merge pull request #94 from beardy-unixer/master
...
Documentation changes
2012-03-06 15:24:15 -08:00
Simon
decc9e5798
Merge pull request #99 from tomtom84/master
...
fixes in theme diabook
2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c
messages-menu translation, add scroll-to-top and theme-bug-report in theme
2012-03-07 00:07:27 +01:00
friendica
8fb0ea4048
bugs #312 , #313
2012-03-06 14:27:53 -08:00
Thomas
67456bad06
Fixed...merged with mainline THEN added beards.
2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb
added beard smileys
2012-03-06 20:44:53 +00:00
friendica
eec4cff84b
remove "smilie" expansion for Diaspora logo
2012-03-06 04:28:45 -08:00
friendica
23718bfc25
prevent duplicate likes
2012-03-06 02:17:55 -08:00
friendica
c37ffd2999
can_write_wall documentation
2012-03-05 15:04:43 -08:00
friendica
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
friendica
4134fd3dce
unused replacement variable displays %1 in all html2bbcode 'code' blocks
2012-03-04 16:26:16 -08:00
Fabio Comuni
685686b3e8
template proc: fix variables regexp
2012-03-03 00:00:38 +01:00
Fabio Comuni
aef737f376
template proc: allow isolation of var name between [ and ]
...
$var.name -> $[var.name]
2012-03-02 15:53:48 +01:00
Fabio Comuni
0bf087c895
template proc: remove unused function and commented out code
2012-03-02 12:36:22 +01:00
Fabio Comuni
60e5dda1b5
template proc: first optimization
2012-03-02 12:24:35 +01:00
Michael
52ea842e87
html2bbcode: don't convert sizes and fonts.
2012-03-02 10:33:39 +01:00
friendica
f1bf6dcdfb
expand multiple heart smilies e.g. <3333
2012-03-02 01:24:20 -08:00
fabrixxm
3a609adfb7
Merge pull request #55 from fabrixxm/master
...
Some minor and one majior mod in templates
2012-03-02 00:00:03 -08:00
friendica
8207272fbc
Merge branch 'pull'
2012-03-01 18:54:50 -08:00
friendica
58e3372b23
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
2012-03-01 18:49:23 -08:00
Alexander Kampmann
dd9432903d
Merge remote-tracking branch 'upstream/master'
2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579
Merge remote-tracking branch 'friendica/master' into randomerror
2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b
Enabled automated doc building. Changes:
...
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
Fabio Comuni
c462ed9fc5
template proc: avoid a notice and allow template name to include to be passed with a variable value
2012-03-01 11:32:49 +01:00
friendica
bd2c8c92f1
yet more work on notifications
2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0
notification enhancements
2012-02-29 18:19:08 -08:00
friendica
21803e0cd3
call time pass by reference deprecated
2012-02-28 14:54:17 -08:00
friendica
4dd4a22582
From Tobias H - catch some irregularities caused by cut/paste code
2012-02-28 14:52:23 -08:00
Tobias Hößl
5bb8ed4b8b
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
2012-02-28 21:56:42 +00:00
Tobias Hößl
3d249f0edd
Merge remote branch 'upstream/master'
2012-02-28 21:19:02 +00:00
Tobias Hößl
1204210c69
wasn't actually changed before
2012-02-28 13:01:58 +00:00
Tobias Hößl
e55d13c2b4
Avoid a notice
2012-02-28 12:56:16 +00:00
friendica
6c0fa7a166
Merge branch 'pull'
2012-02-27 17:18:53 -08:00
friendica
d7407f8daa
cleanup notify subject lines
2012-02-27 17:18:19 -08:00
Tobias Hößl
e33c2b8f89
Avoid a Notice
2012-02-27 22:08:00 +00:00
Tobias Hößl
35128ef2c9
Avoid a Notice
2012-02-27 22:01:17 +00:00
Fabio Comuni
42d591d257
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
friendica
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
friendica
89560edde2
Merge pull request #50 from annando/master
...
massive changes in mail and design updates in "vier"
2012-02-26 15:07:34 -08:00
friendica
6ddd444afd
Merge pull request #49 from CatoTH/master
...
Bugfix for del_config
2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
friendica
bdb14d5aad
relative link redirects
2012-02-26 14:34:01 -08:00
Michael
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
Tobias Hößl
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
root
aa92901b11
Wrong variable name
2012-02-26 14:29:17 +00:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
Abinoam P. Marques Jr
f3a225437b
Comment notifications by e-mail now are threaded
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f
include/items.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
friendica
2c7da5d0de
scale external images
2012-02-25 14:22:51 -08:00
Michael
1cf1870512
poller.php: Test for moving to archive, vier-style: notifications fixed
2012-02-25 19:40:05 +01:00
Michael
dccefb3c36
"vier": The contacts are now working again. Line break before closing bbcodes removed.
2012-02-25 11:00:35 +01:00
friendica
18bf5d1402
theme info (like plugin info)
2012-02-25 00:30:14 -08:00
friendica
9441ff5142
string update for 2.38
2012-02-24 22:47:43 -08:00
friendica
a3cf563b68
update author name across items if changed.
2012-02-24 20:40:09 -08:00
friendica
f5c5da742d
attribution issue - don't take author name from contact if available from item.
2012-02-24 20:03:13 -08:00
Michael
01301a6169
Bug fixed where mails where nearly empty. HTML mails can now be received.
2012-02-25 02:37:39 +01:00
Michael
a74b0746b1
multipart messages complete, message-id conversion done.
2012-02-25 01:10:45 +01:00
Michael
0ba45eb745
Sending mail as multipart/alternative (html and plain text) (very basic by now)
2012-02-24 08:50:42 +01:00
Michael
f6320f3319
Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact.
2012-02-24 07:11:26 +01:00
Michael
484a442f2b
GIT problems ...
2012-02-23 20:59:34 +01:00
Michael
0409b5cdba
Merge remote branch 'upstream/master'
...
Conflicts:
include/bbcode.php
2012-02-23 20:53:22 +01:00
Michael
311e35731c
bbcode.php: A list or quote at the beginning wasn't detected
2012-02-23 20:51:44 +01:00
85d09f48d0
fix img tag with size attribute
2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359
Merge branch 'master' into notify
2012-02-23 00:30:17 -08:00
friendica
fd43e2c563
more theme notify fixes
2012-02-23 00:28:26 -08:00
friendica
41636a50aa
new notify sort of working in testbubble
2012-02-22 23:34:30 -08:00
Michael Vogel
9f92bbb04c
Removed the export of markdown articles. That was for testing purposes only.
2012-02-23 07:53:45 +01:00
friendica
808b886a3e
Merge branch 'master' into notify
2012-02-22 22:36:07 -08:00
friendica
3c6b127d40
nested quote check fails to account for strpos returning position 0
2012-02-22 20:58:04 -08:00
friendica
d75d49a4c1
restore poller normal operation
2012-02-22 20:31:33 -08:00
friendica
58a9c652de
Merge pull request #45 from annando/master
...
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
friendica
f9eddad44f
allow forum posts by followers on Diaspora
2012-02-22 19:56:28 -08:00
Michael
e34a648cad
German translation more gender friendly. Some more logging in poller.php
2012-02-22 15:20:49 +01:00
friendica
390eb15e7d
never enough documentation
2012-02-22 01:50:06 -08:00
friendica
a19ddb48ee
waitman gobble media upload via api patch
2012-02-21 23:35:50 -08:00
friendica
91c3349025
escape smiley conversion in code and pre blocks
2012-02-21 23:13:03 -08:00
friendica
3f2497ad20
add full email link to notification
2012-02-21 18:10:15 -08:00
friendica
f03aaf554e
mark all notifications read
2012-02-21 16:59:57 -08:00
Fabio Comuni
01a2791e3a
template: add support for variable filters
2012-02-21 11:25:22 +01:00
friendica
5910fbf420
fill in notify msg with redirect link after we get the id
2012-02-21 00:02:42 -08:00
friendica
32d9008dd4
more cleanup of community followup detection. Remote worked well but local didn't.
2012-02-20 21:07:40 -08:00
friendica
b821399f00
email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes
2012-02-20 19:50:05 -08:00
friendica
6edd6d8ae1
Merge branch 'pull'
2012-02-20 18:07:16 -08:00
friendica
11871195be
fix twitter title showing up occasionally
2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr
3ef6344d41
include/nav.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
fed6330ea6
include/api.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
19fea9c2ce
poller.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
7ed1e3f177
acl_selectors.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
03834b2433
text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future)
2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
0bca36109a
Scrape.php - Friendika -> Friendica
2012-02-20 19:38:42 -03:00
Michael
e2f276881e
Some testing stuff
2012-02-20 11:15:22 +01:00
friendica
15e9933ddf
include item links in web notification messages
2012-02-19 20:27:32 -08:00
Michael
0fb22e1284
API is now working on my nginx server.
2012-02-20 01:53:22 +01:00
root
b6d7777226
New version of markdown. Playing with stylesheet. Testing line breaks.
2012-02-19 22:47:32 +01:00
Michael
064c843119
Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes.
2012-02-19 21:07:45 +01:00
Michael
31653aef64
Brand new html2bbcode. Some other changes in diaspora to bbcode handling
2012-02-19 20:36:59 +01:00
Simon L'nu
49179f9033
add :headdesk and fix doc/Pages.md to remove the absolute URL to /
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-19 05:17:26 -05:00
friendica
5734d5f357
change notify messages for web
2012-02-18 03:18:20 -08:00
friendica
1b9c03f6fc
new notifications - implement storage
2012-02-18 02:57:42 -08:00
friendica
4222f506a8
deprecating two-char smilies
2012-02-17 23:44:25 -08:00
Fabio Comuni
7bd43613fa
oembed: revert changes from 48f5bd492d
2012-02-17 15:34:05 +01:00
friendica
48f5bd492d
naked link with no protocol being passed from Diaspora
2012-02-16 23:14:36 -08:00
friendica
2abbd81ce1
a few fixes for offsite community members
2012-02-16 18:29:09 -08:00
friendica
7dcef67492
facepalm smiley
2012-02-16 15:15:28 -08:00
friendica
1b445d511b
another sql typo
2012-02-16 00:08:38 -08:00
friendica
ada2a555dc
sql typo in auto-friend with D*
2012-02-15 23:58:28 -08:00
friendica
b1d31aca51
quick comments
2012-02-15 18:13:41 -08:00
friendica
d054426101
encode email headers on message deliveries
2012-02-15 15:28:32 -08:00
fabrixxm
16f00cb73b
Merge pull request #36 from fabrixxm/master
...
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni
fe3e8ee854
quattro: icons for attachments
2012-02-15 11:10:02 +01:00
friendica
03171fd7de
preliminary qcomment support, [nosmile] tag to disable smiley processing
2012-02-14 23:13:18 -08:00
friendica
f865939653
localise links to private photos inside messages
2012-02-14 18:07:13 -08:00
friendica
134fdda75f
refactor smilie code to allow for extensions and generation of a table of the entire list
2012-02-14 15:31:08 -08:00
Vasudev Kamath
e4b1c07727
cry, foot in mouth, cool, undecided and embarassed smiley's are mapped
2012-02-14 23:10:11 +05:30
friendica
803a7425ea
make hr bbtag shareable, stray quote in duepuntozero wall_item
2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f
Merge branch 'pull'
2012-02-13 14:17:20 -08:00
friendica
dc4420c5ec
hr bbcode tag
2012-02-13 14:16:51 -08:00
Fabio Comuni
850560519a
Merge remote-tracking branch 'friendica/master' into mobile
2012-02-13 09:46:42 +01:00
friendica
85c831bcbf
finish translation of 'xxxxx wrote:'
2012-02-12 20:56:44 -08:00
Abinoam P. Marques Jr
9697e82331
Merge branch 'master' into bbcode
2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr
135005571f
Added [th] bbcode tag support.
2012-02-12 17:27:08 -08:00
friendica
3e85c1d330
make 'x minutes ago' fully translateable with argument ordering. string update.
2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr
e575a3a02c
Fixed bbcode [li] and [*] handling.
2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr
10e66d293d
Added [quote=Name] bbcode support.
2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr
3a07973ffa
Added [center] bbcode support.
2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr
74b529bda2
BBCode [size=50] --> font-size: 50px (with the unit px).
...
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr
92a585ed23
Added support to [noparse], [nobb] and [pre] as bbcode escape tags.
2012-02-12 14:35:29 -08:00
friendica
330a876d81
bug #281
2012-02-12 14:18:32 -08:00
Abinoam P. Marques Jr
6a17a3a8e2
Added support for [ol] standard ordered list bbcode.
2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr
5479142efc
Added support for [ul] standard unordered list bbcode.
2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr
5107ee52d3
Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes
2012-02-12 06:13:49 -08:00
Vasudev Kamath
495d0fb80f
Merge branch 'master' of git://github.com/friendica/friendica
2012-02-12 15:06:41 +05:30
Vasudev Kamath
cbf53beec1
;) :D and :-O are also enabled for wink laugh and surprised smiley's
2012-02-12 15:06:12 +05:30
friendica
8b101c6cb8
do not display contact_block if config for num shown is 0
2012-02-11 23:49:05 -08:00
friendica
bb19c8ba4e
kissing smilie may need escaping (thanks - Abinoam)
2012-02-11 21:46:48 -08:00
friendica
75a62db9c5
show tags (pub_keywords) in advanced profile
2012-02-11 01:24:29 -08:00
friendica
d79c3351ea
db installation sync
2012-02-10 13:43:35 -08:00
Fabio Comuni
ed38808aae
hidden jot in "display" to allow reshare
2012-02-10 17:30:22 +01:00
friendica
b346f4464c
send notify emails to community pages as well as people
2012-02-10 00:08:23 -08:00
friendica
2f2e331c33
bug #274
2012-02-09 22:44:59 -08:00
friendica
ffe7d8b1e9
item tag notifications
2012-02-09 21:18:50 -08:00
friendica
5859f9dcf6
add render_location hook to both sets of conversations
2012-02-09 18:09:28 -08:00
friendica
7b0a005441
edit post not working after plaintext editor fixes, missing some recent editor template changes
2012-02-09 15:58:26 -08:00
friendica
ec26f88be9
render_location hook
2012-02-09 15:02:59 -08:00
friendica
171249966e
add tag notifications to enotify
2012-02-09 14:06:17 -08:00
friendica
c506bb42a9
:coffee extended smilie
2012-02-07 17:03:09 -08:00
friendica
8a3c1f7930
beer smilie
2012-02-07 15:41:06 -08:00
friendica
a869bd2fe5
don't link tags enclosed inside Diaspora links
2012-02-07 02:16:28 -08:00
friendica
2b77002471
basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html).
2012-02-06 20:28:50 -08:00
friendica
3d099bd99a
beer
2012-02-06 01:08:00 -08:00
friendica
4cf6bd5469
do an optimise after an expunge
2012-02-02 18:02:08 -08:00
friendica
9fc36d3da4
improvements in d* markdown conversion
2012-02-01 17:09:53 -08:00
friendica
86c0eac27d
transport for email contacts phase II
2012-01-31 20:03:46 -08:00
friendica
4993f4f1d6
allow plugin to abort message posting, fix half-duplex D* relationship
2012-01-30 20:49:54 -08:00
friendica
c76b224d8a
prune old expired and deleted items
2012-01-30 15:13:24 -08:00
friendica
d54042dd38
mime_content_type requires access to the file, not just the name
2012-01-28 12:09:17 -08:00
friendica
5161be67e9
logging of manage identities
2012-01-27 12:56:36 -08:00
friendica
94b9e9ce6d
for people whose DB's are not updating
2012-01-26 23:08:51 -08:00
friendica
3197a6e8aa
fix some changes lost from another branch
2012-01-26 23:03:27 -08:00
friendica
8fe5168259
restore diaspora test mode
2012-01-26 20:46:42 -08:00
friendica
167ab537b5
backend for delegating forums
2012-01-26 16:52:12 -08:00
friendica
10f768630b
D* event formatting
2012-01-25 15:16:43 -08:00
friendica
e2d0eb4a88
redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic
2012-01-24 18:59:55 -08:00
friendica
dae0c1ded2
more robust cache api handling (was throwing errors on occasion)
2012-01-24 17:04:49 -08:00
friendica
8ff2bb4cd3
backtrace errant input to base64url_decode
2012-01-24 16:45:58 -08:00
friendica
3a1a4d62d9
bug #254
2012-01-24 16:23:30 -08:00
friendica
a76a497d92
implement "moderate" flag on items
2012-01-23 20:56:11 -08:00
friendica
1f074cb44c
shaka, slackr theme
2012-01-23 15:07:40 -08:00
Fabio Comuni
9047840ec2
nav: fix "See all notifications"
2012-01-23 09:23:37 +01:00
friendica
11aa83742e
more logging of D* photo transactions
2012-01-22 15:25:29 -08:00
Fabio Comuni
30fcda7576
nav: fix intro notification url, fix "See all notifications" url and make it translatable
2012-01-22 19:27:56 +01:00
friendica
b5ec475906
bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC
2012-01-21 14:07:28 -08:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
d840943621
use reltoabs - primarily for github activity feeds
2012-01-17 16:30:32 -08:00
friendica
e12341b716
api post broken with recent change to use REQUEST vars in mod_item
2012-01-15 13:57:00 -08:00
friendica
4b6990e1ff
modularise successful authentication
2012-01-12 15:46:39 -08:00
friendica
aa1c28cf39
fine tuning diaspora markdown to bbcode
2012-01-11 22:49:17 -08:00
friendica
6573c94d6c
modified item_photo_menu hook
2012-01-11 17:34:02 -08:00
friendica
c5f41d8b6c
fix D* links+text smushed together
2012-01-11 14:03:27 -08:00
friendica
cf7008e575
post preview to loozah
2012-01-10 17:47:11 -08:00
friendica
7011f71e8f
post preview
2012-01-09 20:03:00 -08:00
friendica
a13156c0f3
bypass D* markdown bug for now
2012-01-09 18:52:49 -08:00
friendica
3bdcb52471
markdown bug is Diaspora's. We can't fix it.
2012-01-08 17:20:03 -08:00
friendica
df0f7ef560
make network_to_name extensible
2012-01-08 02:08:20 -08:00
friendica
977a49ad93
fix images with links going to diaspora, the D* markdown processor changed and these are no longer working.
2012-01-08 00:57:36 -08:00
friendica
358b2a46f5
fix photo top view in testbubble, extend network_to_name
2012-01-07 13:00:06 -08:00
fabrixxm
ad02af4e8f
Merge pull request #23 from fabrixxm/master
...
Theme works
2012-01-06 00:42:06 -08:00
friendica
cfe8094b45
nets widget - allow all children of specified parent net regardless of network
2012-01-06 00:23:05 -08:00
