projects
/
quix0rs-gnu-social.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Opps, left-overs from merge ...
[quix0rs-gnu-social.git]
/
plugins
/
OStatus
/
lib
/
salmonaction.php
2016-01-30
Roland Haeder
Opps, left-overs from merge ...
rewrites-master/type-hints-asserts
blob
|
commitdiff
|
raw
2016-01-30
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2016-01-30
Roland Haeder
Merged stuff from upstream/master
blob
|
commitdiff
|
raw
|
diff to current
2016-01-25
Roland Haeder
Merge branch 'upstream-changes/google-analytics-removal...
blob
|
commitdiff
|
raw
2016-01-22
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
2016-01-11
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
2016-01-05
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
2016-01-03
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
2016-01-03
mmn
Merge branch 'beautify_profile_list' into 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2016-01-03
Mikael Nordfeldth
Merge branch 'nightly' into singpolyma/gnu-social-event...
blob
|
commitdiff
|
raw
|
diff to current
2015-12-18
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
2015-12-14
mmn
Merge branch 'send-twitter-replies-to-twitter' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'direct-feed-sub' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'twitter-show-rel-syndication' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'firefox-sub-link' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'fix-twitter-uri' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'inbound-linkback' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'twitter-check-dupe-by-uri' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'repost-of-uf2' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-12-14
mmn
Merge branch 'at-mention-url' into 'master'
blob
|
commitdiff
|
raw
|
diff to current
2015-11-30
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
2015-11-21
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-20
Mikael Nordfeldth
Merge request #59 which was directed at master
blob
|
commitdiff
|
raw
|
diff to current
2015-11-10
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-06
Mikael Nordfeldth
Merge branch 'master' of git.gnu.io:gnu/gnu-social...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-05
Mikael Nordfeldth
Merge branch 'master' of git.gnu.io:gnu/gnu-social...
blob
|
commitdiff
|
raw
|
diff to current
2015-11-05
Mikael Nordfeldth
Merge branch 'master' into nightly
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
mmn
Merge branch 'page_title_showstream' into 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
mmn
Merge branch 'usergroups_page' into 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
mmn
Merge branch 'oauth-default-icon' into 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-10
mmn
Merge branch 'link-atom-fix' into 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2015-10-09
Hannes Mannerheim
update from upstream
blob
|
commitdiff
|
raw
|
diff to current
2015-10-04
Mikael Nordfeldth
var_export without true
blob
|
commitdiff
|
raw
|
diff to current
2015-10-03
Mikael Nordfeldth
Move around some code related to Magic_envelope and...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-11
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-05
Mikael Nordfeldth
Merge branch 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-18
abjectio
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social...
blob
|
commitdiff
|
raw
|
diff to current
2015-08-16
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-11
Mikael Nordfeldth
Do we update feeduri and salmonuri for Ostatus_profile...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-04
Roland Haeder
Merge branch 'master' of https://git.gnu.io/gnu/gnu...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-04
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-03
Roland Haeder
Merge branch 'social-master' into rewrites-master/type...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-03
Roland Haeder
Merge branch 'master' of https://git.gnu.io/gnu/gnu...
blob
|
commitdiff
|
raw
|
diff to current
2015-06-13
Roland Haeder
Merge branch 'master' of https://git.gnu.io/aroque...
blob
|
commitdiff
|
raw
|
diff to current
2015-06-06
mmn
Merge branch 'doc-src' into 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2015-06-06
abjectio
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social...
blob
|
commitdiff
|
raw
|
diff to current
2015-06-06
Mikael Nordfeldth
Diaspora-compatible Salmon slap receival
blob
|
commitdiff
|
raw
|
diff to current
2015-06-01
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-05-29
Roland Haeder
Merge branch 'master' of https://git.gnu.io/gnu/gnu...
blob
|
commitdiff
|
raw
|
diff to current
2015-05-26
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-05-26
Roland Haeder
Merge branch 'master' of git.gnu.io:Quix0r/gnu-social
blob
|
commitdiff
|
raw
|
diff to current
2015-05-06
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-12
Roland Haeder
Merge remote-tracking branch 'upstream/master' into...
blob
|
commitdiff
|
raw
|
diff to current
2015-04-05
Mikael Nordfeldth
Merge branch 'nightly'
blob
|
commitdiff
|
raw
|
diff to current
2015-03-10
Roland Haeder
Merge branch 'master' of gitorious.org:social/mainline
blob
|
commitdiff
|
raw
|
diff to current
2015-03-09
Mikael Nordfeldth
Merge branch 'nightly', beginning of 1.2.x
blob
|
commitdiff
|
raw
|
diff to current
2015-03-04
Roland Haeder
Merge branch 'master' of gitorious.org:social/mainline
blob
|
commitdiff
|
raw
|
diff to current
2015-02-27
Roland Haeder
Merge branch 'master' of gitorious.org:social/mainline...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-27
Mikael Nordfeldth
StatusNet class renamed GNUsocial
blob
|
commitdiff
|
raw
|
diff to current
2015-02-27
Mikael Nordfeldth
Merge branch 'master' into nightly
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Mikael Nordfeldth
Merge commit 'refs/merge-requests/51' of https://gitori...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Mikael Nordfeldth
Merge commit 'refs/merge-requests/49' of https://gitori...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-19
Mikael Nordfeldth
Merge branch 'utf8mb4' into nightly
blob
|
commitdiff
|
raw
|
diff to current
2015-02-19
Mikael Nordfeldth
Merge branch 'nightly' into file_urlhash
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Mikael Nordfeldth
forgot primary key column to updateWithKeys in SalmonAction
blob
|
commitdiff
|
raw
|
diff to current
2015-02-17
Mikael Nordfeldth
SalmonAction now updates remote URI if it was stale.
blob
|
commitdiff
|
raw
|
diff to current
2015-02-15
Roland Haeder
Merge remote-tracking branch 'upstream/master'
blob
|
commitdiff
|
raw
|
diff to current
2015-01-18
Roland Haeder
Merge commit 'refs/merge-requests/30' of https://gitori...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-17
Roland Haeder
Merge commit 'refs/merge-requests/29' of https://gitori...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-16
Roland Häder
Merge branch 'master' of gitorious.org:social/mainline...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-16
Roland Häder
Merge branch 'master' of gitorious.org:social/mainline...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-16
Roland Häder
Merge branch 'master' of gitorious.org:social/mainline...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-13
Mikael Nordfeldth
Ensuring unknown profiles in salmon slaps work again
blob
|
commitdiff
|
raw
|
diff to current
2015-01-12
Mikael Nordfeldth
ensureActivityObjectProfile is more thorough than creat...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-12
Mikael Nordfeldth
ensureProfile already done and stored in $this->oprofile
blob
|
commitdiff
|
raw
|
diff to current
2015-01-10
Mikael Nordfeldth
Support for updated aliases
blob
|
commitdiff
|
raw
|
diff to current
2015-01-09
Roland Häder
Merge branch 'master' into social-master
blob
|
commitdiff
|
raw
|
diff to current
2014-10-05
Roland Haeder
Merge branch 'master' into social-master
blob
|
commitdiff
|
raw
|
diff to current
2014-09-28
Roland Haeder
Merge branch 'master' into social-master
blob
|
commitdiff
|
raw
|
diff to current
2014-09-18
Roland Haeder
Merge branch 'fixes/type-hints' into social-master
blob
|
commitdiff
|
raw
|
diff to current
2014-09-18
Roland Haeder
Use common_debug() instead of common_log(LOG_DEBUG...
blob
|
commitdiff
|
raw
|
diff to current
2014-09-12
Roland Haeder
Merge branch 'master' of git://gitorious.org/statusnet...
blob
|
commitdiff
|
raw
|
diff to current
2014-07-14
Mikael Nordfeldth
Merge request from chimo adding getvaliddaemons to...
blob
|
commitdiff
|
raw
|
diff to current
2014-07-14
Mikael Nordfeldth
Merge request from robmyers upping the PHP version...
blob
|
commitdiff
|
raw
|
diff to current
2014-07-02
Mikael Nordfeldth
Favorites are now being stored from activities
blob
|
commitdiff
|
raw
|
diff to current
2014-06-28
Mikael Nordfeldth
SalmonAction and extensions simplified
blob
|
commitdiff
|
raw
|
diff to current
2014-06-05
Mikael Nordfeldth
Merge from chimo: Catch GeoCookie JSON parsing error
blob
|
commitdiff
|
raw
|
diff to current
2014-06-02
Mikael Nordfeldth
Don't ensureProfile before we verify signature
blob
|
commitdiff
|
raw
|
diff to current
2014-06-02
Mikael Nordfeldth
Improve debugging for Salmon slaps
blob
|
commitdiff
|
raw
|
diff to current
2014-06-02
Mikael Nordfeldth
Try the whole Salmon action for AlreadyFulfilledException
blob
|
commitdiff
|
raw
|
diff to current
2014-05-31
Mikael Nordfeldth
Use locally cached Salmon keys for profiles
blob
|
commitdiff
|
raw
|
diff to current
2014-05-31
Mikael Nordfeldth
Last objectification of MagicEnvelope. Smarter SalmonAction
blob
|
commitdiff
|
raw
|
diff to current
2014-05-27
Mikael Nordfeldth
MagicEnvelope object orientation (no passing arrays)
blob
|
commitdiff
|
raw
|
diff to current
2014-05-05
Mikael Nordfeldth
More modern coding, stuff related to subscriptions
blob
|
commitdiff
|
raw
|
diff to current
2014-03-31
Mikael Nordfeldth
Merge commit 'refs/merge-requests/199' of git://gitorio...
blob
|
commitdiff
|
raw
2013-08-28
Mikael Nordfeldth
plugins onAutoload now only overloads if necessary...
blob
|
commitdiff
|
raw
2013-08-12
Mikael Nordfeldth
Merge remote-tracking branch 'statusnet/master'
blob
|
commitdiff
|
raw
|
diff to current
2012-04-17
Evan Prodromou
Merge ActivitySpam plugin
blob
|
commitdiff
|
raw
|
diff to current
2011-09-26
Evan Prodromou
Merge commit 'refs/merge-requests/158' of git://gitorio...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-21
Evan Prodromou
Merge commit 'refs/merge-requests/159' of git://gitorio...
blob
|
commitdiff
|
raw
|
diff to current
next