1. 08 May, 2017 2 commits
  2. 27 Apr, 2017 1 commit
  3. 26 Apr, 2017 3 commits
  4. 25 Apr, 2017 2 commits
  5. 23 Apr, 2017 2 commits
    • Merge branch 'nightly' of git@git.postactiv.com:postActiv/postActiv.git into nightly · df3d7f87
      # By Normandy
      # Via Maiyannah Bishop (2) and Normandy (1)
      * 'nightly' of git@git.postactiv.com:postActiv/postActiv.git:
        Add sample systemd unit
        Convert LogFilterPlugin comments to NaturalDocs-style
      Maiyannah Bishop committed
    • Merge branch 'nightly' of git@git.gnu.io:gnu/gnu-social.git into nightly · fc8af05a
      # By Mikael Nordfeldth (28) and others
      # Via Mikael Nordfeldth (9) and mmn (8)
      * 'nightly' of git@git.gnu.io:gnu/gnu-social.git: (36 commits)
        Try https first on URL mention lookup
        Somewhat simpler regex. Thanks acct:takeshitakenji@gs.kawa-kun.com
        Fix URL mention regular expression FOR REALZ
        Fix URL mention regular expression FOR REALZ
        Fix URL mention regular expression in OStatusPlugin
        Domain name regular expression into lib/framework.php
        Split up OStatusPlugin preg functions so they can be reused
        A bit more instructive debugging
        New domain regexp for WebFinger matching.
        Fix URL mention regular expression in OStatusPlugin
        Domain name regular expression into lib/framework.php
        Split up OStatusPlugin preg functions so they can be reused
        A bit more instructive debugging
        New domain regexp for WebFinger matching.
        Import backlog on new subscription.
        Split OStatusPlugin FeedSub receive into two parts
        Less frightening interface on remote subscription
        Empty resource would throw exception
        Less frightening interface on remote subscription
        Empty resource would throw exception
        ...
      
      # Conflicts:
      #	actions/apistatusesupdate.php
      #	plugins/ConversationTree/lib/conversationtree.php
      #	plugins/Favorite/actions/showfavorites.php
      #	plugins/LRDD/lib/discovery.php
      #	plugins/OStatus/OStatusPlugin.php
      #	plugins/OStatus/actions/ostatussub.php
      #	plugins/OStatus/actions/pushcallback.php
      #	plugins/OStatus/classes/FeedSub.php
      #	plugins/OStatus/classes/Ostatus_profile.php
      #	plugins/OStatus/scripts/testfeed.php
      #	plugins/OpenID/actions/openidsettings.php
      #	plugins/OpenID/openid.php
      #	plugins/SearchSub/actions/searchsubs.php
      #	plugins/TagSub/actions/tagsubs.php
      #	plugins/TwitterBridge/TwitterBridgePlugin.php
      #	plugins/TwitterBridge/lib/twitterimport.php
      #	plugins/TwitterBridge/twitter.php
      #	plugins/UserFlag/actions/adminprofileflag.php
      #	tests/ActivityGenerationTests.php
      #	tests/CommandInterperterTest.php
      #	tests/LocationTest.php
      #	tests/MediaFileTest.php
      #	tests/URLDetectionTest.php
      #	tests/UserFeedParseTest.php
      #	tests/XmppValidateTest.php
      #	theme/neo-quitter/css/display.css
      Maiyannah Bishop committed
  6. 22 Apr, 2017 21 commits
  7. 21 Apr, 2017 2 commits
  8. 20 Apr, 2017 1 commit
  9. 19 Apr, 2017 6 commits