eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
19,566 Commits 8 Branches 3 Tags 310 MiB
5fd91bf3a2
Commit Graph

19566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chimo
9e1d4bfbf0 jquery-cookie returns undefined as of 1.4.0 
when a cookie isn't set.

This fixes a problem where the browser was never asking for location,
and the JSON.parse call was throwing an exception when the geolocation cookie wasn't
present.
 2015-06-20 19:38:58 -04:00
Mikael Nordfeldth
fde3b99e8e Less redundant code, please 2015-06-21 01:37:29 +02:00
mmn
29620619b5 Merge branch 'plugins-documentation' into 'nightly' 
Plugins documentation

* Bring content from https://web.archive.org/web/20140821102047/http://status.net/wiki/HOWTO_Make_a_Plugin
* Point link on Plugins Admin Panel page to plugins/README.md ( Ref #53 )
* Add link to "Community Plugins"

See merge request !19
 2015-06-20 22:49:31 +00:00
mmn
46cf5aa2a4 Merge branch 'remove_broken_plugins_from_default' into 'nightly' 
Drop QnA from default plugins

Since it doesn't work (at least at the moment) it shouldn't be proposed as default plugin

See merge request !15
 2015-06-20 22:48:49 +00:00
mmn
ee9176f20d Merge branch 'drop_corporate_text' into 'nightly' 
Drop corporate text plus minor rewording

Following [this discussion](https://gnusocial.no/conversation/190441#notice-190441) I only fixed corporate-only occurrences. I suggest People instead of User directory. Moreover I fixed a minor inconsistency (Trends should be preferred to Trending topics).

The full locale folder should be fixed once we have digitaldreamer's feedback. But we can at least start from this.

See merge request !16
 2015-06-20 22:48:31 +00:00
mmn
1d11153396 Merge branch 'character_count' into 'nightly' 
Fix #31 character count floats in replies

See merge request !17
 2015-06-20 22:47:22 +00:00
Mikael Nordfeldth
7c373edf4d implement javascript callbacks (no remove yet) 2015-06-14 23:14:00 +02:00
Mikael Nordfeldth
41fe435553 oops forgot an alert() 2015-06-14 22:04:57 +02:00
Mikael Nordfeldth
01cbe744b6 Move some javascript out to an E (Event) object 2015-06-14 21:57:39 +02:00
chimo
e32cd2dd15 Add link to 'community plugins' 2015-06-14 12:05:54 -04:00
chimo
39462c3a2e Documentation about plugins 
* Content in plugins/doc/Plugin_development.md from:
https://web.archive.org/web/20140821102047/http://status.net/wiki/HOWTO_Make_a_Plugin

* Point link on Plugins Admin Panel page to plugins/README.md
 2015-06-14 11:59:46 -04:00
abjectio
e9a6d5be51 Removed the full AGPL license file 2015-06-13 11:11:50 +02:00
abjectio
fca53a56b4 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-06-13 11:10:10 +02:00
Mikael Nordfeldth
a03249dd99 No reason to have makeRegex protected 2015-06-12 17:15:39 +02:00
abjectio
437dc3d713 Added .pot file and Norwegian translation 2015-06-10 22:11:34 +02:00
abjectio
ea076a8783 Bug in use of gettext/locale string 2015-06-10 22:10:14 +02:00
abjectio
965cd92a72 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-06-10 22:09:30 +02:00
aroquen
204ebe607d Fix #31 character count floats in replies 2015-06-07 22:44:33 +02:00
aroquen
267a49103e Rewording: trends instead of trending topics for consistency with other occurrences 2015-06-07 22:28:19 +02:00
aroquen
a42d74a238 Rewording: people instead of user directory 2015-06-07 22:27:31 +02:00
aroquen
f9c51c2478 No corporate-only strings in code base anymore 2015-06-07 22:24:14 +02:00
aroquen
776b82e6e8 Drop QnA from default plugins 2015-06-07 14:05:51 +02:00
Mikael Nordfeldth
8a002e98bc File-related functions not declared static 2015-06-07 10:01:28 +02:00
Mikael Nordfeldth
4fc62a8bf5 Another function not matching parent declaration 2015-06-07 09:26:12 +02:00
abjectio
3bdcdfd114 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-06-06 23:32:10 +02:00
mmn
f7769c17b5 Merge branch 'subscribers_as_addressees' into 'nightly' 
Add subscribers as addressees to toselector

Populate the dropdown recipient menu first with groups, then with followed users. There is no alphabetical sorting (perhaps to be added later?). See this discussion https://gnusocial.no/conversation/190705#notice-190705. Thanks to @chimo.

Hope it is good now.

See merge request !14
 2015-06-06 21:14:50 +00:00
Chimo
76c9971c31 Show nickname if user has oldschool option enabled 2015-06-06 23:07:34 +02:00
aroquen
e46dcc0cc4 Add subscribed users to dropdown menu. 2015-06-06 23:07:13 +02:00
abjectio
9dc8250956 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-06-06 22:27:51 +02:00
mmn
3a910d8c8c Merge branch 'doc-src' into 'nightly' 
Small updates to doc-src files

* Remove mentions of GTalk since it's been replaced by Hangouts which doesn't do XMPP
* Update URLS, use HTTPS where possible

See merge request !11
 2015-06-06 20:27:00 +00:00
mmn
e203271d95 Merge branch 'nightly' into 'nightly' 
fixed realtime action buttons and marker in base, adjusted settings in neo-quitter

fixed realtime action buttons and marker in base so that all neo themes benefit from it, adjusted settings in neo-quitter

See merge request !12
 2015-06-06 20:20:52 +00:00
Mikael Nordfeldth
6267e7a930 Merge branch 'hackfest' into nightly 2015-06-06 22:15:39 +02:00
Mikael Nordfeldth
d76d37340a Function declarations not matching their parents 2015-06-06 22:14:56 +02:00
Mikael Nordfeldth
871912a00a Plugins didn't match lib/plugin.php onPluginVersion function definition 
I ran:
for i in `grep -R onPluginVersion...version plugins/|cut -d: -f1`; do sed -i '{ s/\(onPluginVersion(\)\(\&\$versions\)/\1array \2/ }' $i; done
 2015-06-06 22:04:01 +02:00
Mikael Nordfeldth
628e7fa583 ApiOAuthAction functions didn't match parents 2015-06-06 21:57:42 +02:00
Mikael Nordfeldth
15643c802b EndActionExecute event should only run if the Action is not overridden 2015-06-06 20:13:11 +02:00
Mikael Nordfeldth
814696c202 DB_DataObject delete function calls PEAR::isError directly, ignore E_STRICT 2015-06-06 20:01:03 +02:00
Mikael Nordfeldth
50070c9b0a GS_DataObject overrides DB_DataObject insert() too 2015-06-06 19:59:01 +02:00
Mikael Nordfeldth
06503cc11b joinAdd calls DB_DataObject::factory directly so no GS_DataObject override 2015-06-06 19:41:23 +02:00
Mikael Nordfeldth
daaafd86e2 DB_DataObject recommends using ->tableName() 2015-06-06 19:35:10 +02:00
Mikael Nordfeldth
9e52b6f2d1 DB_DataObject v1.11.4 made some functions static (finally!) 2015-06-06 19:30:53 +02:00
Marcus Moeller
fae8e38616 fixed realtime action buttons and marker in base, adjusted settings in neo-quitter 2015-06-06 19:18:20 +02:00
Mikael Nordfeldth
4cba7a4002 DB_DataObject v1.11.4, finally! 2015-06-06 19:13:57 +02:00
Mikael Nordfeldth
9712a92853 MITM the DB_DataObject to avoid PEAR::DB strict standards warnings 2015-06-06 18:29:15 +02:00
abjectio
28eb441812 Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-06-06 18:15:17 +02:00
Mikael Nordfeldth
3c2a720b21 Found a remnant staticGet call 2015-06-06 17:39:25 +02:00
Mikael Nordfeldth
6478034e92 Diaspora-compatible Salmon slap receival 
We're not all the way there yet, there is something which seems to bugger
up profile discovery from their end.
 2015-06-06 17:14:38 +02:00
Mikael Nordfeldth
faf14197cd Diaspora doesn't understand our Salmon POST, so send again 2015-06-06 16:57:29 +02:00
Mikael Nordfeldth
b63054cb1d OStatus update-profile.php script now finds Diaspora salmon URLs 2015-06-06 16:18:22 +02:00
Mikael Nordfeldth
4de125dd84 Moved FeedSubException parent class to own file 2015-06-06 16:02:25 +02:00