Commit graph

67 commits

Author SHA1 Message Date
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica
5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
friendica
ea10bba147 fix "between yourself and You" in mail list 2012-03-31 20:08:32 -07:00
Fabio Comuni
50711040cb message: remove tabs, move new message link to aside, all message with gmail-style 2012-03-28 15:31:58 +02:00
friendica
b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
Tobias Hößl
75823c2353 Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button 2012-03-16 17:45:07 +00:00
friendica
110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica
de017d1ed7 sort inbox by recently replied conversations first 2012-03-13 19:27:52 -07:00
Tobias Hößl
4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica
d9c5d9d2eb default the text template var on conversations 2012-03-10 15:53:36 -08:00
friendica
1bddd48661 bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
Tobias Hößl
635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica
3878b58f0d bug #324 - tinymce used for mail even if editplain being used. 2012-03-09 00:47:10 -08:00
Tobias Hößl
f48556cbc0 contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used 2012-02-28 13:40:41 +00: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
d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica
7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica
116e20c89d add conv structure 2011-12-05 00:35:44 -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
7474c48022 add tag to personal 2011-11-29 19:52:14 -08:00
Friendika
df7702709b common tabs to notifications and mail 2011-10-11 21:30:23 -07:00
Devlon Duthie
da53ebf4b3 added activetab var to message.php for templates
(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems
2011-10-02 20:37:47 -05:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika
63277b57fc template escapes 2011-09-19 19:46:18 -07:00
fabrixxm
d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
fabrixxm
43040faf22 move send private message code out of view code 2011-08-19 16:54:41 +02:00
fabrixxm
07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
Fabio Comuni
e6444adafd change nav selected css class 2011-07-25 16:52:30 +02:00
Friendika
e2f1540f25 events, continued. Also better regex matching accounting for empty elements 2011-06-07 22:13:07 -07:00
Fabio Comuni
e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message.
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
Friendika
b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika
a00813497f bring back load_view_file for dispy templates 2011-05-10 23:35:31 -07:00
Friendika
c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Fabio Comuni
92156cd840 Merge remote-tracking branch 'friendika-master/master' into iconpopup 2011-04-04 09:31:12 +02:00
Friendika
d728961cbf translateable time formats (PM & birthdays) 2011-03-31 14:46:16 -07:00
Fabio Comuni
29878d9c26 url \"/message/new/<id>\" preselect contact <id> in \"To\" select box 2011-03-31 16:54:06 +02:00
Friendika
798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika
71d4810697 photo in mail message getting bogus response 2011-03-03 20:58:39 -08:00
Friendika
755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika
d6998ffef2 small fixes 2011-02-16 13:19:54 -08:00
Friendika
acce5c95a3 set contact permissions on photos uploaded to private messages 2011-02-16 03:14:45 -08:00
fabrixxm
e9251499dd Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run() 2011-01-24 22:00:02 +01:00
Friendika
3811923c14 put birthday reminders on default network page, add smileys to private mail 2011-01-16 16:40:09 -08:00
Friendika
184f8e143e use local photo in email, email photo upload point to new url 2010-12-05 19:28:47 -08:00
Friendika
9be4b3482e drop mail delivered flag now that queue is implemented 2010-11-23 16:08:48 -08:00
Friendika
8c395f96de view directory cleanup 2010-11-15 21:02:59 -08:00
Friendika
d825db3649 lint 2010-11-07 15:46:49 -08:00
Friendika
4cba826a2f hub anomolies & swat0 compliance 2010-11-04 20:47:44 -07:00
Mike Macgirvin
f0b6400584 more lint 2010-10-31 16:38:22 -07:00