Commit graph

1613 commits

Author SHA1 Message Date
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
Fabio Comuni
f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac Use html5 placeholder for title text input 2012-01-06 09:11:25 +01:00
Fabio Comuni
a9670cbb7d Merge remote-tracking branch 'friendica/master' 2012-01-06 09:10:21 +01:00
friendica
c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica
b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica
5b809328af send diaspora share notification back to originator for auto friending 2012-01-05 13:25:43 -08:00
friendica
47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica
d0b743529d support auto-friend page types for Diaspora 2012-01-04 14:30:25 -08:00
friendica
c1cf6e48c2 Allow Diaspora to post to forums 2012-01-04 13:50:12 -08:00
friendica
48a5a2484e new smiley 2012-01-04 00:04:19 -08:00
friendica
fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica
969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
friendica
c583d16209 fix reference variable effects on sorting 2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
friendica
184230e068 check count before foreach 2012-01-02 22:58:09 -08:00
friendica
f4b1d335a5 sql optimisation cont. 2012-01-02 18:40:38 -08:00
friendica
4c35a6b0d7 conversation sql optimisations 2012-01-02 16:54:37 -08:00
Fabio Comuni
1fbffc76b1 text: "turn off" logger() if module is "install" 2012-01-02 20:11:06 +01:00
Fabio Comuni
85fbdb00ac dba: leave unconnected if $server and $user are not defined 2012-01-02 20:10:23 +01:00
Fabio Comuni
f35109827b datetime: new field_timezone() function, new template field_select_raw.tpl
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
2012-01-02 20:09:25 +01:00
Fabio Comuni
be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica
0afb636e46 change default ostatus poll interval 2012-01-01 11:45:56 -08:00
friendica
3e162bcf8f function not defined 2011-12-30 20:48:49 -08:00
friendica
a76be1934a migrate more notifications 2011-12-29 22:32:30 -08:00
friendica
da21473c34 add notifications to d* private messages 2011-12-27 15:49:47 -08:00
friendica
0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica
5c7df6e964 notify_intro 2011-12-26 15:47:40 -08:00
friendica
356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica
bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica
170b841834 more enotify 2011-12-25 16:20:53 -08:00
friendica
bef8f95ef3 more enotify 2011-12-24 22:36:17 -08:00
friendica
0b598dedd0 more work on enotify 2011-12-23 23:07:05 -08:00
friendica
949d3f0ff1 preparation for 3rd generation email contacts 2011-12-23 01:38:06 -08:00
friendica
95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni
0dce36bdbc Merge remote-tracking branch 'friendica/master' 2011-12-22 16:35:58 +01:00
Fabio Comuni
0b4535e6da quattro: more on editor 2011-12-22 11:24:34 +01:00
friendica
dacbbfaafb bug #188 diaspora_signed_retraction not removing post 2011-12-21 14:42:12 -08:00
Fabio Comuni
7f2070ca91 Merge remote-tracking branch 'friendica/master' 2011-12-21 17:37:35 +01:00
friendica
7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
Fabio Comuni
ba732c97c1 Merge remote-tracking branch 'friendica/master' 2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119 quattro: more on editor 2011-12-20 17:17:17 +01:00
friendica
63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly 2011-12-19 19:06:25 -08:00
friendica
79f3bbbf2b more data checking, cleans up some infrequent php errors 2011-12-19 16:51:57 -08:00
friendica
7c6bc5a93d invalid thread-id in "nouveau" mode of conversation, bug 245 2011-12-19 13:51:55 -08:00
Fabio Comuni
2a3f94e452 Merge remote-tracking branch 'friendica/master' 2011-12-19 18:04:04 +01:00
Fabio Comuni
a6f3b58293 config: set/get arrays with pconfig 2011-12-19 18:01:38 +01:00
friendica
ad54a91d4d poco_load aborting after debug statement 2011-12-19 00:40:00 -08:00
friendica
dc46a01cd4 suggest query for no friends messed up 2011-12-18 13:03:20 -08:00
friendica
e6b538c046 add webfinger addr to gcontact for friend "connect" links 2011-12-18 00:50:17 -08:00
friendica
22d59350e9 improve the email regex a bit more 2011-12-16 14:31:39 -08:00
friendica
690b3f57b7 bug 241 - valid emails may contain + on lhs 2011-12-16 14:06:50 -08:00
friendica
193435e980 default suggestions not being collected properly 2011-12-15 13:52:52 -08:00
friendica
cb2e68c88e home_init hook 2011-12-15 01:08:19 -08:00
friendica
50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica
834639ebab \o/ smiley 2011-12-11 16:58:36 -08:00
friendica
5b3155579a fix diaspora's illegal webfinger xml before sending to parser 2011-12-09 16:46:18 -08:00
friendica
3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica
7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica
0c24784f5e include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) 2011-12-06 15:24:01 -08:00
friendica
be8e9d3616 d* pm 2011-12-06 00:16:13 -08:00
friendica
adbc84c48e maintain backward compatibility with old PMs 2011-12-05 14:06:41 -08:00
friendica
c8d5274cee data structures to support hidden friends 2011-12-05 02:16:59 -08:00
friendica
116e20c89d add conv structure 2011-12-05 00:35:44 -08:00
friendica
6fc9eae9de more d* PM stuff 2011-12-04 17:26:55 -08:00
friendica
fb01d8bec5 fix incorrect default author 2011-12-04 03:54:40 -08:00
friendica
fb437a874e typo 2011-12-04 03:50:26 -08:00
friendica
f6dd834284 fix author-name when missing on comments 2011-12-04 03:45:09 -08:00
friendica
513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
friendica
ac3df5fece dynamic group edit buttons 2011-12-01 16:33:53 -08:00
friendica
29b5d398fd everybody group gets id 0 2011-11-30 23:01:42 -08:00
friendica
37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica
8f381e01ae html_entity_decode D* incoming text 2011-11-30 03:22:01 -08:00
friendica
aa73d38845 begininning d* conversation mode 2011-11-29 01:19:09 -08:00
friendica
034038849c mysql error report fix (no mysqli), suggested friends for new members settings 2011-11-28 19:28:33 -08:00
friendica
ccef899577 start of d* private mail, dba without mysqli 2011-11-27 17:41:23 -08:00
friendica
d9e1ebfc48 wrong length in image extractor 2011-11-27 14:03:49 -08:00
friendica
1055ef3eea more readable private image extraction for bypassing preg limits 2011-11-27 13:44:45 -08:00
friendica
cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
friendica
0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica
4b95e8ebe8 rework the liveupdate fixes - what a mess 2011-11-24 18:26:06 -08:00
friendica
9e8053e3bd fixing conversation updates 2011-11-24 16:42:12 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica
335c0cddcf diaspora reshared lists rendering as html 2011-11-23 01:44:07 -08:00
friendica
53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00
friendica
c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
Fabio Comuni
cb05e677a9 Merge remote-tracking branch 'friendica/master' 2011-11-21 13:52:15 +01:00
Fabio Comuni
a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
friendica
aaedac8f57 community forums cleanup 2011-11-19 13:45:20 -08:00
friendica
191a9b048f forum cleanup 2011-11-19 03:13:46 -08:00
friendica
72dd6457b0 first forum test 2011-11-19 03:06:15 -08:00
friendica
6463543832 new approach to secondary delivery fork 2011-11-18 22:20:08 -08:00
friendica
fd4fe24406 Merge branch 'master' into groups 2011-11-18 22:04:41 -08:00
friendica
6893df991e update user-agent string for remote http requests 2011-11-18 22:03:49 -08:00
Fabio Comuni
590f1d2b25 log less in expire items 2011-11-17 16:18:59 +01:00
Fabio Comuni
79603e3146 expire settings for items, notes and photos.
show default privacy acl in popup
2011-11-17 15:53:59 +01:00
Fabio Comuni
844a36e2b6 Merge remote-tracking branch 'friendica/master' 2011-11-17 13:40:27 +01:00
Fabio Comuni
02281be0c3 oembed: don't try to fetch media files and add Accept request header to fetch_url 2011-11-17 13:40:11 +01:00
friendica
c9846b745d allow dup tag names with different urls 2011-11-16 17:09:58 -08:00
fabrixxm
d0bf9d371c Merge pull request #6 from fabrixxm/master
small fix
2011-11-16 02:30:38 -08:00
Fabio Comuni
ef8b5bc682 fix localize item tag 2011-11-16 11:27:20 +01:00
friendica
7b58de743a add a few more sql indexes 2011-11-15 23:12:56 -08:00
friendica
485f97b3d8 tgroup relays 2011-11-15 20:30:34 -08:00
Fabio Comuni
962467ee68 item tags as array to templates 2011-11-15 17:41:38 +01:00
friendica
973620a9e6 translate vimeo and youtube bbcode to naked links so D* will oembed them again 2011-11-13 19:32:05 -08:00
friendica
ce7a3615b5 d* - remove dupe bbcode code tags 2011-11-13 19:04:59 -08:00
friendica
02b11c5d59 several little nits in the hcard template output which could affect parsers 2011-11-12 12:28:21 -08:00
Friendika
58ba7c3969 Merge branch 'pull' 2011-11-12 04:12:03 -08:00
Friendika
cf82174520 bug #198 - create activitystream 'friends with' message for Diaspora confirmations 2011-11-12 04:06:33 -08:00
friendica
ab6bf767df Merge pull request #3 from fabrixxm/master
fix for #191 and some other
2011-11-12 04:06:14 -08:00
Friendika
d23867f5a0 incorrect total use for get_feedtags 2011-11-12 02:53:53 -08:00