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

• 7cbb69d87f tagging Friendika 2011-10-23 00:24:37 -07:00
• 0ada550a02 queue indexes Friendika 2011-10-22 01:29:26 -07:00
• 3783d8860c Merge branch 'pull' Friendika 2011-10-21 12:58:52 -07:00
• 1a78416631 revup Friendika 2011-10-21 12:58:16 -07:00
• a06c9768be Merge pull request #34 from fabrixxm/master fabrixxm 2011-10-21 07:32:12 -07:00
• d80c0da3c0 add custom style to object tag in tinymce Fabio Comuni 2011-10-21 16:26:57 +02:00
• 6769436f3b oembed. fix html2bbcode when oembed html contains span and utf8 chars Fabio Comuni 2011-10-21 16:26:29 +02:00
• 6e76c86ad2 queue api + queue limits Friendika 2011-10-21 03:33:34 -07:00
• d1833cabf6 fix hex2bin for empty input Friendika 2011-10-20 19:11:34 -07:00
• 01164c8c2f fix various html parse errors Friendika 2011-10-20 16:48:07 -07:00
• bef7a5d66b bug #183 - strlen borking on sysmsg, which is now an array Friendika 2011-10-20 14:55:40 -07:00
• b06588ffa1 Initial work adding oauth to api Fabio Comuni 2011-10-20 15:57:35 +02:00
• da416e0181 bug in diaspora_reshare Friendika 2011-10-20 05:43:33 -07:00
• 96c0598737 diaspora_reshare - even more logging Friendika 2011-10-20 03:56:10 -07:00
• 796056f810 provide link to missing d* images Friendika 2011-10-20 02:21:57 -07:00
• 852ece39f4 more reshare logging to see what's going on Friendika 2011-10-20 02:07:38 -07:00
• 33af8b0e20 diaspora_reshare - another try Friendika 2011-10-20 01:16:03 -07:00
• df996a8b5e fix for errant top-level posts from feeds Friendika 2011-10-19 21:54:33 -07:00
• c4179d989f more debug reshare Friendika 2011-10-19 21:34:48 -07:00
• 10b2661176 suppress blank diaspora messages which are awaiting a photo that hasn't arrived Friendika 2011-10-19 15:18:41 -07:00
• 19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order Friendika 2011-10-19 15:08:16 -07:00
• 1148cbab22 fix img link format diaspora share/asphoto Friendika 2011-10-19 00:29:43 -07:00
• 9043e704f8 diaspora reshares Friendika 2011-10-18 15:56:35 -07:00
• b14914ee2e fix tb tabs Friendika 2011-10-18 13:07:27 -07:00
• 32808a934d string update Friendika 2011-10-18 04:28:36 -07:00
• fb5bddb98f a few issues with diaspora_profile Friendika 2011-10-18 01:12:51 -07:00
• 85c644a828 Merge branch 'pull' Friendika 2011-10-18 00:28:53 -07:00
• 06096486d4 hopefully solve db update issues bug #182 Friendika 2011-10-18 00:18:21 -07:00
• a19b33651e Merge pull request #33 from fabrixxm/master fabrixxm 2011-10-17 23:56:02 -07:00
• 3e5a2cb07b template field_openid Fabio Comuni 2011-10-18 08:53:01 +02:00
• cc5974e6c2 Merge pull request #32 from tobiasd/master tobiasd 2011-10-17 23:21:00 -07:00
• 307b707983 fix for the button height Tobias Diekershoff 2011-10-18 08:17:52 +02:00
• 0f24f3b505 post/comment order options Friendika 2011-10-17 18:24:23 -07:00
• 42a9817350 "cubbi.es" Friendika 2011-10-17 17:39:25 -07:00
• f0dc77ab6c Merge branch 'pull' Friendika 2011-10-17 14:55:46 -07:00
• 278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora Friendika 2011-10-17 14:52:03 -07:00
• e15aab9b75 Merge pull request #31 from tobiasd/master tobiasd 2011-10-17 08:41:27 -07:00
• 9254c13f62 reverted rewrite base Tobias Diekershoff 2011-10-17 17:40:00 +02:00
• 399f630b10 Merge pull request #30 from fabrixxm/master fabrixxm 2011-10-17 08:20:26 -07:00
• 5830682e0c another fix to tabs in notifications Fabio Comuni 2011-10-17 17:14:10 +02:00
• b22ab4e308 fix buttons in quattro Fabio Comuni 2011-10-17 17:11:49 +02:00
• a2dc8bad2e fix tabs in notifications Fabio Comuni 2011-10-17 16:54:21 +02:00
• de44072172 works on login form Fabio Comuni 2011-10-17 16:53:59 +02:00
• 2116943964 Merge remote-tracking branch 'friendika/master' Fabio Comuni 2011-10-17 16:37:37 +02:00
• 1df892ebbc Merge pull request #29 from tobiasd/master tobiasd 2011-10-16 23:08:45 -07:00
• 2650ba49c1 video button only for dispy and quattro Tobias Diekershoff 2011-10-17 07:48:33 +02:00
• b820dfa31f revup Friendika 2011-10-16 01:46:00 -07:00
• 5dcc10a5d9 working on long-term solution to relay issue Friendika 2011-10-15 03:26:37 -07:00
• af6ab38100 diaspora birthday notifications Friendika 2011-10-14 00:20:37 -07:00
• 05e26e4895 handle diaspora profile update message Friendika 2011-10-13 18:32:02 -07:00
• 89c771a26e remove queued items for contact when removing contact Friendika 2011-10-13 15:39:05 -07:00
• 4eae1e5d8a don't propagate deletions for other people's stuff Friendika 2011-10-13 15:32:43 -07:00
• d60505ffb0 missing arg xmlize x is friends with y Friendika 2011-10-13 01:12:03 -07:00
• 2911bf9434 sql issue item_store Friendika 2011-10-13 01:00:06 -07:00
• ac3a6d1d1e Merge branch 'pull' Friendika 2011-10-12 02:28:31 -07:00
• 3db43d5a39 storage race condition Friendika 2011-10-12 02:21:18 -07:00
• f19764c93a Merge pull request #28 from tobiasd/master tobiasd 2011-10-12 00:34:36 -07:00
• 98e50a0559 better do all the buttons (quattro) Tobias Diekershoff 2011-10-12 09:28:19 +02:00
• 714319457c little bit more for quattro Tobias Diekershoff 2011-10-12 08:06:41 +02:00
• 0fb119496e some work on quattro theme Tobias Diekershoff 2011-10-12 07:47:41 +02:00
• df7702709b common tabs to notifications and mail Friendika 2011-10-11 21:30:23 -07:00
• 3ef7dcac4b solve intro/notify naming issue by providing both or either, theme decides what to do Friendika 2011-10-11 20:38:09 -07:00
• 2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in. Friendika 2011-10-11 19:27:58 -07:00
• 557a7d0cec stuff - background the external network notifications (Facebook, Twitter, Statusnet) - add vimeo support - consolidate editor video options (insert video, regardless of source) - add "Connector Settings" page purely for configuring connectors - moved mailbox settings to Connectors - Move the "Connect/Follow" dialogue out of "find people" and move to top. - Add "Find People" dialogue - minor theme edits on duepuntozero and testbubble to make all this stuff work - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos. Friendika 2011-10-11 18:24:37 -07:00
• caf18164f0 Merge branch 'pull' Friendika 2011-10-10 12:56:51 -07:00
• 06c268b3db revup Friendika 2011-10-10 12:56:15 -07:00
• 906addf865 common_tabs in notifications.php Fabio Comuni 2011-10-10 17:01:14 +02:00
• e9eb15373f Remove full profile html from php and add new template 'profile_advanced.tpl' Fabio Comuni 2011-10-10 16:48:38 +02:00
• 2ea2e7f4b4 Merge pull request #27 from fabrixxm/master fabrixxm 2011-10-10 07:41:23 -07:00
• 070e081ae9 Fix url in profile tabs Fabio Comuni 2011-10-10 16:40:12 +02:00
• ed07a4def3 Merge pull request #26 from fabrixxm/master fabrixxm 2011-10-10 07:33:41 -07:00
• f64e2d63b9 New common tab template. Update css Fabio Comuni 2011-10-10 15:28:34 +02:00
• 3174847de8 bug #177 - birthday month on profile incorrect if October or later and no year Friendika 2011-10-10 01:03:34 -07:00
• 077726a193 redo Friendika 2011-10-10 00:26:52 -07:00
• 1cfeb61ddc more notification cleanup duepuntozero Friendika 2011-10-09 21:34:07 -07:00
• 26f2c868da some notification text cleanup and notification page layout fixes for duepuntozero Friendika 2011-10-09 20:26:17 -07:00
• 0657baa0b2 Merge branch 'pull' Friendika 2011-10-09 15:50:49 -07:00
• 9f4d3bf567 add first,last to D* vcard Friendika 2011-10-09 15:49:51 -07:00
• 2f98de1e74 Merge pull request #25 from duthied/master duthied 2011-10-08 22:05:47 -07:00
• c49ab66be8 fix for comment on line 117 from github Devlon Duthie 2011-10-09 00:02:24 -05:00
• 0e401b5ad8 Merge pull request #24 from duthied/master duthied 2011-10-08 21:27:20 -07:00
• fd6220fb7e added sorting to drop-down notifications list, added posts to this list as well (now the counts match the items) fixed up a couple of typos Devlon Duthie 2011-10-08 23:24:16 -05:00
• 0963470404 Merge pull request #23 from duthied/master duthied 2011-10-08 20:52:31 -07:00
• 8eedbf30f1 added posts to network section of the notifications page Devlon Duthie 2011-10-08 22:45:48 -05:00
• 91bc2fc9b6 Merge branch 'pull' Friendika 2011-10-08 18:38:14 -07:00
• 999f284ed1 Merge pull request #22 from duthied/master duthied 2011-10-08 17:38:22 -07:00
• dfc65f1502 fix for z-index on wall-to-wall avatars in testbubble theme Devlon Duthie 2011-10-08 19:32:40 -05:00
• fe0ac848d5 Merge branch 'pull' Friendika 2011-10-08 15:23:53 -07:00
• 43973e455a revup Friendika 2011-10-08 15:23:19 -07:00
• 986c31c7b8 Merge pull request #21 from duthied/master duthied 2011-10-08 15:00:11 -07:00
• 2cba65bd38 fix for 'show all notifications' on notifications drop-down to handle installations in sub-directories + fix for friend notifications (eg: joe became friends with sam) Devlon Duthie 2011-10-08 16:57:00 -05:00
• 2474531451 bug #175 - hide_help config option not working Friendika 2011-10-08 02:05:33 -07:00
• 1d05c564d4 missing arg to diaspora_transmit from share/unshare Friendika 2011-10-07 15:49:41 -07:00
• 72af2d610b Merge pull request #20 from duthied/master duthied 2011-10-06 23:29:44 -07:00
• f5fc8dabe5 Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme Devlon Duthie 2011-10-07 01:25:08 -05:00
• 2802c142cb local_deliver testing Friendika 2011-10-06 19:10:57 -07:00
• 53efeb8d1f local deliver 1 Friendika 2011-10-06 17:27:37 -07:00
• 272b838233 revup Friendika 2011-10-06 17:26:27 -07:00
• e232c50c9e check author url to see if it matches current contact before relay is accepted Friendika 2011-10-06 00:26:25 -07:00
• ce11d231b8 use strpos instead of strstr, faster Friendika 2011-10-05 21:04:53 -07:00