Commit graph

3590 commits

Author SHA1 Message Date
Fabio Comuni be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica 4b09566579 try again on the network page sql optimisation 2012-01-02 03:40:52 -08:00
friendica a5144518aa revert sql optimisation - js updates broken 2012-01-02 00:20:06 -08:00
friendica fb3a0baa78 long running query on network page - optimise out the double sub-select 2012-01-01 23:07:53 -08:00
friendica 0cd1f5eae4 bug #250 typo in database.sql 2012-01-01 22:46:20 -08:00
friendica d52f833c5f extensible notify structure 2012-01-01 22:44:03 -08:00
friendica 0afb636e46 change default ostatus poll interval 2012-01-01 11:45:56 -08:00
friendica 44b4baa0ca notification data type 2012-01-01 00:39:22 -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 c735582ead hide contacts on approval 2011-12-29 00:23:05 -08:00
friendica da21473c34 add notifications to d* private messages 2011-12-27 15:49:47 -08:00
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