aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-066-33/+48
|\
| * Merge pull request #309 from dawnbreak/masterredmatrix2015-04-076-33/+48
| |\ | | | | | | Fix Design Tool navigation for sys channel.
| | * Fix Design Tool navigation for sys channel.Klaus Weidenbach2015-04-066-33/+48
| |/ | | | | | | Fix creating menu for sys channel.
* / make the findpeople widget honour the local/global directory settingfriendica2015-04-062-2/+2
|/
* issue #226friendica2015-04-053-3/+7
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-034-963/+1079
|\
| * Update/fix Dutch and removing an ugly spacejeroenpraat2015-04-024-963/+1079
| |
* | strings updatefriendica2015-04-032-1641/+1629
| |
* | provide ability to have randomised homepage content from a set of pages name ↵friendica2015-04-022-3/+7
|/ | | | home-*
* update resource linksfriendica2015-04-0114-20/+19
|
* please update your repository pointers to https://github.com/redmatrix/redmatrixfriendica2015-04-011-0/+2
|
* open bbcode tagfriendica2015-04-011-0/+11
|
* revert iconic change to collection list widgetfriendica2015-04-013-3/+5
|
* fix regdirfriendica2015-03-313-6/+13
|
* more logging for onepollfriendica2015-03-311-1/+1
|
* make search box border radius consistent with everything else. It looks ↵friendica2015-03-311-1/+1
| | | | really weird when it's so different.
* allow webpage for home to use its own layout filefriendica2015-03-313-1/+16
|
* some DB documentationfriendica2015-03-305-42/+62
|
* don't included any deleted posts in the self queryfriendica2015-03-301-1/+1
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-302-626/+718
|\
| * Merge pull request #945 from tuscanhobbit/devPaolo T2015-03-302-626/+718
| |\ | | | | | | Italian translation
| | * Italian translationtuscanhobbit2015-03-302-626/+718
| | |
* | | title of preview button incorrect, fix ability to upload to webpagesfriendica2015-03-304-4/+7
|/ /
* | change "create new collection" to iconic, document the account tablefriendica2015-03-304-23/+47
| |
* | mod_connections ajax failure see ↵friendica2015-03-292-1/+52
| | | | | | | | http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression
* | move some lesser used features to pluginsfriendica2015-03-291-4/+1
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-2932-2892/+2897
|\ \
| * \ Merge pull request #944 from dawnbreak/docuRedMatrix2015-03-3031-2834/+2832
| |\ \ | | | | | | | | Correcting reported Doxygen syntax warnings.
| | * | Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-2931-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/masterRedMatrix2015-03-301-58/+65
| |\ \ \ | | |/ / | |/| | Fixed two wrong variable usages in event.php.
| | * | Fixed two wrong variable usages in event.php.Klaus Weidenbach2015-03-291-58/+65
| |/ / | | | | | | | | | I just checked the code, not the functionality.
* / / fix os_mkdirfriendica2015-03-295-4/+8
|/ /
* | remove bogus grouping from fix for #938friendica2015-03-281-2/+2
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-281-0/+1
|\ \
| * | Make sure long words (channel addresses, homepages) on the vcard are not on ↵jeroenpraat2015-03-291-0/+1
| | | | | | | | | | | | top of the content to the right.
* | | issue #938friendica2015-03-281-2/+8
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-289-35/+53
|\ \
| * | some colorbox stylingMario Vavti2015-03-271-5/+11
| | |
| * | Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it ↵Mario Vavti2015-03-279-30/+42
| | | | | | | | | | | | there). Comment out some most probably deprecated js includes. Some css cleanup.
* | | issue #941friendica2015-03-283-591/+672
|/ /
* | adjust category auto-complete background color (blue) to match the blue we ↵friendica2015-03-261-0/+3
| | | | | | | | use for buttons. It was a completely unrelated shade of blue and looked out of place.
* | minor tweak on event formfriendica2015-03-261-1/+2
| |
* | bring event form into line with other formsfriendica2015-03-261-3/+9
| |
* | add channel_lastpost timestamp to help optimise some outrageously expensive ↵friendica2015-03-266-3/+27
| | | | | | | | queries.
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-2613-6250/+6984
|\ \
| * \ Merge pull request #940 from HaakonME/masterRedMatrix2015-03-272-6110/+6820
| |\ \ | | | | | | | | Updated Norwegian bokmål translation
| | * | Updated Norwegian bokmål translationHaakon Meland Eriksen2015-03-262-6110/+6820
| | | |
| * | | whitespaceMario Vavti2015-03-261-1/+1
| | | |
| * | | do not move viewed content off the screen after collapsing a long postMario Vavti2015-03-261-2/+10
| |/ /
| * | this might stop page scrolls while new updates drop inMario Vavti2015-03-261-1/+7
| | |