aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-1641-159/+910
|\
| * hub upgrade w/name change via Alexfriendica2015-02-161-1/+1
| |
| * mopping up the public site ratingsfriendica2015-02-163-4/+12
| |
| * quick fix for photos page until calls to like_puller() are fixedfriendica2015-02-161-4/+4
| |
| * pubsites ratings (mod/pubsites really really needs to be templatised, this ↵friendica2015-02-163-5/+10
| | | | | | | | was quick and dirty)
| * force site_url to be lowercase when stored. Otherwise rating hubs on ↵friendica2015-02-155-8/+22
| | | | | | | | postgres could get real messy.
| * preparatory work for site ratingsfriendica2015-02-153-10/+28
| |
| * site firehosefriendica2015-02-151-3/+11
| |
| * issue #860, replace br html element with linefeed between table rowsfriendica2015-02-152-18/+20
| |
| * taganyone wasn't workingfriendica2015-02-151-2/+5
| |
| * missing filefriendica2015-02-151-0/+8
| |
| * add zotsh to utilfriendica2015-02-159-0/+646
| |
| * lost ability to delete eventsfriendica2015-02-155-3/+35
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-148-84/+110
| |\
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-02-142-6/+0
| | |\
| | | * Note to myself: don't forget to remove the patch files from the repo.jeroenpraat2015-02-142-57/+0
| | | |
| | | * Patches from Thomas regarding offline status off whogotzot.comjeroenpraat2015-02-144-6/+57
| | | |
| | * | update justifiedGallery to version 3.5.4 and add ignoreElement option which ↵marijus2015-02-146-78/+110
| | |/ | | | | | | | | | will hopefully be accepted upstream
| * / failure to auto update comments if it's your own.friendica2015-02-144-7/+11
| |/
| * some ratings fixesfriendica2015-02-132-24/+1
| |
* | normalize age dataHabeas Codice2015-02-161-2/+7
| | | | | | | | | | | | | | | | mysql has type tinyint(3) which probably turns into a 24-bit value, but postgres uses 3-digit decimal as its constraint (probably what the mysql schema was intended to do). either that or mysql silently truncates while postgres respects the constraint. Either way, bad data gets in unchecked, now it's checked.
* | remove superfluous non-boolean booleanHabeas Codice2015-02-161-2/+2
|/
* 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 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
| |/
* / 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 ↵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
|