Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanup after recent changes in mod photos | marijus | 2014-09-13 | 3 | -63/+4 |
| | |||||
* | Merge pull request #592 from jeroenpraat/master | RedMatrix | 2014-09-13 | 1 | -1/+1 |
|\ | | | | | Issue #590: Linked conversation titles to source. | ||||
| * | Issue #590: Linked conversation titles to source. | jeroenpraat | 2014-09-12 | 1 | -1/+1 |
| | | | | | | If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it! | ||||
* | | log why this doesn't get executed | friendica | 2014-09-12 | 1 | -0/+2 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-12 | 7 | -468/+525 |
|\ \ | |||||
| * | | define justifiedGalleryActive in head.tpl to not break other pages autoload | marijus | 2014-09-12 | 2 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-09-12 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | This is even better. Adapts better to Red user settings. | Jeroen | 2014-09-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | reset testing values back to default | marijus | 2014-09-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | do not load next page if justifiedGallery() is not ready yet | marijus | 2014-09-12 | 2 | -4/+5 |
| |/ / | |||||
| * | | H1-H6 simplified (less font sizes), rem | Jeroen | 2014-09-12 | 1 | -0/+12 |
| | | | |||||
| * | | expert_mode > expert | Jeroen | 2014-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed. Thanks to Thomas. | Jeroen | 2014-09-12 | 1 | -4/+3 |
| | | | |||||
| * | | Merge pull request #591 from tuscanhobbit/dev | Paolo T | 2014-09-12 | 2 | -463/+506 |
| |\ \ | | | | | | | | | IT localization updated | ||||
| | * | | IT localization updated | tuscanhobbit | 2014-09-12 | 2 | -463/+506 |
| |/ / | |||||
| * | | Addon count on addon settings page (featured) doesnt work (always 0). ↵ | Jeroen | 2014-09-12 | 1 | -2/+3 |
| | | | | | | | | | | | | Commented out. | ||||
* | | | make the xchan diagnostic tool useful | friendica | 2014-09-12 | 1 | -2/+14 |
| | | | |||||
* | | | doc updates | friendica | 2014-09-12 | 2 | -0/+141 |
|/ / | |||||
* | | doc updates and a couple of issues spotted in the logs (diaspora likes, feed ↵ | friendica | 2014-09-12 | 76 | -879/+1147 |
| | | | | | | | | author import) | ||||
* | | bad redirects | friendica | 2014-09-11 | 1 | -0/+6 |
| | | |||||
* | | sort the plugins to make it easier to compare lists | friendica | 2014-09-11 | 1 | -0/+1 |
| | | |||||
* | | and then make it even more useful | friendica | 2014-09-11 | 1 | -0/+7 |
| | | |||||
* | | make siteinfo/json useful again | friendica | 2014-09-11 | 1 | -14/+19 |
| | | |||||
* | | red group/collection query calls for api | friendica | 2014-09-11 | 1 | -0/+33 |
| | | |||||
* | | allow bbcode in register_text | friendica | 2014-09-11 | 1 | -2/+2 |
| | | |||||
* | | keep the docs updated on what's happening. | friendica | 2014-09-11 | 1 | -1/+1 |
| | | |||||
* | | don't allow an xchan to be imported with an empty name. To avoid translation ↵ | friendica | 2014-09-11 | 1 | -2/+2 |
| | | | | | | | | issues we'll just make it '-'. | ||||
* | | correct item author for feeds with multiple or different authors | friendica | 2014-09-11 | 2 | -8/+92 |
| | | |||||
* | | new module - service_limits - print service class limits for logged in ↵ | friendica | 2014-09-11 | 1 | -0/+23 |
| | | | | | | | | account. It is a debugging tool and not meant to be pretty. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-11 | 1 | -4/+7 |
|\ \ | |||||
| * | | set items/page back to 60 | marijus | 2014-09-11 | 1 | -2/+2 |
| | | | |||||
| * | | content-complete must not be in photo-album-contents | marijus | 2014-09-11 | 1 | -1/+4 |
| | | | |||||
| * | | typo | marijus | 2014-09-11 | 1 | -1/+1 |
| | | | |||||
* | | | add gif to supported image types (if it's supported) | friendica | 2014-09-11 | 1 | -1/+1 |
|/ / | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-11 | 0 | -0/+0 |
|\ \ | |||||
| * | | argh... this does not do what i thought it would... | marijus | 2014-09-11 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-09-11 | 0 | -0/+0 |
| |\ \ | |||||
| * | | | should probably still lock autoload during image processing | marijus | 2014-09-11 | 1 | -1/+2 |
| | | | | |||||
* | | | | issue #588 can't add feeds to collections using connedit page group sidebar ↵ | friendica | 2014-09-11 | 4 | -3/+4 |
| |/ / |/| | | | | | | | | widget | ||||
* | | | Merge pull request #587 from git-marijus/master | RedMatrix | 2014-09-11 | 12 | -26/+803 |
|\| | | | | | | | | try once more :) | ||||
| * | | another day another concept - hope this works better | marijus | 2014-09-11 | 5 | -29/+40 |
| | | | |||||
| * | | Revert "Revert "Merge pull request #583 from git-marijus/master"" | marijus | 2014-09-11 | 9 | -19/+785 |
|/ / | | | | | | | This reverts commit 08638f3ec88e86def618ff89bdedb9ae9696d218. | ||||
* | | Merge pull request #584 from tuscanhobbit/master | Paolo T | 2014-09-11 | 0 | -0/+0 |
|\ \ | | | | | | | Merge pull request #2 from friendica/master | ||||
| * \ | Merge pull request #2 from friendica/master | Paolo T | 2014-09-02 | 221 | -10101/+12522 |
| |\ \ | | | | | | | | | Merge from main project | ||||
* | | | | make sure we add the file | friendica | 2014-09-10 | 1 | -0/+3 |
| | | | | |||||
* | | | | endless scroll on connections page | friendica | 2014-09-10 | 3 | -19/+43 |
| | | | | |||||
* | | | | disabling ability for diaspora to plustag redmatrix forums. See the notes. | friendica | 2014-09-10 | 1 | -1/+5 |
| | | | | |||||
* | | | | possible solution to diaspora walltowall mistaken attribution | friendica | 2014-09-10 | 2 | -9/+22 |
| | | | | |||||
* | | | | more compatibility notes | friendica | 2014-09-10 | 1 | -0/+2 |
| | | | | |||||
* | | | | encrypt diaspora_meta since it may contain private message contents | friendica | 2014-09-10 | 3 | -19/+47 |
| | | | |