aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix syntax error in postgres updateMario2018-03-081-3/+3
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-086-3/+74
|\
| * remove extraneous loggingzotlabs2018-03-071-3/+1
| |
| * hashtag autocompletezotlabs2018-03-072-1/+44
| |
| * federated polls: GNU-Social requires us to preserve the original order of ↵zotlabs2018-03-074-2/+32
| | | | | | | | the poll answers for use in making a vote, unlike diaspora (which selects by guid) and activitypub (which selects by non-localisable text).
* | we need the javascript in the template since strings are involvedMario Vavti2018-03-076-162/+181
| |
* | more bootstrap accordion fixesMario Vavti2018-03-072-10/+10
| |
* | we do not support separate mobile themes anymoreMario Vavti2018-03-072-8/+8
|/
* federated polls: add poll_author which will be necessary for Diaspora federationzotlabs2018-03-064-1/+31
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-062-0/+144
|\
| * update changelogMario Vavti2018-03-061-0/+126
| |
| * Merge pull request #991 from anaqreon/devgit-marijus2018-03-061-0/+18
| |\ | | | | | | Improve rendering of Readme files in plugin settings
| | * Improve rendering of Readme files in plugin settingsAndrew Manning2018-03-051-0/+18
| |/
* / don't add pending connections to the default privacy group until acceptedzotlabs2018-03-061-7/+10
|/
* 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 ↵zotlabs2018-03-044-9/+16
| | | | | | | | 'suggestme' volunteers. This wrongly pulled up a site directory suggesting everybody on the site. While a better outcome than finding nobody, this does not fit with our ethical design goals. If there are no friends of friends, we will only suggest those who volunteer to be on the default suggestion list. Also do not attempt to load poco data from dead sites.
| * bugfix: unable to reset profile fields to defaults in admin/profs by ↵zotlabs2018-03-042-9/+31
| | | | | | | | emptying the textarea
| * 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 strings (for 3.2RC)
| * Update DE translation stringsphellmes2018-03-052-1466/+1804
|/
* add dummy f= arg to suggestion urls, use directory version of suggest for ↵zotlabs2018-03-033-5/+5
| | | | newmember link instead of the suggest module as the UI is prettier.
* There was no pdl for mod_thing; add one because it's only a link away from ↵zotlabs2018-03-032-0/+12
| | | | profile creation and remains on that page until you go elsewhere and new members may need help to find their way out
* 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
| |\ | | | | | | Updated Spanish translation (hmessages.po/php and register_verify_member.tpl).
| | * 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
| | | | | | | | | | | | | | | | ERROR 1069 (42000): Too many keys specified; max 64 keys allowed
| * | | 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 - ↵zotlabs2018-03-022-3/+9
| | | | | | | | | | | | | | | | hubzilla issue #987
* | | | 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
| | | | | | | | | | | | it to be called from ajax without redirecting.
* | | 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.
| | | * 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.
| | | * :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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 11:04:24 +0000