Fabio Comuni
|
f5557763d2
|
Updates to theme dupuntozero
|
2011-02-17 17:29:29 +01:00 |
|
|
Fabio Comuni
|
3d69e2a50c
|
Merge branch 'master' into themetests
|
2011-02-17 14:14:06 +01:00 |
|
|
fabrixxm
|
c948ab8f21
|
Merge branch 'friendika-master'
|
2011-02-17 07:37:15 +01:00 |
|
|
fabrixxm
|
2493877a18
|
Merge branch 'master' of github.com:fabrixxm/friendika
|
2011-02-17 07:36:15 +01:00 |
|
Friendika
|
c397a2f89b
|
properly handle error returns in post w/ajax
|
2011-02-16 20:25:10 -08:00 |
|
|
Friendika
|
67bb737aa1
|
broken image + linkify site link in body
|
2011-02-16 17:49:52 -08:00 |
|
|
Friendika
|
527e050ecc
|
sanitise all incoming url's - also stop them from getting mangled by simplepie
|
2011-02-16 17:32:15 -08:00 |
|
|
Friendika
|
9f1f9da89b
|
Merge branch 'chriscase-master'
|
2011-02-16 14:41:12 -08:00 |
|
|
Friendika
|
d6998ffef2
|
small fixes
|
2011-02-16 13:19:54 -08:00 |
|
Chris Case
|
5aa6bbbbc5
|
fixed encoding, i had been experimenting with different ones and forgot to change it back, now UTF-8
|
2011-02-16 08:05:54 -08:00 |
|
|
Chris Case
|
2169329547
|
forgot to check this in earlier... splits up text and html into two different templates and base64 encodes them
|
2011-02-16 08:05:10 -08:00 |
|
|
Chris Case
|
e56895123a
|
changed message sending to use base64 encoding
|
2011-02-16 05:17:40 -08:00 |
|
|
Fabio Comuni
|
dc15e8640d
|
duepuntozero: show desc on image in albums
|
2011-02-16 12:49:16 +01:00 |
|
|
Friendika
|
acce5c95a3
|
set contact permissions on photos uploaded to private messages
|
2011-02-16 03:14:45 -08:00 |
|
|
Friendika
|
fb3bb41dc2
|
Merge branch 'fabrixxm-master'
|
2011-02-16 02:09:02 -08:00 |
|
|
Friendika
|
9f02057374
|
provide permalink for posts, include permalinks in feeds and imported from feeds
|
2011-02-16 02:07:11 -08:00 |
|
|
Fabio Comuni
|
c8116932c2
|
Fix #8 \"recycle symbol getting mangled from status.net retweets\"
|
2011-02-16 09:22:32 +01:00 |
|
|
fabrixxm
|
17a0d38d8f
|
Merge branch 'friendika-master'
|
2011-02-16 08:07:17 +01:00 |
|
|
fabrixxm
|
9e746b504f
|
Merge branch 'master' of github.com:fabrixxm/friendika
|
2011-02-16 08:06:04 +01:00 |
|
|
Friendika
|
c5f5102396
|
Merge branch 'fabrixxm-master'
Conflicts:
addon/statusnet/statusnet.php
util/strings.php
|
2011-02-15 13:40:25 -08:00 |
|
|
Friendika
|
603dc34fa0
|
parens in english string
|
2011-02-15 13:33:33 -08:00 |
|
|
Fabio Comuni
|
97723ad69f
|
Fixed parentheses in translable string in statusnet.php. Rebulid util/strings.php. Update it/strings
|
2011-02-15 15:09:29 +01:00 |
|
|
Fabio Comuni
|
48e2a6bde9
|
Updated it language
|
2011-02-15 14:53:55 +01:00 |
|
|
Fabio Comuni
|
1bb9effd38
|
fin un util/strings
|
2011-02-15 14:41:48 +01:00 |
|
|
Fabio Comuni
|
5cfefba5c8
|
Small tweaks to string_translator
|
2011-02-15 14:40:26 +01:00 |
|
|
Fabio Comuni
|
70cf5ae3c7
|
Merge remote-tracking branch 'friendika-master/master'
|
2011-02-15 14:19:54 +01:00 |
|
|
Friendika
|
473786d3a0
|
Merge branch 'chriscase-master'
|
2011-02-15 03:45:40 -08:00 |
|
|
Chris Case
|
0d853433eb
|
fixed error which was causing multiple line breaks, added comments to better document what is occuring, cleaned up code, removed unnecessary parameters from templating step
|
2011-02-15 03:31:20 -08:00 |
|
|
Fabio Comuni
|
dd8bbe8202
|
change \"html\" with \"bb code\" in tinyMce icons
|
2011-02-15 12:23:47 +01:00 |
|
|
Friendika
|
69be5b64e0
|
Merge branch 'tobiasd-master'
|
2011-02-15 03:17:18 -08:00 |
|
|
Friendika
|
f856493555
|
add permalink field to item table
|
2011-02-15 03:13:38 -08:00 |
|
|
Friendika
|
1b14f67a86
|
bug #0000006, local sparkle links visible in "like" items when remote viewing
|
2011-02-15 02:30:01 -08:00 |
|
Tobias Diekershoff
|
7a6174298b
|
deleted the translated file of comment_item.tpl
|
2011-02-15 10:56:07 +01:00 |
|
|
Tobias Diekershoff
|
397643a066
|
masked the / in the config strings to fix problems with the strings.php
|
2011-02-15 10:03:05 +01:00 |
|
|
Tobias Diekershoff
|
afdfc725b8
|
some translations into German
|
2011-02-15 09:49:38 +01:00 |
|
|
Friendika
|
0e7b09b41c
|
bug #0000002, strip HTML from pasted text in prv messages
|
2011-02-14 21:33:17 -08:00 |
|
|
Friendika
|
1dea6a2d71
|
wrong return url for ajax comments on display and photos pages
|
2011-02-14 20:21:28 -08:00 |
|
|
Chris Case
|
7b26500510
|
Merge remote branch 'upstream/master'
|
2011-02-14 11:50:08 -08:00 |
|
|
Chris Case
|
42eb6dd723
|
fixed a bbcode issue with rich text html messages, fixed some issues with plain text.
|
2011-02-14 05:44:27 -08:00 |
|
|
Friendika
|
fe1a37074a
|
Merge branch 'chriscase-master'
|
2011-02-14 05:06:16 -08:00 |
|
|
Chris Case
|
94e0c3c970
|
fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag
|
2011-02-14 04:54:44 -08:00 |
|
|
Friendika
|
b87ddbd58a
|
Merge branch 'ajaxcomms'
Conflicts:
view/comment_item.tpl
|
2011-02-14 04:46:49 -08:00 |
|
|
Friendika
|
df20990753
|
ajax comments
|
2011-02-14 04:43:49 -08:00 |
|
|
Friendika
|
39dd36176b
|
ajax comments
|
2011-02-14 04:43:19 -08:00 |
|
|
Chris Case
|
5eebb373e5
|
revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template.
|
2011-02-14 03:59:54 -08:00 |
|
|
Friendika
|
f37caa0999
|
try this again
|
2011-02-14 02:59:22 -08:00 |
|
|
Friendika
|
ce8c6dfaf7
|
just in time for valentines day - heart smiley <3
|
2011-02-13 17:24:42 -08:00 |
|
|
Chris Case
|
f98ba371cf
|
updated private message notification to use HTML, still need the foreign language message notifications updated
|
2011-02-13 14:55:48 -08:00 |
|
|
Friendika
|
e32cda6542
|
app not defined
|
2011-02-13 13:35:08 -08:00 |
|
|
Friendika
|
2d542e0f98
|
receiving comment notifications for conversations we aren't "involved" in
|
2011-02-12 22:29:32 -08:00 |
|