Commit graph

11028 commits

Author SHA1 Message Date
friendica
aca8c8a13a Merge branch 'pull' 2011-12-27 14:27:39 -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
Tobias Diekershoff
f29507cdba translation of email templates 2011-12-26 09:16:33 +01:00
Tobias Diekershoff
f1b7ce6ef4 translation of email template 2011-12-26 09:08:32 +01:00
Tobias Diekershoff
02af9cd3b2 translation of the email template 2011-12-26 09:05:02 +01:00
friendica
bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica
205dcd8f5b Merge branch 'master' into notify 2011-12-25 19:14:45 -08:00
friendica
170b841834 more enotify 2011-12-25 16:20:53 -08:00
friendica
629a69f9dc Merge branch 'pull' 2011-12-25 16:06:09 -08:00
friendica
4a28832e2d revup 2011-12-25 16:05:25 -08:00
friendica
3e4fa23f3b Merge pull request #20 from Keith2/master
Spelling mistake fix using TLS not TSL
2011-12-25 15:13:20 -08:00
root
09be90be02 modified: settings.php corrected TLS email connector not working due to spelling mistake. 2011-12-25 22:52:15 +00:00
friendica
bef8f95ef3 more enotify 2011-12-24 22:36:17 -08:00
friendica
6f4f3e6929 revup 2011-12-24 22:13:44 -08:00
friendica
0b598dedd0 more work on enotify 2011-12-23 23:07:05 -08:00
friendica
202725e671 Merge branch 'master' into notify 2011-12-23 22:40:04 -08:00
friendica
fc90323cd2 revup 2011-12-23 22:39:43 -08:00
friendica
310527e061 Merge branch 'master' into notify 2011-12-23 01:44:42 -08:00
friendica
f4cd9bd2d8 preparation for 3g email contacts 2011-12-23 01:44:03 -08:00
friendica
949d3f0ff1 preparation for 3rd generation email contacts 2011-12-23 01:38:06 -08:00
friendica
aea5584bf1 Merge branch 'master' into notify 2011-12-22 16:08:17 -08:00
friendica
52137859eb improved cid search 2011-12-22 16:05:03 -08:00
friendica
95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
friendica
b602203e6c revup 2011-12-22 15:41:33 -08:00
Fabio Comuni
0dce36bdbc Merge remote-tracking branch 'friendica/master' 2011-12-22 16:35:58 +01:00
Fabio Comuni
2ef2d0b79f quattro: contacts and first photo page 2011-12-22 16:33:14 +01:00
Fabio Comuni
0b4535e6da quattro: more on editor 2011-12-22 11:24:34 +01:00
friendica
e764990ce4 better handling of the display of conflicting group permissions 2011-12-21 18:04:24 -08: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
Fabio Comuni
bf00e4dded quattro: more on editor 2011-12-21 17:36:42 +01:00
friendica
048fcae40b bug #247 2011-12-21 01:45:15 -08:00
friendica
d9ede7f7bd implement max daily registrations 2011-12-20 20:12:29 -08:00
friendica
2e088aad8d bug #246 2011-12-20 19:11:46 -08: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
c0c4c46874 remove hashchars from pub keywords 2011-12-20 03:04:20 -08:00
friendica
0bef863015 wrong style for unvisited links 2011-12-19 20:23:11 -08: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
c3d12bc77e quattro: fix icons in oauth settings page 2011-12-19 18:03:03 +01:00
Fabio Comuni
16d45e5c13 quattro: first work on jot style 2011-12-19 18:02:43 +01:00
Fabio Comuni
a6f3b58293 config: set/get arrays with pconfig 2011-12-19 18:01:38 +01:00
Fabio Comuni
84bbf5d3bd icons: lock and unlock 2011-12-19 18:00:52 +01:00
friendica
177af1fc9d jquery effects missing from zero derivatives 2011-12-19 01:23:12 -08:00