aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-137-68/+73
|\
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-02-131-1/+1
| |\
| | * make sql work on both db typesHabeas Codice2015-02-131-1/+1
| * | some shifting to make button groups render properlymarijus2015-02-132-48/+51
| |/
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-02-131-2/+2
| |\
| | * Merge pull request #897 from solstag/tagfixRedMatrix2015-02-131-2/+2
| | |\
| | | * Fixes tag delivery regex for when multiple tags are presentAlexandre Hannud Abdo2015-02-131-2/+2
| * | | yet another icon changemarijus2015-02-134-17/+18
| |/ /
| * / item_unseen updatemarijus2015-02-131-0/+1
| |/
* / missing paramfriendica2015-02-1354-4063/+4404
|/
* issue #896friendica2015-02-122-3/+5
* typofriendica2015-02-122-1/+2
* provide relief to sites that are severely impacted by the slow ITEM_UNSEEN se...friendica2015-02-1220-61/+52
* possibly better icons, possibly not. There is no [x].friendica2015-02-122-8/+8
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-121-2/+2
|\
| * Merge pull request #895 from solstag/sigfixRedMatrix2015-02-121-2/+2
| |\
| | * Dot not trim body in order to avoid issues with signature checksAlexandre Hannud Abdo2015-02-121-2/+2
| |/
* / revupfriendica2015-02-121-1/+1
|/
* issue #843friendica2015-02-112-2/+5
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-111-1/+10
|\
| * to get the correct total count we should probably only count the arrays with ...marijus2015-02-111-1/+10
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-02-111-1/+1
| |\
| * | typo agree->disagreemarijus2015-02-111-1/+1
* | | well that was certainly fun. And the reason why likes and other acitivity del...friendica2015-02-112-4/+5
* | | more efficient processing of response activities, plus a proof of concept fix...friendica2015-02-113-19/+59
| |/ |/|
* | cut/paste typofriendica2015-02-112-2/+2
|/
* more permissions tweakingfriendica2015-02-104-7/+21
* fix permissionsfriendica2015-02-101-2/+2
* ensure we have permission before displaying buttonsfriendica2015-02-103-4/+4
* wrong icons in list modefriendica2015-02-101-4/+4
* item voting toolsfriendica2015-02-1010-3/+63
* improvements in duplicate like detection, especially w/r/t event participationfriendica2015-02-102-8/+29
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-101-1/+1
|\
| * Merge pull request #893 from zzottel/masterRedMatrix2015-02-101-1/+1
| |\
| | * make update 1133 work in PHP < 5.5zottel2015-02-101-1/+1
| |/
* | more attendancefriendica2015-02-103-81/+77
* | correct the object type if it isn't stored/linked to an item yetfriendica2015-02-101-1/+1
* | cleanup event attendance - make sure it works in list mode.friendica2015-02-103-65/+48
* | more progress on event confirmationsfriendica2015-02-105-14/+76
* | like formatting for extended consensus itemsfriendica2015-02-094-61/+108
|/
* apply max_import_size to Diaspora postsfriendica2015-02-091-0/+43
* bring some styling back to the colorbox and improve the event preview abilityfriendica2015-02-0912-17/+70
* make preview button largerfriendica2015-02-091-1/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2015-02-093-7/+25
|\
| * Merge pull request #892 from redswede/masterRedMatrix2015-02-102-1/+24
| |\
| | * Changed a heading roles.md. Added the comparison. No idea how it renders with...RedSwede2015-02-072-1/+24
| * | improve sql querymarijus2015-02-091-6/+1
* | | event form - provide map ability for location field and add preview abilityfriendica2015-02-094-8/+31
* | | title missing sending to diaspora (which doesn't support titles but let's not...friendica2015-02-092-20/+3
|/ /
* | fix for service_plink() after observing it in the wildfriendica2015-02-092-2/+2