Mikael Nordfeldth
0e32729e59
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
2015-11-05 16:07:42 +01:00
Mikael Nordfeldth
c950f18546
Merge branch 'master' into nightly
...
Some merge requests that were aimed at master
2015-11-05 16:07:05 +01:00
mmn
96e0867d4c
Merge branch 'master' into 'master'
...
update URL
bugz.foocorp.net and gitorious.net are outdated
git.gnu.io is current
See merge request !58
2015-11-05 15:05:55 +00:00
mmn
45b24286e5
Merge branch 'status-204' into 'master'
...
Accept 204 for PuSH subscription
Some hubs (notably, pushpress, used by wordpress.com) return 204 to mean success.
This used to be allowed by the spec, so no harm in accepting it.
See merge request !48
2015-11-05 15:03:42 +00:00
mmn
f513ceac7d
Merge branch 'handle-rss-guid' into 'master'
...
Respect isPermalLink=false on RSS guid
See merge request !49
2015-11-05 15:02:20 +00:00
mmn
5c768d7ef7
Merge branch 'twitter-verb' into 'nightly'
...
TwitterBridge: Add $notice->verb on import
Since /plugins/ActivityModeration::onStartNotieSave expects it to be there when calling ActivityUtils::compareVerbs. Otherwise, the following exception is unhandled:
2015-10-26 15:33:03 LOG_ERR: [sn.chromic.org:queuedaemon.php:25931] Unhandled exception: No URI to resolve in ActivityUtils::resolveUri
0: /lib/activityutils.php(353): ActivityUtils::resolveUri(NULL)
1: /lib/activityutils.php(364): ActivityUtils::compareTypes(NULL, Array)
2: /plugins/ActivityModeration/ActivityModerationPlugin.php(113): ActivityUtils::compareVerbs(NULL, Array)
3: [internal function]: ActivityModerationPlugin->onStartNoticeSave(Object(Notice))
4: /lib/event.php(105): call_user_func_array(Array, Array)
5: /plugins/TwitterBridge/lib/twitterimport.php(173): Event::handle('StartNoticeSave', Array)
6: /plugins/TwitterBridge/lib/twitterimport.php(72): TwitterImport->saveStatus(Object(stdClass))
7: /plugins/TwitterBridge/lib/tweetinqueuehandler.php(52): TwitterImport->importStatus(Object(stdClass))
8: /lib/dbqueuemanager.php(94): TweetInQueueHandler->handle(Array)
9: /lib/iomaster.php(287): DBQueueManager->poll()
10: /lib/iomaster.php(161): IoMaster->poll()
11: /scripts/queuedaemon.php(111): IoMaster->service()
12: /lib/spawningdaemon.php(189): QueueDaemon->runThread()
13: /lib/spawningdaemon.php(118): SpawningDaemon->initAndRunChild(2)
14: /lib/daemon.php(168): SpawningDaemon->run()
15: /scripts/queuedaemon.php(181): Daemon->runOnce()
16: {main}
See merge request !50
2015-11-05 15:01:07 +00:00
mmn
4b7c904fe0
Merge branch 'correct-author-for-repeat' into 'master'
...
Markup correct author for a repeat
The original author is not the author of this entry, but of the original entry.
See merge request !51
2015-11-05 15:00:35 +00:00
mmn
a3ddc4ec0c
Merge branch 'support-atom-namespaces-in-rss-author' into 'master'
...
Support more author types on RSS
Specifically, any ActivityStreams or ATOM namespaces being used on
an rss channel.
See merge request !52
2015-11-05 15:00:07 +00:00
mmn
3ca4af6868
Merge branch 'group-join' into 'nightly'
...
Add User_group::getObjectType
Since 174586bd51!56
2015-11-05 14:57:29 +00:00
Matthias Fritzsche
ba623d2b4e
update URL
...
bugz.foocorp.net and gitorious.net are outdated
git.gnu.io is current
2015-11-04 12:31:23 +01:00
Chimo
d7b58491ce
Add User_group::getObjectType
...
Since 174586bd51
2015-10-29 20:11:57 -04:00
Mikael Nordfeldth
1b81131c51
Shared notices didn't save the URL
2015-10-28 00:13:17 +01:00
Stephen Paul Weber
e1de6e0aa9
Support more author types on RSS
...
Specifically, any ActivityStreams or ATOM namespaces being used on
an rss channel.
2015-10-27 18:43:57 +00:00
Mikael Nordfeldth
ebbb9a8990
Bad HTML in translation.
2015-10-27 19:05:07 +01:00
Stephen Paul Weber
54e87dd2c3
Morkup correct author for a repeat
...
The original author is not the author of this entry, but of the original entry.
2015-10-27 17:19:03 +00:00
Chimo
3ae81f095c
TwitterBridge: Add $notice->verb on import
...
Since /plugins/ActivityModeration::onStartNotieSave expects it to be there when calling ActivityUtils::compareVerbs. Otherwise, the following exception is unhandled:
2015-10-26 15:33:03 LOG_ERR: [sn.chromic.org:queuedaemon.php:25931] Unhandled exception: No URI to resolve in ActivityUtils::resolveUri
#0 /lib/activityutils.php(353): ActivityUtils::resolveUri(NULL)
#1 /lib/activityutils.php(364): ActivityUtils::compareTypes(NULL, Array)
#2 /plugins/ActivityModeration/ActivityModerationPlugin.php(113): ActivityUtils::compareVerbs(NULL, Array)
#3 [internal function]: ActivityModerationPlugin->onStartNoticeSave(Object(Notice))
#4 /lib/event.php(105): call_user_func_array(Array, Array)
#5 /plugins/TwitterBridge/lib/twitterimport.php(173): Event::handle('StartNoticeSave', Array)
#6 /plugins/TwitterBridge/lib/twitterimport.php(72): TwitterImport->saveStatus(Object(stdClass))
#7 /plugins/TwitterBridge/lib/tweetinqueuehandler.php(52): TwitterImport->importStatus(Object(stdClass))
#8 /lib/dbqueuemanager.php(94): TweetInQueueHandler->handle(Array)
#9 /lib/iomaster.php(287): DBQueueManager->poll()
#10 /lib/iomaster.php(161): IoMaster->poll()
#11 /scripts/queuedaemon.php(111): IoMaster->service()
#12 /lib/spawningdaemon.php(189): QueueDaemon->runThread()
#13 /lib/spawningdaemon.php(118): SpawningDaemon->initAndRunChild(2)
#14 /lib/daemon.php(168): SpawningDaemon->run()
#15 /scripts/queuedaemon.php(181): Daemon->runOnce()
#16 {main}
2015-10-27 10:12:33 -04:00
Stephen Paul Weber
03c68d283d
Respect isPermalLink=false on RSS guid
2015-10-27 03:18:04 +00:00
Stephen Paul Weber
4c2bc465a0
Accept 204 for PuSH subscription
...
Some hubs (notably, pushpress, used by wordpress.com) return 204 to mean success.
This used to be allowed by the spec, so no harm in accepting it.
2015-10-27 03:16:39 +00:00
Mikael Nordfeldth
2c8536dbf0
Link source==share notices
2015-10-14 01:30:29 +02:00
Mikael Nordfeldth
401b774c2f
Only set ->actor in a case where it has not yet been set
...
Otherwise it could overwrite it with the wrong actor (the "second round"
for share activities)
2015-10-14 01:20:50 +02:00
Mikael Nordfeldth
d260808cd3
intval for type assurance
2015-10-14 01:16:22 +02:00
Mikael Nordfeldth
79c40bc73b
Type-aware comparison is necessary for Notice is_local/scope
2015-10-14 00:42:15 +02:00
Mikael Nordfeldth
b6aeff89c4
Call Notice::saveActivity instead of Ostatus_profile->processActivity
2015-10-14 00:10:54 +02:00
Mikael Nordfeldth
236bf0b0f5
Remote notice creators should not have notice is_local default to LOCAL_PUBLIC
2015-10-14 00:10:01 +02:00
Mikael Nordfeldth
005c108118
Shared activities were missing the actor
2015-10-13 23:40:35 +02:00
Mikael Nordfeldth
5b307c0417
Add a url test in Notice::saveActivity
2015-10-13 23:39:40 +02:00
Mikael Nordfeldth
65adefe170
Wrong variable names in SharePlugin
2015-10-13 23:18:13 +02:00
Mikael Nordfeldth
4b69ef41e2
Bad variable name in File_redirection
2015-10-13 22:57:45 +02:00
Mikael Nordfeldth
e379c49d49
Removing excess debug logging
2015-10-13 22:55:27 +02:00
Mikael Nordfeldth
c8a907c828
Bookmark:addNew did not add a proper rel=related
2015-10-13 12:31:35 +02:00
Mikael Nordfeldth
3f4d4cb7a0
Better error handling in Bookmark
2015-10-12 18:28:32 +02:00
Mikael Nordfeldth
67e7bc55ea
Bookmarks are almost migrated
...
Now they are just not being saved in the bookmark table.
2015-10-12 17:48:23 +02:00
Mikael Nordfeldth
7834e67583
Just a functionifying of Notice->rendered
2015-10-12 17:16:13 +02:00
Mikael Nordfeldth
297d68f36c
Change Bookmark plugin version details
2015-10-12 09:47:30 +02:00
Mikael Nordfeldth
0e588bdeca
Woops, put the bookmark get* functions in the wrong file.
2015-10-11 22:08:28 +02:00
Mikael Nordfeldth
1dac0e709a
First step of making Bookmark saveActivity-compatible
2015-10-10 23:47:43 +02:00
Mikael Nordfeldth
b209276e72
Stricter typing for Bookmark plugin
2015-10-10 23:15:51 +02:00
Mikael Nordfeldth
5726459629
unmaintained plugins that accidentally got translations
2015-10-10 22:40:05 +02:00
mmn
0926316a76
Merge branch 'master' into 'nightly'
...
convert activity stream RFC3339 dates to mysql datetime format when saving remote event dates to db
See merge request !34
2015-10-10 20:38:01 +00:00
mmn
3255e2e1b8
Merge branch 'page_title_showstream' into 'nightly'
...
Show page title in user's profile page
Enable page title on user's profile page to make it consistent with all other pages and better orient users.
See merge request !22
2015-10-10 20:36:59 +00:00
mmn
32f77dbf05
Merge branch 'translation-snapshot-october-2015' into 'nightly'
...
Snapshot of the Transifex translation project - October 2015
It's been 7 months since the last localization update, and the files in the repository are out of sync with the current state of the project. Our Transifex team has since grown to 63 translators, many of them are active members of the GNU social community. I don't know how we will resolve this situation, but it is clear that we have to act. If you plan to redesign the plugin system in the future to support external repository for localizations, that would work as well. But now, please let us do an update. It would be a serious disgrace to the community to throw all of their hard work away.
See merge request !32
2015-10-10 20:36:04 +00:00
mmn
89d3d9b2ce
Merge branch 'usergroups_page' into 'nightly'
...
Improve display of user's groups page.
* Show page notice as for subscriptions
* Show instructions when user has no groups
* Add explanation of remote groups and link to skilledtest wiki
Here is how it looks when a logged in user is not following groups yet
After following a group, you still see the instruction notice. This way you have links to searching groups and creating a new one.
Finally when logged out:
The current version on nightly has basically no text at all.
See merge request !25
2015-10-10 20:35:36 +00:00
mmn
77951647ce
Merge branch 'oauth-default-icon' into 'nightly'
...
Add default icon to OAuth apps
When MySQL runs in strict mode, it doesn't seem possible to add a new OAuth app.
This is because:
* The 'icon' field has no defaults and also has NOT NULL constraint.
* GS uploads/sets the icon[1] (if provided) after the SQL insert[2]
The easiest fix seemed to be to provide a default icon value.
This change sets the default to the "blue peg" default avatar from the base theme.
[1]
7f30e61402/actions/newapplication.php (L176)7f30e61402/actions/newapplication.php (L186)!29
2015-10-10 20:34:22 +00:00
mmn
238d2a3876
Merge branch 'link-atom-fix' into 'nightly'
...
atom: <link> urls should be attr, not content
Some activities (ex: repeats and follows) have <link>s like this:
<link rel="alternate" type="text/html">http://example.org </link>
This commit changes them to:
<link rel="alternate" type="text/html" href="http://example.org "/>
See merge request !30
2015-10-10 20:33:58 +00:00
Mikael Nordfeldth
fe9457daea
Syntax and minor fixes
...
Deleted_notice and Bookmark getByPK assocative array for example.
2015-10-10 22:23:24 +02:00
Mikael Nordfeldth
174586bd51
Some code aligning for consistency
2015-10-10 22:09:51 +02:00
Mikael Nordfeldth
cae43344ec
Start reworking Bookmark plugin for more modern code
2015-10-10 21:56:02 +02:00
Mikael Nordfeldth
18f07a48e8
Using some Managed_DataObject::getByPK calls for consistency
2015-10-10 21:40:02 +02:00
Mikael Nordfeldth
37f2da03e1
newUri might as well be put in Managed_DataObject
2015-10-10 21:31:26 +02:00
Mikael Nordfeldth
45bc192625
If that $options key wasn't set, this won't change anything anyway
2015-10-10 21:22:07 +02:00
