aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update jquery to 1.11.2Mario Vavti2015-04-081-5/+5
|
* this is easier on the eyes when collapsing a long post/commentMario Vavti2015-04-081-1/+2
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-071-191/+211
|\
| * Merge pull request #310 from dawnbreak/masterredmatrix2015-04-081-191/+211
| |\ | | | | | | Renamed some functions to match other names in bbcode.php.
| | * Renamed some functions to match other names in bbcode.php.Klaus Weidenbach2015-04-071-191/+211
| | | | | | | | | | | | | | | | | | Some documentation. Removed unused variables. Removed empty spaces at line endings.
* | | add common connection count to suggestionsfriendica2015-04-072-1/+2
|/ /
* | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-071-4/+5
|\|
| * missed oneHabeas Codice2015-04-071-1/+1
| |
| * "PHP Strict Standards: Only variables should be passed by reference"Habeas Codice2015-04-071-3/+4
| |
* | separate the hub query since it changes the logic default and cannot easily ↵friendica2015-04-072-5/+8
|/ | | | be grouped
* add endless scroll to viewconnections modulefriendica2015-04-063-8/+37
|
* make open tag work correctly for multiple invocations in the same textfriendica2015-04-061-3/+7
|
* commit 59828593c broke some important poco stuff, looks like the cat might ↵friendica2015-04-063-0/+28
| | | | have climbed over the keyboard and deleted something that wasn't intended to be deleted.
* now add back the navsearch paramfriendica2015-04-061-0/+1
|
* 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
|/ /