aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-2725-107/+307
|\
| * preserve existing categories when updating an app from an embed sourcezotlabs2018-03-241-0/+6
| * app sellpage not being storedzotlabs2018-03-242-0/+2
| * code optimisations and de-duplication on updating parent commented timestampzotlabs2018-03-241-11/+6
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-233-8/+67
| |\
| | * make list mode work in cards and articleszotlabs2018-03-223-5/+39
| | * make alt_pager work for articles/cardszotlabs2018-03-222-6/+29
| | * hubzilla issue #1013 - comments not displayed in single card/article viewzotlabs2018-03-222-4/+6
| * | prevent reload loop if somebody lands on /ochannel (without channel_address a...Mario Vavti2018-03-221-0/+3
| |/
| * Hubzilla issue #1006, fix anonymous comments bump thread before being approved.zotlabs2018-03-211-0/+14
| * initial support for alternative sort orders on the cloud pages. Can be trigge...zotlabs2018-03-212-1/+23
| * Add Ochannel module for testing OStatus bad behaviourzotlabs2018-03-211-0/+66
| * add the social "party" permission rolezotlabs2018-03-201-0/+19
| * do not include pending registrations in accounts and goaway to /admin/account...Mario Vavti2018-03-172-3/+6
| * slight re-org and update of documentation, moving the tutorial to the top.zotlabs2018-03-161-1/+1
| * add auth flag to share attributes so we can make a costly determination to us...zotlabs2018-03-154-49/+26
| * more work with unicode usernameszotlabs2018-03-142-4/+4
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-141-1/+1
| |\
| | * make unicode usernames work in chanview modulezotlabs2018-03-141-1/+1
| * | fix channel_addressMario Vavti2018-03-141-1/+1
| * | reveal the profile name field only if multi prifiles feature is enabledMario Vavti2018-03-141-7/+4
| * | show site registration notifications setting only to site adminMario Vavti2018-03-141-2/+2
| * | whitespaceMario Vavti2018-03-141-16/+16
| |/
| * add ability to disable newmember widget ahead of timeMario Vavti2018-03-131-2/+3
| * Merge pull request #18 from redmatrix/devmrjive2018-03-1343-177/+618
| |\
| | * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-133-4/+24
| | |\
| | | * unicode/emoji usernames. Warning: experimental feature, unstable, untested, d...zotlabs2018-03-122-4/+18
| | | * obscure permission issue with custom permissions when using the highly discou...zotlabs2018-03-121-0/+6
| * | | small work on connections pagemrjive2018-03-131-10/+32
* | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-123-20/+30
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-123-19/+29
| |\ \ \ | | | |/ | | |/|
| | * | Setup - .htconfig.php write access is now required for automated installation...zotlabs2018-03-111-8/+12
| | * | remove debuggingzotlabs2018-03-101-2/+0
| | * | trim expects error ... in admin/sitezotlabs2018-03-102-12/+19
| * | | do not use trim on arrayMario Vavti2018-03-101-1/+1
* | | | Fixed access_token request bug and returned oauth2-server-php library to unmo...Andrew Manning2018-03-101-7/+8
* | | | Merge branch 'dev' into oauth2Andrew Manning2018-03-107-11/+102
|\| | |
| * | | use dbunescbin() for cover photosMario2018-03-081-1/+1
| * | | fix syntax error in postgres updateMario2018-03-081-3/+3
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-082-0/+53
| |\| |
| | * | remove extraneous loggingzotlabs2018-03-071-3/+1
| | * | hashtag autocompletezotlabs2018-03-071-0/+29
| | * | federated polls: GNU-Social requires us to preserve the original order of the...zotlabs2018-03-071-0/+26
| * | | we need the javascript in the template since strings are involvedMario Vavti2018-03-072-0/+12
| * | | we do not support separate mobile themes anymoreMario Vavti2018-03-071-7/+7
| |/ /
| * | federated polls: add poll_author which will be necessary for Diaspora federationzotlabs2018-03-061-0/+26
* | | Merge branch 'dev' into oauth2Andrew Manning2018-03-053-11/+37
|\| |
| * | fix some issues with friend suggestions on standalone sites with no 'suggestm...zotlabs2018-03-042-2/+7
| * | bugfix: unable to reset profile fields to defaults in admin/profs by emptying...zotlabs2018-03-041-9/+30
* | | Merge branch 'dev' into oauth2Andrew Manning2018-03-0413-52/+256
|\| |