aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #592 from jeroenpraat/masterRedMatrix2014-09-131-1/+1
|\
| * Issue #590: Linked conversation titles to source. jeroenpraat2014-09-121-1/+1
* | log why this doesn't get executedfriendica2014-09-121-0/+2
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-127-468/+525
|\ \
| * | define justifiedGalleryActive in head.tpl to not break other pages autoloadmarijus2014-09-122-1/+2
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-121-2/+2
| |\ \
| | * | This is even better. Adapts better to Red user settings.Jeroen2014-09-121-2/+2
| * | | reset testing values back to defaultmarijus2014-09-121-2/+2
| * | | do not load next page if justifiedGallery() is not ready yetmarijus2014-09-122-4/+5
| |/ /
| * | H1-H6 simplified (less font sizes), remJeroen2014-09-121-0/+12
| * | expert_mode > expertJeroen2014-09-121-1/+1
| * | Fixed. Thanks to Thomas.Jeroen2014-09-121-4/+3
| * | Merge pull request #591 from tuscanhobbit/devPaolo T2014-09-122-463/+506
| |\ \
| | * | IT localization updatedtuscanhobbit2014-09-122-463/+506
| |/ /
| * | Addon count on addon settings page (featured) doesnt work (always 0). Comment...Jeroen2014-09-121-2/+3
* | | make the xchan diagnostic tool usefulfriendica2014-09-121-2/+14
* | | doc updatesfriendica2014-09-122-0/+141
|/ /
* | doc updates and a couple of issues spotted in the logs (diaspora likes, feed ...friendica2014-09-1276-879/+1147
* | bad redirectsfriendica2014-09-111-0/+6
* | sort the plugins to make it easier to compare listsfriendica2014-09-111-0/+1
* | and then make it even more usefulfriendica2014-09-111-0/+7
* | make siteinfo/json useful againfriendica2014-09-111-14/+19
* | red group/collection query calls for apifriendica2014-09-111-0/+33
* | allow bbcode in register_textfriendica2014-09-111-2/+2
* | keep the docs updated on what's happening.friendica2014-09-111-1/+1
* | don't allow an xchan to be imported with an empty name. To avoid translation ...friendica2014-09-111-2/+2
* | correct item author for feeds with multiple or different authorsfriendica2014-09-112-8/+92
* | new module - service_limits - print service class limits for logged in accoun...friendica2014-09-111-0/+23
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-111-4/+7
|\ \
| * | set items/page back to 60marijus2014-09-111-2/+2
| * | content-complete must not be in photo-album-contentsmarijus2014-09-111-1/+4
| * | typomarijus2014-09-111-1/+1
* | | add gif to supported image types (if it's supported)friendica2014-09-111-1/+1
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-110-0/+0
|\ \
| * | argh... this does not do what i thought it would...marijus2014-09-111-2/+1
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-110-0/+0
| |\ \
| * | | should probably still lock autoload during image processingmarijus2014-09-111-1/+2
* | | | issue #588 can't add feeds to collections using connedit page group sidebar w...friendica2014-09-114-3/+4
| |/ / |/| |
* | | Merge pull request #587 from git-marijus/masterRedMatrix2014-09-1112-26/+803
|\| |
| * | another day another concept - hope this works bettermarijus2014-09-115-29/+40
| * | Revert "Revert "Merge pull request #583 from git-marijus/master""marijus2014-09-119-19/+785
|/ /
* | Merge pull request #584 from tuscanhobbit/masterPaolo T2014-09-110-0/+0
|\ \
| * \ Merge pull request #2 from friendica/masterPaolo T2014-09-02221-10101/+12522
| |\ \
* | | | make sure we add the filefriendica2014-09-101-0/+3
* | | | endless scroll on connections pagefriendica2014-09-103-19/+43
* | | | disabling ability for diaspora to plustag redmatrix forums. See the notes.friendica2014-09-101-1/+5
* | | | possible solution to diaspora walltowall mistaken attributionfriendica2014-09-102-9/+22
* | | | more compatibility notesfriendica2014-09-101-0/+2
* | | | encrypt diaspora_meta since it may contain private message contentsfriendica2014-09-103-19/+47
* | | | make verify_email the default for new installs (at least English installs), a...friendica2014-09-103-1/+9