aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-0512-1486/+1863
|\
| * add pdl file for mod moderateMario Vavti2018-03-051-0/+4
| * fix javascript error if there are no notificationsMario Vavti2018-03-051-2/+1
| * update redbasic theme screenshotMario Vavti2018-03-052-0/+0
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-056-18/+54
| |\
| | * fix some issues with friend suggestions on standalone sites with no 'suggestm...zotlabs2018-03-044-9/+16
| | * bugfix: unable to reset profile fields to defaults in admin/profs by emptying...zotlabs2018-03-042-9/+31
| | * restrict mail messages to max_import_sizezotlabs2018-03-041-0/+7
| * | Merge pull request #989 from phellmes/devgit-marijus2018-03-052-1466/+1804
| |\ \ | | |/ | |/|
| | * Update DE translation stringsphellmes2018-03-052-1466/+1804
| |/
* | Merge branch 'dev' into oauth2Andrew Manning2018-03-0493-1686/+3030
|\|
| * add dummy f= arg to suggestion urls, use directory version of suggest for new...zotlabs2018-03-033-5/+5
| * There was no pdl for mod_thing; add one because it's only a link away from pr...zotlabs2018-03-032-0/+12
| * more work on federated pollszotlabs2018-03-031-0/+30
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-026-1414/+1786
| |\
| | * Merge pull request #985 from mjfriaza/devgit-marijus2018-03-023-1412/+1748
| | |\
| | | * New strings for Spanish translation.Manuel Jiménez Friaza2018-03-022-169/+257
| | | * Updated Spanish translation (hmessages.po/php and register_verify_member.tpl).Manuel Jiménez Friaza2018-03-013-1358/+1606
| | * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-026-11/+54
| | |\ \
| | * | | update DB update 1205 to mitigateMario Vavti2018-03-021-0/+11
| | * | | bump versionMario Vavti2018-03-021-1/+1
| | * | | db update to drop index resource_type. we have uid_resource_type now.Mario Vavti2018-03-022-1/+25
| * | | | string change "Channel added" -> "Connection added"zotlabs2018-03-021-1/+1
| * | | | process follow from article menu in the background, do not reload page - hubz...zotlabs2018-03-022-3/+9
| * | | | sort settings/featuredzotlabs2018-03-022-3/+22
| * | | | add icon to any addon settings blocks which don't already have onezotlabs2018-03-021-0/+4
| | |/ / | |/| |
| * | | background work for caldav integration continued, modify mod_follow to allow ...zotlabs2018-03-023-7/+48
| * | | zot revision => 6.0a, not yet needed or referencedzotlabs2018-03-011-1/+1
| * | | add federation property to webfingerzotlabs2018-03-011-1/+2
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-0114-236/+943
| |\| |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-03-016-60/+696
| | |\|
| | | * Merge pull request #984 from dawnbreak/devgit-marijus2018-03-014-30/+484
| | | |\
| | | | * Update composer autoload cache.Klaus Weidenbach2018-03-014-30/+484
| | | * | Merge pull request #983 from dawnbreak/QA_testinggit-marijus2018-03-012-30/+212
| | | |\ \ | | | | |/ | | | |/|
| | | | * :white_check_mark: Unit Test for HTTPSig.Klaus Weidenbach2018-02-282-30/+212
| | * | | fix issues with accordions in settings and comment out jquery.textinputs.jsMario Vavti2018-03-016-20/+20
| | |/ /
| | * | update stringsMario Vavti2018-03-011-155/+226
| | * | versionMario Vavti2018-03-011-1/+1
| * | | sigh - missed two stringszotlabs2018-03-011-2/+2
| |/ /
| * | profile edit: empty dob is set to the date of the first profile save unless y...zotlabs2018-02-281-1/+1
| * | several email validation issueszotlabs2018-02-283-11/+12
| * | Create one and only one 'registration successful, check your email' popup.zotlabs2018-02-281-4/+2
| * | hide newmember widget if a new account was used to create a clone of an old c...zotlabs2018-02-281-0/+6
| * | provide new member widget which sits beneath the notifications for the first ...zotlabs2018-02-2855-1/+147
| * | important bugfix: if logged in locally and mod_display returns nothing owned ...zotlabs2018-02-281-2/+3
| |/
* | Merge branch 'dev' into oauth2Andrew Manning2018-02-2813-202/+305
|\|
| * erge remote-tracking branch 'mike/master' into devMario Vavti2018-02-284-28/+58
| |\
| | * rename Addon/Feature settings to addon settings [string change]zotlabs2018-02-272-2/+2
| | * provide usage hint on addon settings page to save each panel before opening a...zotlabs2018-02-272-0/+2
| | * move privacy groups to the newly created Access Control and Permissions tab. ...zotlabs2018-02-271-8/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 17:56:57 +0000