Mikael Nordfeldth
20bad68845
Added SSL option to web and cli installers
2013-08-12 13:08:14 +02:00
Mikael Nordfeldth
d6cf6e88cd
letting the noticeform at the top show, to fix broken reply button javascript
2013-08-12 13:00:05 +02:00
Mikael Nordfeldth
3ad3535cd8
Merge commit 'refs/merge-requests/230' of git://gitorious.org/statusnet/mainline into merge-requests/230
2013-08-12 12:37:46 +02:00
Mikael Nordfeldth
f79aec36fe
Merge remote-tracking branch 'statusnet/master'
...
This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.
Conflicts:
doc-src/about
doc-src/faq
plugins/OpenID/doc-src/openid
2013-08-12 12:23:17 +02:00
Evan Prodromou
971636fb9b
Upgrade version number
2013-07-16 11:23:47 -07:00
Evan Prodromou
3fc1d245a1
Merge 1.1.x into master
2013-07-16 10:57:06 -07:00
Evan Prodromou
540b90dbd9
Better verb comparison
2013-06-30 12:08:11 -04:00
Evan Prodromou
66f4a39105
Squashed commit of the following:
...
commit bd23a7da105d635414643dfcedd9c8f710d565b8
Author: Evan Prodromou <evan@e14n.com>
Date: Sat Jun 29 07:49:03 2013 -0400
Make the after flag work correctly
commit 5c5845a2f866f0bbffedd8e2e5d1f512f87d5329
Author: Evan Prodromou <evan@e14n.com>
Date: Sat Jun 29 06:14:43 2013 -0400
Add an 'after' flag for backup script
2013-06-29 07:52:09 -04:00
Evan Prodromou
4092ee1bd1
Squashed commit of the following:
...
commit bd23a7da105d635414643dfcedd9c8f710d565b8
Author: Evan Prodromou <evan@e14n.com>
Date: Sat Jun 29 07:49:03 2013 -0400
Make the after flag work correctly
commit 5c5845a2f866f0bbffedd8e2e5d1f512f87d5329
Author: Evan Prodromou <evan@e14n.com>
Date: Sat Jun 29 06:14:43 2013 -0400
Add an 'after' flag for backup script
2013-06-29 07:49:43 -04:00
Evan Prodromou
660b8f0c9c
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2013-06-25 22:27:23 -04:00
Evan Prodromou
37bbb96e1b
Better output for shares
2013-06-25 22:27:02 -04:00
Evan Prodromou
557105b86d
Better output for shares
2013-06-25 22:26:27 -04:00
Jean Baptiste Favre
723f0f1929
PHP 5.4: Fix 'mysql has gone away' error when using mysqli driver with forked daemons (at least TwitterBridge)
2013-06-20 11:07:51 +02:00
Evan Prodromou
35ff643230
Turn off Activity by default
2013-06-16 02:16:40 +00:00
Jean Baptiste Favre
368906258a
You need an API key when using embed.ly. Unfortunatly oembedhelper.php does not support it. This commit aims to fix it.
2013-06-15 18:35:41 +02:00
Evan Prodromou
14fbd68a12
Cast lat/lon to float; check for non-empty
2013-06-08 21:16:58 -04:00
Evan Prodromou
8853821db2
Bad variable in ActivityObject::fromMessage()
2013-06-08 21:07:56 -04:00
Evan Prodromou
f8393d10b7
Bad variable in ActivityObject::fromMessage()
2013-06-08 21:05:09 -04:00
Evan Prodromou
0a0aeed413
Use the link property for the URL, not the ID
2013-06-08 19:19:16 -04:00
Evan Prodromou
ce451c0018
Use the link property for the URL, not the ID
2013-06-08 19:18:28 -04:00
Evan Prodromou
0fb6819200
Add direct messages to backup
2013-06-08 17:54:35 -04:00
Evan Prodromou
96d7b68c50
Store direct messages as an activity
2013-06-08 17:54:27 -04:00
Evan Prodromou
393130d80f
Add direct messages to backup
2013-06-08 17:53:47 -04:00
Evan Prodromou
9fd2c3e1c9
Store direct messages as an activity
2013-06-08 17:45:49 -04:00
Evan Prodromou
caf5f0b3bd
Some more well-known sources from plugins
2013-06-07 11:49:47 -04:00
Evan Prodromou
ec04acb9b4
Some more well-known sources from plugins
2013-06-07 11:49:34 -04:00
Evan Prodromou
08eca420ca
Add generator to JSON output
2013-06-07 11:35:06 -04:00
Evan Prodromou
fe2c0a9687
Add generator to JSON output
2013-06-07 11:34:54 -04:00
Evan Prodromou
25823f6e5b
Some better context for notices as arrays
2013-06-07 03:11:33 -04:00
Evan Prodromou
6164940e8c
Some better context for notices as arrays
2013-06-07 03:11:23 -04:00
Evan Prodromou
9bb5d8c695
Coerce width, height of media link to integer
2013-06-07 00:30:19 -04:00
Evan Prodromou
9a3c3c5cf8
Coerce width, height of media link to integer
2013-06-07 00:30:04 -04:00
Evan Prodromou
221c724b4c
Fix the switch on type
2013-06-05 16:58:54 -04:00
Evan Prodromou
77f23354ad
Fix the switch on type
2013-06-05 16:58:31 -04:00
Evan Prodromou
0e83c5c824
Better type check, better URL
2013-06-05 16:51:46 -04:00
Evan Prodromou
a6bb41a742
Better type check, better URL
2013-06-05 16:51:35 -04:00
Evan Prodromou
dbceb7ba1a
Better URL creation for attachments
2013-06-05 16:14:07 -04:00
Evan Prodromou
7366ee73f5
Better handling of null values in ActivityObject::mimeTypeToObjectType
2013-06-05 16:14:02 -04:00
Evan Prodromou
a9b2a86004
Better URL creation for attachments
2013-06-05 16:12:54 -04:00
Evan Prodromou
5ba2cb07ea
Better handling of null values in ActivityObject::mimeTypeToObjectType
2013-06-05 16:11:51 -04:00
Evan Prodromou
7229533b0f
Use real attachments for JSON output
2013-06-05 09:39:43 -04:00
Evan Prodromou
772383e84b
Use real attachments for JSON output
2013-06-05 09:39:13 -04:00
Evan Prodromou
460d80d09e
Don't set the title of a notice to its plain-text content.
2013-06-04 22:28:45 -04:00
Evan Prodromou
74ec87c27c
Don't set the title of a notice to its plain-text content.
2013-06-04 22:27:29 -04:00
Evan Prodromou
15d466ebe6
Don't add content as title for notes
2013-06-04 19:53:07 -04:00
Evan Prodromou
736bc9cc96
Don't add content as title for notes
2013-06-04 19:52:38 -04:00
Evan Prodromou
fa6138195b
Change geopoint to location
2013-06-04 17:23:09 -04:00
Evan Prodromou
759754555d
Change geopoint to location
2013-06-04 17:22:51 -04:00
Evan Prodromou
a2dd5dfef3
Remove duplicate of extensions
2013-06-04 17:16:34 -04:00
Evan Prodromou
b2849c4bb3
Remove duplicate of extensions
2013-06-04 17:15:43 -04:00
