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

• 6f11f20992 first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted friendica 2015-01-20 15:35:42 -08:00
• 70fb47248b Merge https://github.com/friendica/red into pending_merge friendica 2015-01-20 14:05:22 -08:00
• 7875b79f2f get rid of really old poco records once weekly friendica 2015-01-20 14:04:44 -08:00
• 43326a26b7 css fixes - hopefully marijus 2015-01-20 22:19:51 +01:00
• 5ee815b2fa satisfy the floated images marijus 2015-01-20 21:10:41 +01:00
• 33380b3c30 as a workaround make nav-search dropdown behave a little better marijus 2015-01-20 15:00:44 +01:00
• 9d5e972013 poco rating variable getting over-written before local storage. friendica 2015-01-19 20:36:13 -08:00
• e3041b80fd oauth permissions table friendica 2015-01-19 20:06:12 -08:00
• ced0685d67 Change link label from Feature settings to Feature/Addon settings to more accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true). friendica 2015-01-19 15:18:44 -08:00
• 43d2703e92 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-19 14:32:25 -08:00
• ec6e147935 put cloud back in get_cloudpath - just have to be careful where we use it. friendica 2015-01-19 14:31:45 -08:00
• abddaccb5f Merge pull request #870 from pafcu/autocomplete_fix RedMatrix 2015-01-20 08:48:26 +11:00
• 9cd522a790 Fix autocomplete with groups Stefan Parviainen 2015-01-19 20:42:57 +01:00
• ab2db9e819 Merge pull request #868 from pafcu/autocomplete_fix git-marijus 2015-01-19 19:10:36 +01:00
• f55a312c17 Fix issue #865. Stefan Parviainen 2015-01-19 15:35:06 +01:00
• 2372d9b42a make typo.php descend into include/RedDAV friendica 2015-01-18 19:28:32 -08:00
• 21da3443f3 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-18 19:25:10 -08:00
• 4c45068d70 typo friendica 2015-01-18 19:24:59 -08:00
• 7420896693 allow system-loaded (i.e. pecl-oauth) to coexist Habeas Codice 2015-01-18 18:41:11 -08:00
• aeed498752 fix postgres escaping Habeas Codice 2015-01-18 18:40:33 -08:00
• 547d852ef7 fix update 1131 for postgres databases Habeas Codice 2015-01-18 18:33:32 -08:00
• 89a2012f7f remove all hardwired references to 'cloud' in the files interfaces and replace with $a->module. It's OK to leave them in the RedBrowser component because this will remain under /cloud. All the DAV bits need to be abstracted as they will eventually end up under /dav. $a->module will contain the correct string to use. friendica 2015-01-18 17:52:09 -08:00
• a71e57cebf remove unrecognised code comment from markdown text. friendica 2015-01-18 17:13:12 -08:00
• 9924a39e45 Merge pull request #866 from redswede/dev_redswede RedMatrix 2015-01-19 12:12:31 +11:00
• 673556a847 don't unset a directory server which has no active channels and hence will never have a site table update. Do this by probing the sys channel of that directory weekly and checking the directory status returned by it. friendica 2015-01-18 16:43:46 -08:00
• 08038eafb4 Merge branch 'master' of git://github.com/friendica/red into dev_redswede RedSwede 2015-01-19 00:45:32 +01:00
• 5d30565c66 Merge pull request #863 from einervonvielen/Fix_bbcode_toc_for_help_pages RedMatrix 2015-01-19 10:19:38 +11:00
• 39dad87adc Merge pull request #862 from pafcu/help RedMatrix 2015-01-19 10:19:08 +11:00
• af75120fd0 Merge pull request #864 from git-marijus/master RedMatrix 2015-01-19 10:18:40 +11:00
• cfd983b750 translation of 2 helpfiles to swedish RedSwede 2015-01-19 00:16:57 +01:00
• a1ab658df1 Added table of contents for FAQs doc Einer von Vielen 2015-01-18 17:47:31 +01:00
• b4faf4d90b fix link marijus 2015-01-18 15:31:13 +01:00
• 9ac0922ff2 fix goaway link marijus 2015-01-18 15:29:05 +01:00
• 973398b915 fix profile tabs link marijus 2015-01-18 15:15:48 +01:00
• 1c2d956d7f basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete() marijus 2015-01-18 14:44:58 +01:00
• 123ca1d403 Fixed bbode element toc for webpages Einer von Vielen 2015-01-18 14:21:26 +01:00
• 1075bb234f Database schema documentation Stefan Parviainen 2015-01-18 12:36:51 +01:00
• 319b279b3a Don't try to open unexisting files in help Stefan Parviainen 2015-01-18 10:26:05 +01:00
• 6657712714 Merge pull request #859 from einervonvielen/Issue_846_view_calendar_event pafcu 2015-01-18 08:19:03 +02:00
• 235181ead5 Fixed #846 Viewing event from calendar displays event Einer von Vielen 2015-01-18 01:31:22 +01:00
• da94dbe331 Merge pull request #858 from pafcu/master pafcu 2015-01-17 14:21:22 +02:00
• 8c6576baa5 Remove accidental logging Stefan Parviainen 2015-01-17 13:18:13 +01:00
• 6f120ad122 Fix bug with groups and autocomplete Stefan Parviainen 2015-01-17 13:16:22 +01:00
• 1d7bd0ba90 Looked through the whole doc/-folder more or less. Added and commented a few things here and there. RedSwede 2015-01-17 00:19:22 +01:00
• d5c85ea1bc edited the text to better reflect how the system works from a user perspective. RedSwede 2015-01-16 22:09:12 +01:00
• 203c345bde Merge pull request #856 from pafcu/master pafcu 2015-01-16 20:27:26 +02:00
• 334d496bb1 Fix some issues with tagging. Stefan Parviainen 2015-01-16 19:10:34 +01:00
• 2016342cf2 more doc updates friendica 2015-01-16 00:53:55 -08:00
• 8f8700ddd2 mod_prep usability enhancements, doc updates friendica 2015-01-16 00:53:04 -08:00
• 9bedb38621 validate poco chatrooms before storing friendica 2015-01-15 20:59:26 -08:00
• ec4d3a2349 fix to poco chatrooms friendica 2015-01-15 20:56:55 -08:00
• 43254029ad errors in mod_poco friendica 2015-01-15 20:43:53 -08:00
• dfe31dc3b7 more heavy lifting on poco rep friendica 2015-01-15 19:05:42 -08:00
• 10960be69d document the poco reputation kill switch friendica 2015-01-15 17:57:11 -08:00
• 9c15844845 make sure mod/prep follows the poco_rating allow preference friendica 2015-01-15 17:50:24 -08:00
• 6cd26c3590 Merge branch 'pocorate' friendica 2015-01-15 17:34:53 -08:00
• 597b07e8cc poco rating - add a test module for pulling out ratings friendica 2015-01-15 17:32:41 -08:00
• e7932d97a2 editing stuff for poco reputation friendica 2015-01-15 16:37:47 -08:00
• 35276c2da9 backend for mailhost addon friendica 2015-01-15 14:40:00 -08:00
• f57a652e6b Merge https://github.com/friendica/red into pending_merge friendica 2015-01-15 14:08:35 -08:00
• 1c9299ed42 more backend work on poco rating friendica 2015-01-15 14:05:18 -08:00
• 8d46cda021 revup friendica 2015-01-15 13:34:41 -08:00
• f9f23bd6c9 Merge pull request #854 from pafcu/fixcollapse pafcu 2015-01-15 23:17:06 +02:00
• 478a612aeb Actually fix problem with post collapsing in webkit-based browsers Stefan Parviainen 2015-01-15 22:08:50 +01:00
• 6089038407 Merge pull request #853 from friendica/revert-852-master mrjive 2015-01-15 17:21:24 +01:00
• b316df620b Revert "Merge pull request #1 from friendica/master" mrjive 2015-01-15 17:21:14 +01:00
• 4c0804cdbd Merge pull request #852 from mrjive/master mrjive 2015-01-15 17:20:57 +01:00
• 56bc3bcdce provide correct permissions role default for old-timers that didn't have any role configured. friendica 2015-01-14 19:27:55 -08:00
• 2e89c13229 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-14 18:37:28 -08:00
• 168b67fa41 correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work friendica 2015-01-14 18:36:23 -08:00
• b37915a40e Merge pull request #850 from einervonvielen/toc RedMatrix 2015-01-15 11:22:57 +11:00
• d6ae124bbd ignore bbcode open tag (left bracket) in hash and mention tag regexes and turn it into a tag delimiter friendica 2015-01-14 16:00:21 -08:00
• 7a24943c34 some back-end code to support location activity objects. Work in progress. friendica 2015-01-14 14:46:01 -08:00
• 25e090148d federate consensus items (in network only). Work in progress. friendica 2015-01-14 14:15:04 -08:00
• 1005618faf honor disable_discover_tab in mod/home - it isn't a tab here but basically block public content from showing if it's set. friendica 2015-01-14 13:52:34 -08:00
• dfab241692 Merge remote-tracking branch 'upstream/master' into toc Einer von Vielen 2015-01-14 22:49:16 +01:00
• 09129cbe5f Added a table of content as bbcode element [toc] for webpages 2015-01-14 22:47:54 +01:00
• 7090b58f68 check mentions against the appropriate xchan_url and not a hard-coded /channel/ string friendica 2015-01-13 20:54:27 -08:00
• a93f2b1b8f now that's useful... friendica 2015-01-13 18:41:11 -08:00
• dfdef0af0d provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account. friendica 2015-01-13 18:30:30 -08:00
• 98acefe228 revert recent 3.0 changes to mod/cloud so we can work on this completely in another branch and not destabilise core friendica 2015-01-13 18:12:04 -08:00
• bd5f00fa05 Merge branch 'pafcu-moretagging' friendica 2015-01-13 18:08:13 -08:00
• 111bbe65d9 Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging friendica 2015-01-13 18:07:49 -08:00
• e528483d81 hide friends broken, add parameter for item search by verb friendica 2015-01-13 14:42:54 -08:00
• 47a2668b30 Allow tags in event description and location Stefan Parviainen 2015-01-13 18:23:52 +01:00
• 93735df2c7 Allow tags in mail, many profile fields, and admin info Stefan Parviainen 2015-01-13 17:54:40 +01:00
• 2fc0d64139 uninitialised theme parent in mod/cloud friendica 2015-01-12 19:29:43 -08:00
• 1b3e52af2d theme toggle issue when viewing mod/cloud of another channel friendica 2015-01-12 18:33:39 -08:00
• 2f9fe0280e document the pros and cons of the not-yet written hassle-free connection auto-permission setting. friendica 2015-01-12 17:20:28 -08:00
• 66cef7531a don't wipe out the item body of a linked item to a photo when doing a normal delete and not forced friendica 2015-01-12 16:36:10 -08:00
• cdc52ba884 change deletion behaviour of linked photo items. Previously deleting the visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time. friendica 2015-01-12 16:27:27 -08:00
• 43b877caa1 Test ...with table of content. jquery.tableofconent.js works bunt not properly Einer von Vielen 2015-01-13 00:06:44 +01:00
• 9fc9af87e3 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-12 11:26:11 -08:00
• 962c6207ae double perms msg friendica 2015-01-12 11:25:48 -08:00
• a0134de28a Merge pull request #844 from pafcu/moretagging pafcu 2015-01-12 21:07:54 +02:00
• adc9564b5c Refactor mention code to make it more reusable Stefan Parviainen 2015-01-12 20:01:07 +01:00
• 55eb6be308 Merge pull request #842 from pafcu/master pafcu 2015-01-12 18:16:47 +02:00
• cce51f5a49 Possibly fix issue with readmore.js collapse Stefan Parviainen 2015-01-12 17:11:03 +01:00
• 580c30f516 another attempt to explain default permissions on connedit page friendica 2015-01-11 21:18:29 -08:00
• a088a8f03c remove extraneous debug file left over from postgres work. friendica 2015-01-11 20:02:24 -08:00