Mikael Nordfeldth
d448275713
Merge branch 'nightly'
2015-09-06 01:54:00 +02:00
Mikael Nordfeldth
4354ce21d1
introducing html_sprintf for easier sprintf'ing with htmlspecialchars
2015-09-06 01:53:11 +02:00
Chimo
dc5dd69f2e
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)
[2]
7f30e61402/actions/newapplication.php (L186)
2015-09-05 17:02:17 -04:00
Mikael Nordfeldth
ea75e1c29c
Notice_location class in db/core.php
2015-09-04 23:12:23 +02:00
Mikael Nordfeldth
7f30e61402
Oops, forgot Notice_location PHP file
2015-09-04 22:30:33 +02:00
Mikael Nordfeldth
3c86542a40
Move notice location data to Notice_location
...
Will probably take a _long_ time to do scripts/upgrade.php but don't
worry, it can be aborted and resumed.
2015-09-04 22:25:11 +02:00
Mikael Nordfeldth
476197569f
sys_get_temp_dir was added in PHP 5 >= 5.2.1
...
Our requirements are higher than that, so let's just remove the workaround
2015-09-04 22:24:01 +02:00
Mikael Nordfeldth
1e07f8c045
Incorrect use of DataObject type matching after ->find()
2015-09-04 20:35:11 +02:00
mmn
57c87088d4
Merge branch 'configure-docs' into 'nightly'
...
Add a few missing 'attachments' config options
show_thumbs
show_html
filename_base
See merge request !27
2015-09-03 16:11:28 +00:00
mmn
f4b0756e70
Merge branch 'nightly' into 'nightly'
...
Adding ChooseTheme plugin into the plugin repository
This merge request propose the plugin ChooseTheme as a part of the plugin repository for GNU social.
See merge request !9
2015-09-03 16:11:04 +00:00
mmn
a597b28001
Merge branch 'nginx-sample' into 'nightly'
...
Add nginx sample configuration
See merge request !23
2015-09-03 16:10:23 +00:00
mmn
5f74ec6782
Merge branch 'webinstaller-faq-link' into 'nightly'
...
Fix broken link to FAQ in web installer
See merge request !24
2015-09-03 16:09:38 +00:00
Mikael Nordfeldth
e06553b15b
Suggested edits by hannes2peer
2015-09-03 18:04:13 +02:00
Mikael Nordfeldth
84a65c7189
Include PHP libraries from system if not packaged and they are installed.
...
Thanks to:
"Bhuvan Krishna" <bhuvan@swecha.net>
"Sunil Mohan" <sunil@medhas.org>
2015-09-03 17:56:11 +02:00
abjectio
91c1ab6017
Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly
2015-08-18 22:55:28 +02:00
Mikael Nordfeldth
c77bce12e5
Mf2 extlib update from https://github.com/indieweb/php-mf2/
2015-08-15 11:48:39 +02:00
Hannes Mannerheim
76004660e9
make it possible to erase fields in the profile via the api
2015-08-11 22:18:57 +02:00
Mikael Nordfeldth
c1e6e4e65b
OpenID extlib updated: Fixes CVE-2014-8150
2015-08-02 13:41:57 +02:00
Mikael Nordfeldth
b434243416
OpenID extlib updated: Fixes CVE-2014-8150
2015-08-02 13:39:38 +02:00
chimo
60e7dc1e39
Add a few missing 'attachments' config options
...
show_thumbs
show_html
filename_base
2015-08-01 09:24:05 -04:00
aroquen
de1d49865c
Add some bottom margin to space profile items
2015-07-26 19:10:01 +02:00
aroquen
cd6ad8571f
Make group lists look like profile ones in neo-quitter theme
2015-07-26 16:10:34 +02:00
aroquen
86ed4ac603
This margin is not needed anymore
2015-07-26 15:22:11 +02:00
aroquen
8056aec93e
Remove bullets from user's groups list
2015-07-26 12:39:49 +02:00
aroquen
dc9342f184
Group location on a new line as in profile lists
2015-07-26 12:39:48 +02:00
aroquen
31bcf8cfa2
Show full name close to nickname in subscribers list. For consistency with groups list
2015-07-26 12:39:48 +02:00
aroquen
a416abb940
Beautify (a bit) groups list
...
* Reduce font size to fit and look better
* Group nickname is bold
* Add @ prefix to location
2015-07-26 12:39:47 +02:00
aroquen
7b04ee6a9b
Align location label (fixes profile and group directory display)
2015-07-26 12:39:31 +02:00
aroquen
a04b1cda45
Drop dead variable
2015-07-26 11:10:57 +02:00
aroquen
b0abce9bc8
Page notice message as instructions class
2015-07-26 11:10:30 +02:00
aroquen
c6f58d432c
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
2015-07-25 21:38:38 +02:00
Chimo
abde7a2682
Fix broken link to FAQ in web installer
2015-07-25 10:36:31 -04:00
Chimo
05b814ce68
Add nginx sample configuration
2015-07-25 09:39:55 -04:00
aroquen
ad49158fb5
Show page title in user's profile page
2015-07-25 14:45:45 +02:00
Mikael Nordfeldth
266b032b17
UsergroupbyidAction now extends ManagedAction
2015-07-21 02:32:17 +02:00
Mikael Nordfeldth
7ce32619cc
Missing getTarget function in targetedrss10action.php
2015-07-21 02:17:34 +02:00
Mikael Nordfeldth
5b09a150bc
Increased debugging and fixing conversation stitching for saveActivity
2015-07-18 19:19:16 +02:00
Mikael Nordfeldth
e0084a6fdf
Exception handling regarding Foreign_link
2015-07-18 11:39:34 +02:00
Mikael Nordfeldth
b609a3610f
Some missed exception throwing since fixing Foreign_link and Foreign_user
2015-07-18 11:04:35 +02:00
Mikael Nordfeldth
6f62adedfc
Infinite loop on CLI initiated profile deletion for local users
...
profile deleting user deleting profile deleting user...
2015-07-18 02:16:52 +02:00
Mikael Nordfeldth
9fdf6474f8
TwitterBridge working again (for signin and posting to Twitter at least)
...
Now we just need to make it include the newname suggestion if the form fails
(for example forgetting to check the license checkbox or so).
2015-07-18 02:16:15 +02:00
Mikael Nordfeldth
beba2a25d0
Don't retry unhandled transports in OpportunisticQM
...
It'd continue trying xmpp transports forever, for example...
2015-07-18 01:09:50 +02:00
Mikael Nordfeldth
e10d081a56
TwitterBridge is closer to working again
2015-07-17 21:03:37 +02:00
Mikael Nordfeldth
6cd7a4a400
TwitterBridge messing about, Twitter OAuth requires Authorization header now?
...
https://dev.twitter.com/oauth/reference/post/oauth/request_token says that
the request should be a GET with a specific HTTP header instead of query
string parameters for OAuth?
2015-07-17 18:54:39 +02:00
Mikael Nordfeldth
5933056a5b
Twittersettings now works better as Profilesettings extension
2015-07-17 17:50:43 +02:00
Mikael Nordfeldth
d6d06c8cbb
SubMirror now works properly as extended from FormAction
2015-07-17 17:09:36 +02:00
Mikael Nordfeldth
712a6d49d0
Poll settings adapted to FormAction
2015-07-17 16:19:02 +02:00
Mikael Nordfeldth
da168674f9
OpenID settings aligned with FormAction
2015-07-17 16:08:22 +02:00
Mikael Nordfeldth
8d2504a809
Early return in FacebookBridge settings action
2015-07-17 15:27:47 +02:00
Mikael Nordfeldth
be0c10e8f6
Facebooksettings adapted to FormAction
2015-07-17 15:24:37 +02:00