aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bug827'zotlabs2017-07-171-3/+4
|\
| * fix typozotlabs2017-07-171-3/+4
* | provide content-type matching ability for activitypubzotlabs2017-07-171-0/+38
|/
* fix for bug 827 to provide partial backward compatibility with album names in...zotlabs2017-07-171-0/+9
* activitystreams converters updated to recent speczotlabs2017-07-171-12/+14
* mis-attributed profile photo when Mastodon comment author has no profile photozotlabs2017-07-161-0/+11
* initial activitystreams2 parserzotlabs2017-07-161-0/+86
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-163-3/+22
|\
| * deal with mastodon privacy scopes - mark private and block commenting since w...zotlabs2017-07-151-1/+20
| * incorrect follow url in webfingerzotlabs2017-07-142-2/+2
* | fix photo item commentsgit-marijus2017-07-161-7/+5
* | fix album linkgit-marijus2017-07-161-1/+1
* | versionMario Vavti2017-07-141-1/+1
|/
* minor optimisationzotlabs2017-07-131-5/+2
* update some addon docs and ensure we only generate statistics once a dayzotlabs2017-07-135-10/+27
* turn url requests where argv[0] is something.xyz into module='something' and ...zotlabs2017-07-133-18/+8
* turn platform name and std_version into config variableszotlabs2017-07-133-5/+11
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-135-458/+467
|\
| * Merge red/masterMario Vavti2017-07-1111-16/+56
| |\
| * | update to match primary colorMario Vavti2017-07-102-4/+4
| * | update r1191: return update_success if table principals exists otherwise proc...Mario Vavti2017-07-101-404/+414
* | | implement chunked uploads on the wall; making it work painlessly on /cloud wa...zotlabs2017-07-134-134/+206
* | | fix typoszotlabs2017-07-121-6/+8
* | | make websub/PuSH and salmon both use consume_feed() for item storage as there...zotlabs2017-07-121-13/+43
* | | even more logging of conversation parent discoveryzotlabs2017-07-111-0/+1
| |/ |/|
* | prevent expiration of conversations you are involved with - allows you to fin...zotlabs2017-07-106-4/+36
* | find_parent for feeds needs more debug logging. Something is still falling th...zotlabs2017-07-091-0/+4
* | regression: allow position attributes in oembedable zcards by separating allo...zotlabs2017-07-091-2/+4
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-0929-762/+430
|\|
| * remove if not exist clause on index creation - it seems to be supported in ma...Mario Vavti2017-07-081-1/+1
| * update bs-dev and popper.jsMario Vavti2017-07-076-90/+86
| * Merge pull request #822 from dawnbreak/composer-lightgit-marijus2017-07-0722-671/+343
| |\
| | * :arrow_up: Updating some PHP libraries.Klaus Weidenbach2017-07-0615-223/+252
| | * Add optimize-autoloader to composer config.Klaus Weidenbach2017-07-067-448/+91
| |/
| * Merge pull request #821 from zotlabs/hmessagesgit-marijus2017-07-061-5441/+3236
| |\
| | * hmessages.po was corrupt from an old merge conflict - regeneratedzotlabs2017-07-051-5441/+3236
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-07-05327-24960/+14604
| | |\ | | |/ | |/|
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-07-0228-4377/+2399
| | |\
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-2030-3220/+1395
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-1416-140/+447
| | |\ \ \
| | * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-119-444/+453
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-086-4/+52
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-0788-24063/+3588
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-0611-93/+89
| | |\ \ \ \ \ \ \
| | * | | | | | | | Revert "include/socgraph - remove a few obsolete and long-deprecated functions"zotlabs2017-06-011-0/+71
| | * | | | | | | | include/socgraph - remove a few obsolete and long-deprecated functionszotlabs2017-06-011-71/+0
* | | | | | | | | | there was a merge conflict in hmessages.pozotlabs2017-07-051-5451/+3246
* | | | | | | | | | affinitiy slider settings were being updated on any submit of of settings/fea...zotlabs2017-07-053-10/+12
* | | | | | | | | | reset project namezotlabs2017-07-051-2/+3
* | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-0519-216/+907
|\| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:30:44 +0000