Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-06 | 6 | -33/+48 |
|\ | |||||
| * | Merge pull request #309 from dawnbreak/master | redmatrix | 2015-04-07 | 6 | -33/+48 |
| |\ | | | | | | | Fix Design Tool navigation for sys channel. | ||||
| | * | Fix Design Tool navigation for sys channel. | Klaus Weidenbach | 2015-04-06 | 6 | -33/+48 |
| |/ | | | | | | | Fix creating menu for sys channel. | ||||
* / | make the findpeople widget honour the local/global directory setting | friendica | 2015-04-06 | 2 | -2/+2 |
|/ | |||||
* | issue #226 | friendica | 2015-04-05 | 3 | -3/+7 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-03 | 4 | -963/+1079 |
|\ | |||||
| * | Update/fix Dutch and removing an ugly space | jeroenpraat | 2015-04-02 | 4 | -963/+1079 |
| | | |||||
* | | strings update | friendica | 2015-04-03 | 2 | -1641/+1629 |
| | | |||||
* | | provide ability to have randomised homepage content from a set of pages name ↵ | friendica | 2015-04-02 | 2 | -3/+7 |
|/ | | | | home-* | ||||
* | update resource links | friendica | 2015-04-01 | 14 | -20/+19 |
| | |||||
* | please update your repository pointers to https://github.com/redmatrix/redmatrix | friendica | 2015-04-01 | 1 | -0/+2 |
| | |||||
* | open bbcode tag | friendica | 2015-04-01 | 1 | -0/+11 |
| | |||||
* | revert iconic change to collection list widget | friendica | 2015-04-01 | 3 | -3/+5 |
| | |||||
* | fix regdir | friendica | 2015-03-31 | 3 | -6/+13 |
| | |||||
* | more logging for onepoll | friendica | 2015-03-31 | 1 | -1/+1 |
| | |||||
* | make search box border radius consistent with everything else. It looks ↵ | friendica | 2015-03-31 | 1 | -1/+1 |
| | | | | really weird when it's so different. | ||||
* | allow webpage for home to use its own layout file | friendica | 2015-03-31 | 3 | -1/+16 |
| | |||||
* | some DB documentation | friendica | 2015-03-30 | 5 | -42/+62 |
| | |||||
* | don't included any deleted posts in the self query | friendica | 2015-03-30 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-30 | 2 | -626/+718 |
|\ | |||||
| * | Merge pull request #945 from tuscanhobbit/dev | Paolo T | 2015-03-30 | 2 | -626/+718 |
| |\ | | | | | | | Italian translation | ||||
| | * | Italian translation | tuscanhobbit | 2015-03-30 | 2 | -626/+718 |
| | | | |||||
* | | | title of preview button incorrect, fix ability to upload to webpages | friendica | 2015-03-30 | 4 | -4/+7 |
|/ / | |||||
* | | change "create new collection" to iconic, document the account table | friendica | 2015-03-30 | 4 | -23/+47 |
| | | |||||
* | | mod_connections ajax failure see ↵ | friendica | 2015-03-29 | 2 | -1/+52 |
| | | | | | | | | http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression | ||||
* | | move some lesser used features to plugins | friendica | 2015-03-29 | 1 | -4/+1 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-29 | 32 | -2892/+2897 |
|\ \ | |||||
| * \ | Merge pull request #944 from dawnbreak/docu | RedMatrix | 2015-03-30 | 31 | -2834/+2832 |
| |\ \ | | | | | | | | | Correcting reported Doxygen syntax warnings. | ||||
| | * | | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 31 | -2834/+2832 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation. | ||||
| * | | | Merge pull request #943 from dawnbreak/master | RedMatrix | 2015-03-30 | 1 | -58/+65 |
| |\ \ \ | | |/ / | |/| | | Fixed two wrong variable usages in event.php. | ||||
| | * | | Fixed two wrong variable usages in event.php. | Klaus Weidenbach | 2015-03-29 | 1 | -58/+65 |
| |/ / | | | | | | | | | | I just checked the code, not the functionality. | ||||
* / / | fix os_mkdir | friendica | 2015-03-29 | 5 | -4/+8 |
|/ / | |||||
* | | remove bogus grouping from fix for #938 | friendica | 2015-03-28 | 1 | -2/+2 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-28 | 1 | -0/+1 |
|\ \ | |||||
| * | | Make sure long words (channel addresses, homepages) on the vcard are not on ↵ | jeroenpraat | 2015-03-29 | 1 | -0/+1 |
| | | | | | | | | | | | | top of the content to the right. | ||||
* | | | issue #938 | friendica | 2015-03-28 | 1 | -2/+8 |
|/ / | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-28 | 9 | -35/+53 |
|\ \ | |||||
| * | | some colorbox styling | Mario Vavti | 2015-03-27 | 1 | -5/+11 |
| | | | |||||
| * | | Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it ↵ | Mario Vavti | 2015-03-27 | 9 | -30/+42 |
| | | | | | | | | | | | | there). Comment out some most probably deprecated js includes. Some css cleanup. | ||||
* | | | issue #941 | friendica | 2015-03-28 | 3 | -591/+672 |
|/ / | |||||
* | | adjust category auto-complete background color (blue) to match the blue we ↵ | friendica | 2015-03-26 | 1 | -0/+3 |
| | | | | | | | | use for buttons. It was a completely unrelated shade of blue and looked out of place. | ||||
* | | minor tweak on event form | friendica | 2015-03-26 | 1 | -1/+2 |
| | | |||||
* | | bring event form into line with other forms | friendica | 2015-03-26 | 1 | -3/+9 |
| | | |||||
* | | add channel_lastpost timestamp to help optimise some outrageously expensive ↵ | friendica | 2015-03-26 | 6 | -3/+27 |
| | | | | | | | | queries. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-26 | 13 | -6250/+6984 |
|\ \ | |||||
| * \ | Merge pull request #940 from HaakonME/master | RedMatrix | 2015-03-27 | 2 | -6110/+6820 |
| |\ \ | | | | | | | | | Updated Norwegian bokmål translation | ||||
| | * | | Updated Norwegian bokmål translation | Haakon Meland Eriksen | 2015-03-26 | 2 | -6110/+6820 |
| | | | | |||||
| * | | | whitespace | Mario Vavti | 2015-03-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | do not move viewed content off the screen after collapsing a long post | Mario Vavti | 2015-03-26 | 1 | -2/+10 |
| |/ / | |||||
| * | | this might stop page scrolls while new updates drop in | Mario Vavti | 2015-03-26 | 1 | -1/+7 |
| | | |