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
Mikael Nordfeldth
a793d211d2
Match parent class definition of clientError
2015-10-10 20:51:53 +02:00
Mikael Nordfeldth
b4c51b2d39
Use an atom:link to ApiMediaUpload response instead of mediahref
...
'cause why not?
2015-10-10 20:41:14 +02:00
Mikael Nordfeldth
9728270acd
Add mediahref in our incredibly arbitrary response
2015-10-10 17:15:29 +02:00
Mikael Nordfeldth
5d91c9a820
Don't send multiple error responses in ApiMediaUpload :)
2015-10-10 17:12:44 +02:00
Mikael Nordfeldth
2ad7c4313d
Search engine fix because Directory did a 'join'
...
Colliding columns with a very lacking error message from DB ;)
2015-10-10 12:16:12 +02:00
Mikael Nordfeldth
6376b78a80
I think I have made the delete verb generate proper AS
...
ActivityStreams had a different/better definition than me
in how to define the Delete verb data:
http://wiki.activitystrea.ms/w/page/23541872/Delete
2015-10-10 11:08:17 +02:00
Hannes Mannerheim
a9f879c2ba
better explanation
2015-10-10 00:20:32 +02:00
Hannes Mannerheim
b24191f9f9
convert activity stream RFC3339 dates to mysql datetime format when saving remote event dates to db
2015-10-10 00:11:54 +02:00
mmn
3154302b53
Merge branch 'master' into 'nightly'
...
make events federate
See merge request !33
2015-10-09 14:43:45 +00:00
Hannes Mannerheim
61ed36e446
make event urls federate
2015-10-09 16:22:47 +02:00
Mikael Nordfeldth
dd149a76f3
AtomPub should work now, at least for post/note
2015-10-09 16:19:26 +02:00
Mikael Nordfeldth
2dfd34b12d
Post verb default type is 'note'
2015-10-09 16:18:12 +02:00
Hannes Mannerheim
55655ba319
make event location federate
2015-10-09 16:16:13 +02:00
Hannes Mannerheim
827dffb94c
make event dates federate
2015-10-09 16:00:33 +02:00
Mikael Nordfeldth
2d3f1ef520
You don't have to push objects as references
2015-10-09 15:45:23 +02:00
Mikael Nordfeldth
0bdbb32f3b
Consistent camelcasing
2015-10-09 15:45:05 +02:00
Mikael Nordfeldth
5dc718c54d
Make Bsaic Auth work properly with RW actions
2015-10-09 15:43:17 +02:00
Hannes Mannerheim
5a2d760177
update from upstream
2015-10-09 14:40:43 +02:00
Hannes Mannerheim
499d4aadbc
make events federate
2015-10-09 13:10:48 +02:00
Mikael Nordfeldth
216a04df86
Switching variable access in ApiTimelineUser to GNUsocial improvements
2015-10-09 11:23:20 +02:00
Mikael Nordfeldth
3013b84e98
Don't enable StrictTransportSecurity by default
...
(but you should enable it if you use TLS, but there are many who do this
through their webserver and it's odd to have double headers etc...)
2015-10-09 10:55:12 +02:00
Mikael Nordfeldth
2d81df4760
Deleted_notice variable specification fixed
2015-10-08 13:20:17 +02:00
Mikael Nordfeldth
180958185f
Found newer Diaspora protocol specifications
...
http://www.rubydoc.info/github/Raven24/diaspora-federation/master/DiasporaFederation/Salmon/EncryptedSlap
2015-10-05 12:49:54 +02:00
Mikael Nordfeldth
ee6096cca8
FIXME: Diaspora has its own salmon slap semantics
2015-10-05 11:32:10 +02:00
Mikael Nordfeldth
3902dc963a
Diaspora encloses magic envelope in <atom:entry>??!!?!
2015-10-05 11:22:23 +02:00
Mikael Nordfeldth
0ba53edd96
Can't use return-value in empty()
2015-10-04 22:32:14 +02:00
Mikael Nordfeldth
ec19661312
Can't use return-value in empty()
2015-10-04 22:31:07 +02:00
digital dreamer
d7fd6bac72
Snapshot of the Transifex translation project - October 2015
2015-10-04 18:23:01 +02:00
Mikael Nordfeldth
af1b0915f4
Magic signature discovery and envelope changes
2015-10-04 17:26:35 +02:00
Mikael Nordfeldth
6afa091dca
Change some Salmon events and similar
...
Use Profile instead of User and (if we know it) send along the target
profile, so a Diaspora plugin can encrypt to the receiver.
2015-10-04 17:26:23 +02:00
Mikael Nordfeldth
f4ed171397
Make Magicsig capable of loading public PKCS1 keys
2015-10-04 17:22:19 +02:00
Mikael Nordfeldth
2970333adb
Set otherwise undiscovered salmonuri on OStatus script update-profile.php
2015-10-04 17:21:56 +02:00
Mikael Nordfeldth
57f26a97fb
var_export without true
2015-10-04 16:40:21 +02:00
Mikael Nordfeldth
4238875ebe
autoloading of Crypt_AES and Crypt_RSA is easier
2015-10-04 15:57:11 +02:00
