aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 present
| | * Fixes tag delivery regex for when multiple tags are presentAlexandre Hannud Abdo2015-02-131-2/+2
| | | | | | | | | | | | | | | Previous regex would cause matches to span several tags when present, thus never recognizing the mention.
* | | yet another icon changemarijus2015-02-134-17/+18
|/ /
* / item_unseen updatemarijus2015-02-131-0/+1
|/
* issue #896friendica2015-02-122-3/+5
|
* typofriendica2015-02-122-1/+2
|
* provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵friendica2015-02-1220-61/+52
| | | | searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.
* 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 checks
| | * 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
| | | | | | | | count key set
| * 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 ↵friendica2015-02-112-4/+5
| | | | | | | | | | | | deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.
* | | more efficient processing of response activities, plus a proof of concept ↵friendica2015-02-113-19/+59
| |/ |/| | | | | fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
* | 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.5
| | * 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
| |\ | | | | | | comparison between activity stream networks
| | * Changed a heading roles.md. Added the comparison. No idea how it renders ↵RedSwede2015-02-072-1/+24
| | | | | | | | | | | | with markdownify.
| * | 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 ↵friendica2015-02-092-20/+3
|/ / | | | | | | not go there).
* | fix for service_plink() after observing it in the wildfriendica2015-02-092-2/+2
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-081-5/+0
|\ \
| * | fix transparent background in collapsed nav with project home enabledmarijus2015-02-091-5/+0
| | |
* | | help text for the "adjust for viewer timezone" toggle switch since you ↵friendica2015-02-081-1/+1
|/ / | | | | | | apparently need an IQ of 230 or greater to be able to use it correctly.
* | generate the Swedish strings file from the last sv/messages.po updatefriendica2015-02-081-927/+959
| |
* | Merge pull request #890 from f03el/masterRedMatrix2015-02-091-4128/+4271
|\ \ | | | | | | Update Swedish strings