olivierm
|
75a8b684fc
|
Merge commit 'mike/master'
|
2011-02-23 20:25:37 +01:00 |
|
Friendika
|
b6ba303f4b
|
minor proc_run issues encountered during mass directory update.
Unclear if it affects "normal" operation but suspect it does.
|
2011-02-23 03:03:33 -08:00 |
|
|
Friendika
|
365ff94137
|
push directory on register - if permitted
|
2011-02-23 01:37:15 -08:00 |
|
|
olivierm
|
3ad7c395fb
|
Merge commit 'mike/master'
|
2011-02-23 10:18:11 +01:00 |
|
|
Friendika
|
a5b80e5d56
|
add some calendaring functions
|
2011-02-22 20:08:15 -08:00 |
|
|
Friendika
|
f57f9852b1
|
pulled strings from one more template
|
2011-02-22 15:35:33 -08:00 |
|
|
olivierm
|
fbf0459fb2
|
A little more french translation.
|
2011-02-22 19:14:11 +01:00 |
|
|
Friendika
|
99eef96822
|
clear float after title for items having title
|
2011-02-21 20:28:29 -08:00 |
|
|
Friendika
|
5f2f644064
|
resolve file inclusion conflicts w/ multiple plugins, improve the typo checker
|
2011-02-21 20:19:33 -08:00 |
|
|
Friendika
|
d124c67322
|
remove note about accounts being hidden in register email
|
2011-02-21 18:32:26 -08:00 |
|
|
Friendika
|
c10879efdd
|
default publish to directory, but offer registration privacy setting.
generalise publish option template - so once translated we can merge them all.
Update strings.
|
2011-02-21 16:50:06 -08:00 |
|
|
Friendika
|
079e63bba9
|
Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests
|
2011-02-21 13:27:03 -08:00 |
|
|
Friendika
|
0a7b3c111e
|
convert html entities on conversational emails
|
2011-02-21 00:20:55 -08:00 |
|
|
Friendika
|
5c5ff0b87a
|
localise tictac
|
2011-02-20 20:38:30 -08:00 |
|
|
Friendika
|
ee35c06a8d
|
more punctuation characters added to linkify patterns
|
2011-02-20 20:20:33 -08:00 |
|
|
Friendika
|
d609e75b07
|
facebook plugin: convert html entities
|
2011-02-20 19:51:00 -08:00 |
|
|
Friendika
|
c6b28ee5ed
|
support lrdd priority
|
2011-02-20 19:12:46 -08:00 |
|
|
Friendika
|
24cb2eaf63
|
add calculator addon app
|
2011-02-20 03:53:41 -08:00 |
|
|
Friendika
|
93dd2d5682
|
link to Facebook enable from plugin settings page
|
2011-02-20 03:32:57 -08:00 |
|
|
Friendika
|
af0fe4cf42
|
Merge branch 'chriscase-master'
Conflicts:
mod/dfrn_notify.php
|
2011-02-20 01:42:11 -08:00 |
|
Chris Case
|
9260bb4ce1
|
updated private message code to use the new EmailNotification library
|
2011-02-19 05:35:01 -08:00 |
|
|
Chris Case
|
dba7874131
|
added reusable EmailNotification library to facilitate more efficient maintenance of email related code
|
2011-02-19 05:33:42 -08:00 |
|
|
Friendika
|
3d1b153dec
|
apps menu file
|
2011-02-19 01:01:33 -08:00 |
|
|
Friendika
|
642a71ffde
|
app menu - and a demo application 'tictac'
|
2011-02-19 00:56:15 -08:00 |
|
|
Friendika
|
0bf8e418a8
|
Merge branch 'chriscase-master'
Conflicts:
mod/dfrn_notify.php
|
2011-02-17 14:05:51 -08:00 |
|
|
Chris Case
|
9e654f7e57
|
removed localized multipart email templates, now the multipart settings are configured directly in the code
|
2011-02-17 13:41:56 -08:00 |
|
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 |
|
|
Friendika
|
45bd7d5e29
|
no delimiter if empty
|
2011-02-17 01:06:20 -08:00 |
|
|
Friendika
|
979307ef91
|
ajax testing continues
|
2011-02-17 00:52:26 -08:00 |
|
|
Friendika
|
f7b2f9f5e7
|
convert update script arg passing to js - remembering the browser prefetch issues
|
2011-02-17 00:40:35 -08:00 |
|
|
Friendika
|
3cc63f2e6f
|
issues found when testing all live network modes
|
2011-02-16 23:18:43 -08:00 |
|
|
Friendika
|
0435236192
|
error return for update process when invalid group
|
2011-02-16 23:10:18 -08:00 |
|
|
Friendika
|
9f8b6dff1c
|
ajax live update for all network pages and subpages
|
2011-02-16 23:05:48 -08: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
|
4bff52990e
|
ajax reload fixes
|
2011-02-16 21:17:49 -08: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 |
|