Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 93563370c9 Merge remote-tracking branch 'friendica/master' Fabio Comuni 2012-01-03 21:14:48 +01:00
• 184230e068 check count before foreach friendica 2012-01-02 22:58:09 -08:00
• 0db637bf00 hopefully this will speed up the network updates a wee bit more friendica 2012-01-02 19:33:26 -08:00
• 71377291ba that didn't work - revert friendica 2012-01-02 18:50:28 -08:00
• f4b1d335a5 sql optimisation cont. friendica 2012-01-02 18:40:38 -08:00
• 4c35a6b0d7 conversation sql optimisations friendica 2012-01-02 16:54:37 -08:00
• f1ee5f48d4 Merge branch 'pull' friendica 2012-01-02 14:04:08 -08:00
• 3f2a492ce7 revup friendica 2012-01-02 13:59:50 -08:00
• bbf491d52b Merge pull request #21 from fabrixxm/fixinstall fabrixxm 2012-01-02 13:35:23 -08:00
• c7bfd1e1ba install: fix install procedure Fabio Comuni 2012-01-02 20:16:28 +01:00
• 1fbffc76b1 text: "turn off" logger() if module is "install" Fabio Comuni 2012-01-02 20:11:06 +01:00
• 85fbdb00ac dba: leave unconnected if $server and $user are not defined Fabio Comuni 2012-01-02 20:10:23 +01:00
• f35109827b datetime: new field_timezone() function, new template field_select_raw.tpl Fabio Comuni 2012-01-02 20:09:25 +01:00
• be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica Fabio Comuni 2012-01-02 15:32:37 +01:00
• 4b09566579 try again on the network page sql optimisation friendica 2012-01-02 03:40:52 -08:00
• a5144518aa revert sql optimisation - js updates broken friendica 2012-01-02 00:20:06 -08:00
• fb3a0baa78 long running query on network page - optimise out the double sub-select friendica 2012-01-01 23:07:53 -08:00
• 0cd1f5eae4 bug #250 typo in database.sql friendica 2012-01-01 22:46:20 -08:00
• d52f833c5f extensible notify structure friendica 2012-01-01 22:44:03 -08:00
• 0afb636e46 change default ostatus poll interval friendica 2012-01-01 11:45:56 -08:00
• 44b4baa0ca notification data type friendica 2012-01-01 00:39:22 -08:00
• 3e162bcf8f function not defined friendica 2011-12-30 20:48:49 -08:00
• a76be1934a migrate more notifications friendica 2011-12-29 22:32:30 -08:00
• c735582ead hide contacts on approval friendica 2011-12-29 00:23:05 -08:00
• da21473c34 add notifications to d* private messages friendica 2011-12-27 15:49:47 -08:00
• aca8c8a13a Merge branch 'pull' friendica 2011-12-27 14:27:39 -08:00
• 0f87f84cfb notification testing friendica 2011-12-27 14:26:44 -08:00
• 5c7df6e964 notify_intro friendica 2011-12-26 15:47:40 -08:00
• 356c05c6b3 extending notifications to other types friendica 2011-12-26 14:16:25 -08:00
• f29507cdba translation of email templates Tobias Diekershoff 2011-12-26 09:16:33 +01:00
• f1b7ce6ef4 translation of email template Tobias Diekershoff 2011-12-26 09:08:32 +01:00
• 02af9cd3b2 translation of the email template Tobias Diekershoff 2011-12-26 09:05:02 +01:00
• bb40e54dec new notification module working for "email message received" friendica 2011-12-25 23:00:19 -08:00
• 205dcd8f5b Merge branch 'master' into notify friendica 2011-12-25 19:14:45 -08:00
• 170b841834 more enotify friendica 2011-12-25 16:20:53 -08:00
• 629a69f9dc Merge branch 'pull' friendica 2011-12-25 16:06:09 -08:00
• 4a28832e2d revup friendica 2011-12-25 16:05:25 -08:00
• 3e4fa23f3b Merge pull request #20 from Keith2/master friendica 2011-12-25 15:13:20 -08:00
• 09be90be02 modified: settings.php corrected TLS email connector not working due to spelling mistake. root 2011-12-25 22:52:15 +00:00
• bef8f95ef3 more enotify friendica 2011-12-24 22:36:17 -08:00
• 6f4f3e6929 revup friendica 2011-12-24 22:13:44 -08:00
• 0b598dedd0 more work on enotify friendica 2011-12-23 23:07:05 -08:00
• 202725e671 Merge branch 'master' into notify friendica 2011-12-23 22:40:04 -08:00
• fc90323cd2 revup friendica 2011-12-23 22:39:43 -08:00
• 310527e061 Merge branch 'master' into notify friendica 2011-12-23 01:44:42 -08:00
• f4cd9bd2d8 preparation for 3g email contacts friendica 2011-12-23 01:44:03 -08:00
• 949d3f0ff1 preparation for 3rd generation email contacts friendica 2011-12-23 01:38:06 -08:00
• aea5584bf1 Merge branch 'master' into notify friendica 2011-12-22 16:08:17 -08:00
• 52137859eb improved cid search friendica 2011-12-22 16:05:03 -08:00
• 95b4bc55bf Merge branch 'master' into notify friendica 2011-12-22 15:42:01 -08:00
• b602203e6c revup friendica 2011-12-22 15:41:33 -08:00
• 0dce36bdbc Merge remote-tracking branch 'friendica/master' Fabio Comuni 2011-12-22 16:35:58 +01:00
• 2ef2d0b79f quattro: contacts and first photo page Fabio Comuni 2011-12-22 16:33:14 +01:00
• 0b4535e6da quattro: more on editor Fabio Comuni 2011-12-22 11:24:34 +01:00
• e764990ce4 better handling of the display of conflicting group permissions friendica 2011-12-21 18:04:24 -08:00
• dacbbfaafb bug #188 diaspora_signed_retraction not removing post friendica 2011-12-21 14:42:12 -08:00
• 7f2070ca91 Merge remote-tracking branch 'friendica/master' Fabio Comuni 2011-12-21 17:37:35 +01:00
• bf00e4dded quattro: more on editor Fabio Comuni 2011-12-21 17:36:42 +01:00
• 048fcae40b bug #247 friendica 2011-12-21 01:45:15 -08:00
• d9ede7f7bd implement max daily registrations friendica 2011-12-20 20:12:29 -08:00
• 2e088aad8d bug #246 friendica 2011-12-20 19:11:46 -08:00
• 7fbfbdae07 audio/video bb tags showing up on Diaspora friendica 2011-12-20 17:01:41 -08:00
• ba732c97c1 Merge remote-tracking branch 'friendica/master' Fabio Comuni 2011-12-20 17:18:19 +01:00
• f3b499f119 quattro: more on editor Fabio Comuni 2011-12-20 17:17:17 +01:00
• c0c4c46874 remove hashchars from pub keywords friendica 2011-12-20 03:04:20 -08:00
• 0bef863015 wrong style for unvisited links friendica 2011-12-19 20:23:11 -08:00
• 63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly friendica 2011-12-19 19:06:25 -08:00
• 79f3bbbf2b more data checking, cleans up some infrequent php errors friendica 2011-12-19 16:51:57 -08:00
• 7c6bc5a93d invalid thread-id in "nouveau" mode of conversation, bug 245 friendica 2011-12-19 13:51:55 -08:00
• 2a3f94e452 Merge remote-tracking branch 'friendica/master' Fabio Comuni 2011-12-19 18:04:04 +01:00
• c3d12bc77e quattro: fix icons in oauth settings page Fabio Comuni 2011-12-19 18:03:03 +01:00
• 16d45e5c13 quattro: first work on jot style Fabio Comuni 2011-12-19 18:02:43 +01:00
• a6f3b58293 config: set/get arrays with pconfig Fabio Comuni 2011-12-19 18:01:38 +01:00
• 84bbf5d3bd icons: lock and unlock Fabio Comuni 2011-12-19 18:00:52 +01:00
• 177af1fc9d jquery effects missing from zero derivatives friendica 2011-12-19 01:23:12 -08:00
• ad54a91d4d poco_load aborting after debug statement friendica 2011-12-19 00:40:00 -08:00
• dc46a01cd4 suggest query for no friends messed up friendica 2011-12-18 13:03:20 -08:00
• eb05d00794 connect on suggest/match - added to testbubble friendica 2011-12-18 12:51:45 -08:00
• 622886a33c make mod-follow "get"-able friendica 2011-12-18 12:41:46 -08:00
• 5d6a098ce0 add connect link to suggestion and matches friendica 2011-12-18 01:44:46 -08:00
• 974a52a16d add connect link to friend suggest friendica 2011-12-18 01:08:32 -08:00
• e6b538c046 add webfinger addr to gcontact for friend "connect" links friendica 2011-12-18 00:50:17 -08:00
• c4a5fcaf27 fix xml poco for arrays friendica 2011-12-18 00:39:15 -08:00
• 3aab1c7140 typo friendica 2011-12-18 00:22:44 -08:00
• b0718c4f05 typo friendica 2011-12-18 00:21:01 -08:00
• 978717a247 add webfinger to poco, if present friendica 2011-12-18 00:14:34 -08:00
• 22d59350e9 improve the email regex a bit more friendica 2011-12-16 14:31:39 -08:00
• 690b3f57b7 bug 241 - valid emails may contain + on lhs friendica 2011-12-16 14:06:50 -08:00
• efb9157490 eliminate dup identical hashtags in posts friendica 2011-12-16 01:42:45 -08:00
• 193435e980 default suggestions not being collected properly friendica 2011-12-15 13:52:52 -08:00
• cc5fd0a136 revup friendica 2011-12-15 12:50:34 -08:00
• 6d7781434b must use named vars in plugin args friendica 2011-12-15 01:09:38 -08:00
• cb2e68c88e home_init hook friendica 2011-12-15 01:08:19 -08:00
• 001e402311 simplify live update friendica 2011-12-14 17:23:41 -08:00
• 9768adf719 testing friendica 2011-12-14 16:43:37 -08:00
• 84fd2a1501 live update glitches cont. friendica 2011-12-14 15:51:13 -08:00
• ce44e4016a Merge branch 'pull' friendica 2011-12-14 14:19:16 -08:00
• 431a4abd25 name change stragglers, fix newmember links, liveupdate glitch friendica 2011-12-14 14:17:48 -08:00
• 8afa852c5f Merge pull request #19 from fabrixxm/master fabrixxm 2011-12-14 07:12:19 -08:00
• 49507a4356 Update messages.po Fabio Comuni 2011-12-14 16:11:07 +01:00