Mikael Nordfeldth
55544845db
Just some comment clarification
2016-03-21 17:50:06 +01:00
Mikael Nordfeldth
86ce93b376
Notice->deleteRelated should be called from delete()
2016-03-21 17:34:03 +01:00
Mikael Nordfeldth
14cb2d5398
Merge branch 'master' into mmn_fixes
2016-03-21 12:27:04 +01:00
Mikael Nordfeldth
afdd6d39ec
Some Google stuff that need to be there (or comments)
...
Note that these won't be shown to the enduser and will never be accessed automatically.
We should put the salmon-protocol stuff on ostatus.org
2016-03-21 12:25:04 +01:00
Mikael Nordfeldth
b4cbf620ab
woops, accidentally deleted updates-from rel on mass Google-deletion
2016-03-21 12:13:01 +01:00
Mikael Nordfeldth
1ebd4f342e
woops, accidentally deleted updates-from rel on mass Google-deletion
2016-03-21 12:12:24 +01:00
Mikael Nordfeldth
38f7deca78
Avoid "property of non-object" PHP notice.
2016-03-21 11:17:25 +01:00
Mikael Nordfeldth
51ef894a47
Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-03-21 03:24:15 +01:00
Mikael Nordfeldth
1e89369ef8
geometa.js doesn't exist anymore
2016-03-21 03:23:39 +01:00
Mikael Nordfeldth
a2d8305e21
Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
2016-03-21 03:21:51 +01:00
mmn
9f84f63471
Merge branch 'new-avatar' into 'master'
...
Changed default avatar in neo-gnu for the more fun @mosphirit gnu.
For now I am going to propose only that change, the default avatar. In the future maybe we can use only one SVG instead multiple PNG but I want to do for now the less changes possible.
See merge request !116
2016-03-20 22:21:39 -04:00
Mikael Nordfeldth
241b965715
oEmbed CSS file
2016-03-21 03:12:24 +01:00
Mikael Nordfeldth
ae681b10e7
geometa.js doesn't exist anymore
2016-03-21 03:11:22 +01:00
Mikael Nordfeldth
980085a8a3
Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
...
Conflicts:
plugins/Minify/extlib/minify/README.txt
plugins/Minify/extlib/minify/UPGRADING.txt
plugins/Minify/extlib/minify/min/README.txt
plugins/Minify/extlib/minify/min/builder/index.php
plugins/Minify/extlib/minify/min/lib/JSMin.php
plugins/Minify/extlib/minify/min/lib/Minify.php
plugins/Minify/extlib/minify/min/lib/Minify/CSS.php
plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php
plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php
plugins/Minify/extlib/minify/min/lib/Minify/Packer.php
plugins/Recaptcha/RecaptchaPlugin.php
2016-03-21 03:10:19 +01:00
mmn
43178dfe10
Merge branch 'bashrc/remove_google_references' into 'master'
...
Remove Google References
This removes most references to:
- Google Code
- Google Buzz
- Google Maps
- Google Gears
- General Google services promotion
There are still some remaining Google references, particularly a script within plugins/Minify. You might want to check that to see if it's really necessary and whether the javascript it points to is actually free software.
See merge request !117
2016-03-20 22:07:06 -04:00
Mikael Nordfeldth
50a10cf161
Minify is evil.
2016-03-21 03:02:22 +01:00
Mikael Nordfeldth
cd24f7d30a
Issue #166 - we test exif data below, no need for error output
2016-03-21 02:56:47 +01:00
Mikael Nordfeldth
78e23bd4ec
Fix issue #171 with latent htmLawed reference
2016-03-21 02:55:10 +01:00
Mikael Nordfeldth
b7c4c960e2
Don't use default_port for irc schemes
2016-03-21 02:48:37 +01:00
Mikael Nordfeldth
e64c3a1d87
irc and ircs schemes for HTMLPurifier
2016-03-21 02:46:28 +01:00
Mikael Nordfeldth
cdcf6cdb25
Hacky method to avoid cutting conversation "more" link out
2016-03-21 02:42:28 +01:00
Mikael Nordfeldth
aa3865c303
Split threaded notice list classes into own files.
2016-03-21 02:33:57 +01:00
Bob Mottram
11c57e7aee
Remove Google References
...
This removes most references to Google, with some
remaining since they may point to things which are still
relevant. References to Google Code, Google Buzz and
Google Maps have been removed
2016-03-20 13:06:58 +00:00
Carlos Sanmartín Bustos
2bb5c5806f
Changed default avatar in neo-gnu for the more fun @mosphirit gnu.
2016-03-19 12:53:59 +01:00
Mikael Nordfeldth
365f3d2aa5
Full-content oEmbed html doesn't take up all space (and renders properly)
2016-03-17 12:58:40 +01:00
Mikael Nordfeldth
102f7ab059
oEmbed neatifying (inspired by Qvitter)
2016-03-17 00:31:45 +01:00
Mikael Nordfeldth
99a2230fdb
h5 and h6 don't need margin-bottom methinks
2016-03-17 00:31:32 +01:00
Mikael Nordfeldth
bf7c035f99
only direct .inline-attachment children
2016-03-16 20:37:57 +01:00
Mikael Nordfeldth
5f5e53a8d5
Merge branch 'master' into mmn_fixes
2016-03-15 16:55:39 +01:00
Mikael Nordfeldth
b2cfbded2e
Upgrading from 1.1.x would make uri fields have length=255
2016-03-15 16:54:10 +01:00
Mikael Nordfeldth
f4833c6c91
More verbose salmon debugging
2016-03-15 16:53:19 +01:00
Mikael Nordfeldth
f32414dd93
Upgrading from 1.1.x would make uri fields have length=255
2016-03-15 16:52:57 +01:00
Mikael Nordfeldth
349e842078
UPDATE ActivityVerb
2016-03-14 15:26:03 +01:00
Mikael Nordfeldth
ca8f0f84c4
Woops, forgot to include this file!
2016-03-14 15:25:05 +01:00
Mikael Nordfeldth
0f5ebb6827
Redundant font definitions in CSS
2016-03-10 15:15:06 +01:00
Mikael Nordfeldth
5ca2a28246
Make oEmbed handle our http/https setting better.
2016-03-10 14:20:21 +01:00
Mikael Nordfeldth
566977c136
forgot 'new' after throw
2016-03-10 13:46:19 +01:00
Mikael Nordfeldth
15c16ac54e
Make sure File_thumbnail->getPath() doesn't throw NoResultException
2016-03-09 23:49:01 +01:00
Mikael Nordfeldth
bd75305560
Define-ify excluded end-characters of URL autolinking
2016-03-09 15:16:47 +01:00
Mikael Nordfeldth
c769924505
Reduce the number of allowed characters in auto-linking URLs.
2016-03-09 15:05:36 +01:00
Mikael Nordfeldth
a24c6fdb39
If our host matched in File lookup, it could throw exceptions on Router->map
2016-03-09 14:52:15 +01:00
Mikael Nordfeldth
d179afa303
Save allowed path/qstring/fragment characters in constants
2016-03-09 14:51:52 +01:00
Mikael Nordfeldth
723b49a22a
throw exception instead of clientError
2016-03-09 14:17:55 +01:00
Mikael Nordfeldth
e2c6f2f96f
Let's be consistent with URL verbs
2016-03-08 20:01:06 +01:00
Mikael Nordfeldth
e4310a57cd
Profile->noticeCount minor change
2016-03-08 20:00:58 +01:00
Mikael Nordfeldth
4c7436e328
Match empty on "" and not just NULL
2016-03-08 02:00:34 +01:00
Mikael Nordfeldth
4360c65ed9
Super special case where we should copy files instead of mv
2016-03-08 01:59:58 +01:00
Mikael Nordfeldth
3b1181dae6
Display locally stored remote GIFs as thumbnails
...
Many newspapers seem to use animated GIFs as catchy header images, which
we would fail to show from oEmbed/OpenGraph fetching since they would
want us to "use File as Thumbnail", but the only place the image filename
was stored was in File_thumbnail, for the thumbnail of that file_id which
had a URL set.
2016-03-08 01:36:24 +01:00
Mikael Nordfeldth
e43fe85454
Note that you should run upgrade procedure as the PHP user
2016-03-07 23:37:07 +01:00
Mikael Nordfeldth
cfc82591da
chmod 0775 directories we create
...
Security for the 'g+rx' should be handle by having the parent directory
inaccessible for global users, which is usually the case.
2016-03-07 23:23:32 +01:00
