GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
15,568 Commits 8 Branches 4 Tags 310 MiB
c8c7f5b3fe
Commit Graph

5110 Commits

Author SHA1 Message Date
Mikael Nordfeldth
0731207186 updated jquery-infieldlabel from 0.1.2 to 0.2.1 
Source: https://github.com/instanceofme/jquery-infieldlabels/
 2013-09-14 13:30:37 +02:00
Mikael Nordfeldth
4f065d6483 Removed jOverlay as it's outdated and not referenced 2013-09-12 15:57:32 +02:00
Mikael Nordfeldth
56ebe91429 jquery form updated and moved to js/extlib 2013-09-12 15:53:14 +02:00
Mikael Nordfeldth
2da928866b jquery-ui updated and moved to js/extlib 
It seems we don't need all the development files. Though it feels a bit
evil not to keep them. Then again we didn't have the whole dev-tree there.

Really we should maybe use git submodules for this?

I also made sure that if we don't have minify enabled, a non-minified
version of jquery-ui is loaded, as minification is the most evil of all.
Bad as hell to debug, and anyone visiting the site should be allowed to
view all scripts that are run in an overseeable manner.
 2013-09-12 15:48:28 +02:00
Mikael Nordfeldth
a56ad2c43d Updated jquery extlib to v2.0.3 
Includes pre-minimized version from code.jquery.com
 2013-09-10 13:56:51 +02:00
Mikael Nordfeldth
3efa10769c json2 extlib updated to 2013-05-26 version 
Includes minification and Makefile update
 2013-09-10 13:43:50 +02:00
Emily O'Leary
81a357ed5e Putting in functionality so that sites with the "Sometimes" SSL setting allow for users with plugins such as HTTPSEVERYWHERE who wish to use HTTPS to do so without having errors pop up. Specifically this references this issue: http://status.net/open-source/issues/3855#comment-48988. 
(Port detection test removed by MMN-o. Also switched order on the test for
isHTTPS/SensitiveAction.)
 2013-09-10 11:06:53 +02:00
Mikael Nordfeldth
99312c8cc2 Declaring some more static functions properly 
As a bonus I added type declaration on Profile_block::exists and
Subscription::exists respectively.
 2013-09-09 23:28:20 +02:00
Mikael Nordfeldth
a9c4bcd71f Removing unnecessary require_once lines (autoload!) 2013-09-09 23:06:56 +02:00
Mikael Nordfeldth
747fe9d59b Tidying up getUser calls to profiles and some events 
getUser calls are much more strict, and one place where this was found was
in the (un)subscribe start/end event handlers, which resulted in making the
Subscription class a bit stricter, regarding ::start and ::cancel at least.
Several minor fixes in many files were made due to this.

This does NOT touch the Foreign_link function, which should also have a more
strict getUser call. That is a future project.
 2013-09-09 23:03:34 +02:00
Mikael Nordfeldth
f0e967fefd needLogin renamed checkLogin and made a property 
Action extended classes now can set 'needLogin' as a protected property,
which is defaulted to 'false'. However, FormAction defaults this to 'true'
because most of the form actions will require a current login to be valid.

NewgroupAction, NewmessageAction, NewnoticeAction are all affected by this
commit and in the future we will migrate each potential formaction to the
proper class parent tree. :)
 2013-09-02 11:58:47 +02:00
Mikael Nordfeldth
e5e3aeb4e6 newmessage (and Message class) fixed for FormAction 
Also added a needLogin function to the Action class, which will do
redirect to login page with proper returnto setting.
 2013-09-02 11:05:30 +02:00
Mikael Nordfeldth
c735a8363e Conforming to code layout 2013-09-01 20:52:11 +02:00
Mikael Nordfeldth
cfa699e445 NewgroupAction converted to extend FormAction 
Had to change Action function 'prepare' to 'protected', as you can't
(of course) protect something that's been public in a parent class. The
other way around seems fine for PHP... Eventually all actions will have
protected 'prepare' (use execute/run)

A feature of the previously fixed initialization of Action classes, is
that we now have $this->scoped which is the current profile in use. As
of now that is always a local User, except the corresponding Profile
object.

Also, instead of calling 'showForm' everywhere, in case of an error we
just throw an exception of some sort and pass the message along there.

I've also introduced in FormAction the 'showInstructions' function in
order to get a unified instructions/info/error display method.

TODO: Improve info/error message handling, and what/when/where to show.
 2013-08-31 18:01:13 +02:00
Mikael Nordfeldth
8d57fb7dc0 Added a FormAction extension 
FormAction will act as a parent class to Action classes that use forms
of various sorts, such as newgroup creation, settings actions etc.
 2013-08-30 10:28:57 +02:00
Mikael Nordfeldth
13226c5d92 handle no longer uses $argarray or $args 2013-08-30 00:22:22 +02:00
Mikael Nordfeldth
b18e24723f Preparing more object-oriented Action handling 
Action classes can now be run by calling the static function 'run'.
Eventually actions will be migrated so most functionality gets put
into parent classes, and the children don't have to have as much
duplicate code as they have now.
 2013-08-29 23:33:05 +02:00
Mikael Nordfeldth
fac7371179 pivotGet moved into Managed_DataObject 2013-08-29 10:13:07 +02:00
Mikael Nordfeldth
de55d8f83b plugins onAutoload now only overloads if necessary (extlibs etc.) 
lib/plugin.php now has a parent onAutoload function that finds most common
files that are used in plugins (actions, dataobjects, forms, libs etc.) if
they are put in the standardised directories ('actions', 'classes', 'forms',
'lib' and perhaps some others in the future).
 2013-08-28 16:10:30 +02:00
Mikael Nordfeldth
3a7261f70a IMPORTANT: Making prev. Memcached_DataObject working again with schemaDef 
Lots of the Memcached_DataObject classes stopped working when upgraded to
Managed_DataObject because they lacked schemaDef().

I have _hopefully_ made it so that all the references to the table uses
each class' schemaDef, rather than the more manual ColumnDef stuff. Not
all plugins have been tested thoroughly yet.

NOTE: This is applied with getKV calls instead of staticGet, as it was
important for PHP Strict Standards compliance to avoid calling the non-
static functions statically. (unfortunately DB and DB_DataObject still do
this within themselves...)
 2013-08-21 09:48:42 +02:00
Mikael Nordfeldth
e40044e2fa Further static declarations of functions 
Validate could probably be replaced with filter_var if desired (PHP>=5.2.0)
 2013-08-19 14:26:44 +02:00
Mikael Nordfeldth
97ce71e55d Managed_DataObject now has listGet for all classes 2013-08-18 21:02:33 +02:00
Mikael Nordfeldth
923f16abe5 Properly definingStatusNet class static functions with 'static' 2013-08-18 20:37:33 +02:00
Mikael Nordfeldth
761a849a34 Added shared default plugin list between profiles 2013-08-18 20:29:16 +02:00
Mikael Nordfeldth
2a4dc77a63 The overloaded DB_DataObject function staticGet is now called getKV 
I used this hacky sed-command (run it from your GNU Social root, or change the first grep's path to where it actually lies) to do a rough fix on all ::staticGet calls and rename them to ::getKV

   sed -i -s -e '/DataObject::staticGet/I!s/::staticGet/::getKV/Ig' $(grep -R ::staticGet `pwd`/* | grep -v -e '^extlib' | grep -v DataObject:: |grep -v "function staticGet"|cut -d: -f1 |sort |uniq)

If you're applying this, remember to change the Managed_DataObject and Memcached_DataObject function definitions of staticGet to getKV!

This might of course take some getting used to, or modification fo StatusNet plugins, but the result is that all the static calls (to staticGet) are now properly made without breaking PHP Strict Standards. Standards are there to be followed (and they caused some very bad confusion when used with get_called_class)

Reasonably any plugin or code that tests for the definition of 'GNUSOCIAL' or similar will take this change into consideration.
 2013-08-18 13:13:56 +02:00
Mikael Nordfeldth
794163c31f Default to NOT ask for current location for new users 
It may be a bad experience for new users to immediately when trying
out the service be asked for their geographical position. Instead,
let them opt-in for this behaviour.
 2013-08-12 14:40:55 +02:00
Mikael Nordfeldth
38ac5a7005 Automatic memcache support enabler for config 2013-08-12 13:14:50 +02:00
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
Evan Prodromou
46f43052f9 Use status_net, portablecontacts_net namespaces 2013-06-04 17:12:54 -04:00
Evan Prodromou
f66fedaac8 Use status_net, portablecontacts_net namespaces 2013-06-04 17:12:28 -04:00
Evan Prodromou
cba2b1ad9c Slightly better ActivityStreams JSON output 2013-06-04 17:01:05 -04:00
Evan Prodromou
879a6f9ce7 Slightly better ActivityStreams JSON output 2013-06-04 17:00:51 -04:00
Evan Prodromou
795a4a02ba Add the service type for activity objects 2013-06-04 16:31:03 -04:00
Evan Prodromou
64bf691c9c Add the service type for activity objects 2013-06-04 16:29:47 -04:00
Evan Prodromou
2ad5aece55 Better handling of multiple objects 2013-06-04 15:21:59 -04:00
Evan Prodromou
a23290883b Better handling of multiple objects 2013-06-04 15:20:21 -04:00
Evan Prodromou
8e3bd04d98 Only a single object in activitystrea.ms JSON output 2013-06-03 09:11:43 -04:00
Evan Prodromou
11a14a87ba Only a single object in activitystrea.ms JSON output 2013-06-03 09:10:56 -04:00
Evan Prodromou
7ad5ed1db9 Merge branch 'master' of gitorious.org:statusnet/mainline 2013-06-02 15:24:57 -04:00
Evan Prodromou
49d265faa0 Add a registration activity to the end of every backup 2013-06-02 14:41:41 -04:00
Evan Prodromou
cbb5586ab7 Add a registration activity to the end of every backup 2013-06-02 14:38:00 -04:00
Evan Prodromou
1662ccccce Close the collection object 2013-05-29 17:05:09 -04:00
Evan Prodromou
2a3abf8850 Close the collection object 2013-05-29 17:03:08 -04:00
Evan Prodromou
a9f4575d31 Correctly output commas for JSON backups 2013-05-29 16:46:39 -04:00
Evan Prodromou
2f5cdbb9c1 Correctly output commas for JSON backups 2013-05-29 16:45:52 -04:00
Evan Prodromou
1c1bcd7cc6 Add JSON output for backups 
Conflicts:
	lib/useractivitystream.php
 2013-05-24 13:51:57 -04:00
Evan Prodromou
4f818c5c81 Add JSON output for backups 2013-05-24 13:50:24 -04:00
Evan Prodromou
bf18684509 More aggressively avoid OOM errors in useractivitystream 2013-05-24 09:19:17 -04:00
Evan Prodromou
d7880c17ec Don't abort if an activity throws an exception when backing up 2013-05-23 15:02:43 -04:00
Evan Prodromou
fc7d74050f Make optional arguments for getNoticeIds explicit 2013-04-30 09:56:30 -04:00
Evan Prodromou
9d42137024 Make optional arguments for getNoticeIds explicit 2013-04-30 09:56:14 -04:00
Evan Prodromou
d06965603d Still bad 2012-11-11 21:36:42 -05:00
Evan Prodromou
e2680b1f13 Bad caching parameter 2012-11-11 21:34:40 -05:00
Mikael Nordfeldth
9361c07bb3 mrb reported 417 Expectation failed errors due to now commented line 2012-10-27 06:24:26 -07:00
Mikael Nordfeldth
9d73f6444a mrb reported 417 Expectation failed errors due to now commented line 2012-10-27 10:40:31 +02:00
Evan Prodromou
ba7e73ee97 Merge branch '1.1.x' 2012-09-07 10:29:55 -04:00
Evan Prodromou
f21881d5fa Don't send @-reply notification if the mentioned person has blocked the sender 2012-09-07 10:27:14 -04:00
Evan Prodromou
9b97adc7ad Squashed commit of the following: 
commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

    Merge commit 'refs/merge-requests/207' of git://gitorious.org/statusnet/mainline into merge-requests/207

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()
 2012-08-13 14:34:31 -04:00
Evan Prodromou
4b125eed96 Squashed commit of the following: 
commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

    Merge commit 'refs/merge-requests/207' of git://gitorious.org/statusnet/mainline into merge-requests/207

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()
 2012-08-13 14:33:58 -04:00
Evan Prodromou
b55356491c <a title="..." on profile block other accounts 2012-07-09 13:47:01 -04:00
Evan Prodromou
1c9dc7257d Finish out the ul for other accounts 2012-07-09 13:21:40 -04:00
Evan Prodromou
206c090688 Squashed commit of the following: 
commit 7ef19ab918cc9805abb8d01e8220ae4ed63155d7
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:53:29 2012 -0400

    Show link to facebook account on profile block

    If you've logged in with Facebook, show a link to that account on the profile block.

commit b56967479c009d702150791944dbd80746ee3ba1
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:28:34 2012 -0400

    Add profile link from profile block to Twitter account

    Add a profile link to Twitter for accounts that are linked via Twitter login.

commit 181e441fd03c6034e737f6a3dae115557aa3e1aa
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:57:56 2012 -0400

    OpenID shows other account links

commit ef7357883dad9e34af2746e1c6a41ea826d7c992
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:53:12 2012 -0400

    Add a profile link for OpenIDs

    OpenID plugin now adds a profile link for each OpenID on the account.

commit 093d26b95bc453686d24c42f5a8f4739cb338fd2
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:15:18 2012 -0400

    Better array access

commit 49d47257efdcae2101b589a1f825872bdd70667c
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 10:57:16 2012 -0400

    Show list of other accounts in profile block

    We add a group of "rel-me" links to other user accounts on the Web.

    This is mostly useful for when you've used OpenID, Twitter, or
    Facebook login to associate a remote account.

    There's an extension to the profileblock recipe to show the links as
    little icons; there's a new hook in accountprofileblock to get such
    links from plugins.

    There's a modification to the base theme to show the icons correctly
    (I think).
 2012-07-09 12:56:09 -04:00
Evan Prodromou
a65809c5bd Fix language code for users 2012-07-03 17:12:59 -04:00
Evan Prodromou
d4ea76a6ae tickle lifecycle 2012-07-03 16:17:30 -04:00
Siebrand Mazeland
acced719fd Remove i18n for space. 
Remove trailing whitespace.
 2012-06-18 01:56:06 +02:00
Mikael Nordfeldth
e2b4c203a6 Added lost define reported in issue 3605 (GROUPS_PER_PAGE) 2012-05-14 10:06:37 +02:00
Evan Prodromou
2879f0a499 Just let a UserNoProfileException pass. 2012-05-04 22:57:20 -04:00
Evan Prodromou
7f0df2f257 Don't fail if missing <Host> in host-meta; it's deprecated 2012-05-04 11:41:04 -04:00
Evan Prodromou
fb31ff1af7 better better call 2012-04-24 13:19:09 -04:00
Evan Prodromou
9c286feb5f fix bad function name 2012-04-24 13:17:54 -04:00
Evan Prodromou
64b03439b5 Check for HTTP_HOST before fetching it 2012-04-24 12:55:09 -04:00
Evan Prodromou
482b80cb0c Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2012-04-23 21:02:22 -04:00
Evan Prodromou
2eed1e2ae2 fixup check on profile notice stream 2012-04-23 21:01:34 -04:00
Siebrand Mazeland
07138391f9 Enable Belarusian (Taraškievica orthography) (be-tarask) and Malayalam (ml). 
Remove some trailing whitespace.
 2012-04-19 16:25:36 +02:00
Evan Prodromou
49304056f7 enable Basque language 2012-04-19 09:35:21 -04:00
Evan Prodromou
ae885c0e00 allow user to review their own profile stream even if silenced 2012-04-17 12:00:51 -04:00
Evan Prodromou
55dd0dbcc0 update how version is shown per semver.org 2012-04-17 09:15:29 -04:00
Evan Prodromou
74e919e815 Pre-alpha version changes 2012-04-16 16:38:41 -04:00
Evan Prodromou
e603bcd56b Merge branch 'master' into 1.1.x 2012-04-16 15:44:12 -04:00
Evan Prodromou
7d07149f60 Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2012-04-16 15:44:03 -04:00
Evan Prodromou
347ba8c4a3 Merge branch 'master' of gitorious.org:statusnet/mainline 2012-04-16 15:43:28 -04:00
Evan Prodromou
8f7f06e35a fix bug with sender_id and recipient_id in direct_messages 2012-04-13 11:28:43 -04:00
Evan Prodromou
35521d4a5b fix bug with sender_id and recipient_id in direct_messages 2012-04-13 11:28:18 -04:00
Evan Prodromou
ea0a1b6a03 Squashed commit of the following: 
commit 6216ef2c9c1ab4bb038177f90b97127e4c2b6d00
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:14:07 2012 -0400

    filter the notices

commit 57fe6c012d380a8f2f8ec505f35e2094e58b4ac4
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:08:36 2012 -0400

    return value, end condition

commit cc985407f89f2d222f3164f8bc14b0764163e83f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:49 2012 -0400

    fix call to count()

commit 9efdfde70ea307b7409a4140647f343224cb595f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:05 2012 -0400

    fix class name in pivotGet

commit 311599ac117dda8b6cd5f522687322b89dcc909d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:03:28 2012 -0400

    inboxfix
 2012-04-03 17:16:18 -04:00
Evan Prodromou
1fdb539b48 Squashed commit of the following: 
commit 6216ef2c9c1ab4bb038177f90b97127e4c2b6d00
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:14:07 2012 -0400

    filter the notices

commit 57fe6c012d380a8f2f8ec505f35e2094e58b4ac4
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:08:36 2012 -0400

    return value, end condition

commit cc985407f89f2d222f3164f8bc14b0764163e83f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:49 2012 -0400

    fix call to count()

commit 9efdfde70ea307b7409a4140647f343224cb595f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:05 2012 -0400

    fix class name in pivotGet

commit 311599ac117dda8b6cd5f522687322b89dcc909d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:03:28 2012 -0400

    inboxfix
 2012-04-03 17:15:58 -04:00
Evan Prodromou
086b474069 %s for a string 2012-04-02 21:42:04 -04:00
Evan Prodromou
0774ef456d Remove filtering notice stream debug comments 2012-04-02 21:31:24 -04:00
Evan Prodromou
4e3fb63855 Remove filtering notice stream debug comments 2012-04-02 21:29:57 -04:00
Evan Prodromou
391676863a Take out unnecessary HideNoticeStream 2012-03-25 14:21:22 -04:00
Evan Prodromou
97cc277040 Take out unnecessary HideNoticeStream 2012-03-25 14:21:11 -04:00
Evan Prodromou
04ad0838be Add spam-training, spam-reviewing rights 
Replaced the check for a moderator role in certain spam-training and
-reviewing points. Make sure modhelpers can check, too.
 2012-03-25 13:18:16 -04:00
Evan Prodromou
0d487a1ea0 Add spam-training, spam-reviewing rights 
Replaced the check for a moderator role in certain spam-training and
-reviewing points. Make sure modhelpers can check, too.
 2012-03-25 13:16:23 -04:00
Evan Prodromou
d4bb8fa77a make sure we have an integer value for askFor 2012-03-21 22:53:14 -04:00
Evan Prodromou
7e76d116d8 make sure we have an integer value for askFor 2012-03-21 22:53:02 -04:00
Evan Prodromou
6e04133427 private group fix 2012-03-21 16:33:23 -04:00
Evan Prodromou
8981a420c1 private group fix 2012-03-21 16:33:10 -04:00
Evan Prodromou
09b80a6e90 empty array wrappers 2012-03-21 16:28:53 -04:00
Evan Prodromou
2d3c19c254 empty array wrappers 2012-03-21 16:28:40 -04:00
Evan Prodromou
0f0ddbe0c3 bad boolean logic for impossible stream 2012-03-21 16:26:43 -04:00
Evan Prodromou
e76b191c4b bad boolean logic for impossible stream 2012-03-21 16:26:33 -04:00
Evan Prodromou
473f6ffac9 store our own userprofile for checking impossibility 2012-03-21 16:24:04 -04:00
Evan Prodromou
51229ca662 store our own userprofile for checking impossibility 2012-03-21 16:23:52 -04:00
Evan Prodromou
6215ff8e07 Don't try to find groupnoticestream if impossible 2012-03-21 16:18:56 -04:00
Evan Prodromou
f807bd1b30 Don't try to find profilenoticestream if impossible 2012-03-21 16:18:48 -04:00
Evan Prodromou
38343f3877 Don't try to find groupnoticestream if impossible 2012-03-21 16:18:38 -04:00
Evan Prodromou
710eb8e86e Don't try to find profilenoticestream if impossible 2012-03-21 16:18:27 -04:00
Evan Prodromou
07f70b43b5 Sanity check on profile streams 2012-03-21 14:22:56 -04:00
Evan Prodromou
e21b0948ed Sanity check on profile streams 2012-03-21 14:22:45 -04:00
Evan Prodromou
cbd13407d8 Prefill profile roles when checking scope 2012-03-21 13:51:28 -04:00
Evan Prodromou
4ea9a0a7e8 Prefill profile roles when checking scope 2012-03-21 13:51:17 -04:00
Evan Prodromou
3cc69c678a Increment rounds 2012-03-21 12:24:12 -04:00
Evan Prodromou
d03ca746f2 Increment rounds 2012-03-21 12:23:59 -04:00
Evan Prodromou
0d8dd9078c Don't fetch more than needed if exhausted 2012-03-21 12:21:48 -04:00
Evan Prodromou
9b0279c2d5 Don't fetch more than needed if exhausted 2012-03-21 12:21:36 -04:00
Evan Prodromou
99dce46498 Prefill done by notice stream 2012-03-21 12:11:06 -04:00
Evan Prodromou
0238aa9d19 Prefill done by notice stream 2012-03-21 12:10:54 -04:00
Evan Prodromou
f6ae47c4fb adaptive filtering requests 2012-03-21 12:01:40 -04:00
Evan Prodromou
dcbcd4731c adaptive filtering requests 2012-03-21 12:01:27 -04:00
Evan Prodromou
d942072a6c Optionally hide spam from timelines 
For sites with a lot of spam, this will hide that spam from timelines for everyone but moderators.
 2012-03-21 10:26:00 -04:00
Evan Prodromou
a431fca442 New events for pre-filling a NoticeList 
The NoticeList has some code to pre-fill some auxiliary data for
notices. These new events let plugins hook that event and do their own
pre-filling.
 2012-03-21 10:25:51 -04:00
Evan Prodromou
3fb3ddb3a6 Optionally hide spam from timelines 
For sites with a lot of spam, this will hide that spam from timelines for everyone but moderators.
 2012-03-21 10:17:11 -04:00
Evan Prodromou
4c4cd9ec77 New events for pre-filling a NoticeList 
The NoticeList has some code to pre-fill some auxiliary data for
notices. These new events let plugins hook that event and do their own
pre-filling.
 2012-03-21 09:26:35 -04:00
Evan Prodromou
dbae9ea11b new event for notice option items 2012-03-08 06:59:25 -06:00
Evan Prodromou
e7d187eb05 new event for notice option items 2012-03-08 06:58:45 -06:00
Evan Prodromou
eb6b4628b9 Merge from 1.0.x 2012-03-08 06:57:54 -06:00
Evan Prodromou
fc713b660b hide silenced users' profile pages 2012-03-08 06:45:56 -06:00
Evan Prodromou
12921d6b71 accessor for NoticeListItem's Notice 2012-03-07 16:06:50 -06:00
Evan Prodromou
6e01db2c92 accessor for Widget's HTMLOutputter 2012-03-07 16:06:33 -06:00
Evan Prodromou
376a19f3c1 Plugin::path() checks local/plugins/ first 2012-03-07 15:04:49 -06:00
Evan Prodromou
98acec74f5 rel=me for homepage in profile block 2012-01-20 10:34:59 -05:00
Evan Prodromou
71fa1d2462 slight improvement in location output 2012-01-03 11:03:18 -08:00
Evan Prodromou
8c9d967814 syntax error in position in activity streams json 2011-12-31 19:05:41 -08:00
Evan Prodromou
3d87176ece Better position formatting 2011-12-31 10:26:07 -08:00
Evan Prodromou
bff89bc864 catch up to spec 2011-12-31 02:31:26 -08:00
Evan Prodromou
6ca729803b activity streams json 'count' => 'totalItems' 2011-12-31 02:01:51 -08:00
Evan Prodromou
70aada690b add objectType, content to activity objects in JSON 2011-12-31 01:56:26 -08:00
Evan Prodromou
0760c64264 log when including a file 2011-12-03 12:31:47 -05:00
Evan Prodromou
a818d5c61a use null for db/database config, check for it 2011-12-03 11:45:56 -05:00
Evan Prodromou
7af29bf0d2 nativecode shows up in userinfo 2011-11-26 10:20:32 -05:00
Evan Prodromou
8cdbef098b die when we get a bad connection error 2011-11-26 09:54:41 -05:00
Evan Prodromou
cab76836cb isHTTP() -> isHTTPS() 2011-11-11 12:44:42 -05:00
Evan Prodromou
62fb12b369 use HTTPS for JSON if necessary 2011-11-11 12:35:00 -05:00
Evan Prodromou
0fe3afc495 smoothness is SSLed if using SSL 2011-11-11 12:22:33 -05:00
Evan Prodromou
6a6ac58faf remove unused Popularity class; use PopularNoticeStream instead 2011-10-20 10:42:54 -04:00
Evan Prodromou
22fead1b46 Squashed commit of the following: 
commit fb1dfa9e98ded23fb5bdebae6465424a8cb8acd6
Author: Evan Prodromou <evan@status.net>
Date:   Thu Oct 20 10:40:07 2011 -0400

    Use popular notice stream for favorited page

commit e1d409ff738e39061ad35589d546ce9bed456975
Author: Evan Prodromou <evan@status.net>
Date:   Thu Oct 20 10:32:23 2011 -0400

    Use a caching stream for popular notice section

    Instead of a big cached query, we now use a caching notice stream for
    the popular notice section. It uses a single-table query at the
    bottom, then scopes the notices and filters for silenced users. This
    should be much nicer to our database servers.

    Also clears the popular cache when someone favors or disfavors
    something. A nice optimization would be to save the last weights and
    re-calculate them at invalidation time, adding the new notice (or not)
    depending on its own score. That will have to wait for another day,
    though.

commit e9b7ab4c26c95e755adaff53c3957dcfca31c16b
Author: Evan Prodromou <evan@status.net>
Date:   Thu Oct 20 10:31:14 2011 -0400

    Let CachingNoticeStream users skip the ';last' optimization
 2011-10-20 10:40:39 -04:00
Evan Prodromou
43128e5da5 Move GROUPS_PER_PAGE to lib/framework 2011-10-07 13:52:38 -04:00
Evan Prodromou
9c02713e9a 1.0.1rc1 -> 1.0.1 2011-10-03 12:46:04 -04:00
Evan Prodromou
71853f40a0 1.0.1rc1 2011-10-03 11:03:55 -04:00
Zach Copley
7dcb27672f Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-09-30 19:52:16 +00:00
Zach Copley
c137d69aee Switch from oohembed to noembed for default oembed provider 2011-09-30 19:51:23 +00:00
Brion Vibber
69e95bb9c8 Merge branch 'compound-keys-fix' into 1.0.x 2011-09-30 11:55:36 -07:00
Brion Vibber
03791eca89 bad brion! s/__constructor/__construct/ 2011-09-30 11:50:39 -07:00
Evan Prodromou
89ecda2c52 Home stub nav for admin, settings, and docs 2011-09-30 14:24:03 -04:00
Evan Prodromou
df72adcd2d remove bad old badge code 2011-09-30 14:23:30 -04:00
Brion Vibber
5f2dcffb60 Disable Cache class's in-process cache on CLI runs; unsafe for long-running daemons. 
Should help with situations like IM daemons coming up with false negatives on user settings lookups.
 2011-09-30 11:21:24 -07:00
Evan Prodromou
1b94625f2f add an href for homepage link 2011-09-30 13:22:15 -04:00
Evan Prodromou
f2a98e2329 show group aliases on group profile block 2011-09-30 12:23:10 -04:00
Evan Prodromou
636455ad82 Fix conflict between URL parameter and POST parameter with groups 
Group edit page is at /group/:nickname/edit. There's also a form
parameter named 'nickname'. The two were conflicting.

I changed the form parameter to 'newnickname' and it works.

I'm not sure how this ever worked before, though.
 2011-09-30 11:48:00 -04:00
Evan Prodromou
cd3bc8f4ef correct groups from Profile::getGroups() 2011-09-30 11:38:06 -04:00
Evan Prodromou
d07780b478 Output native PEAR DB errors to the log file 2011-09-30 10:46:51 -04:00
Evan Prodromou
9c2e454901 It's the End of the World as We Know It (And I Feel Fine) 
We had planned to change over to using Beastie Boys song titles for
the 1.x series of StatusNet releases, but with the end of REM last
week, the team thought naming one last StatusNet version after an REM
song was a nice tribute, and a good way to announce what we think this
release means.
 2011-09-30 10:19:54 -04:00
Evan Prodromou
9ba736c032 Add a dummy 'top' action to take you to the main page of the site 2011-09-30 09:45:17 -04:00
Evan Prodromou
3aad58c37f Only show some profiles in events 2011-09-30 09:40:15 -04:00
Evan Prodromou
5df3c8bc4b Show the list of repeaters in threaded notice list 2011-09-29 23:41:51 -04:00
Evan Prodromou
fb406a81e2 allow / at end of group, user page 2011-09-29 22:59:18 -04:00
Zach Copley
51b7af41d4 Show homepage on profile 2011-09-29 20:26:01 +00:00
Evan Prodromou
32845a1051 Make lists work in single-user mode 
Added routes to the router for list pages in single-user mode.

For each of the actions in those routes, use the global single-user
nickname rather than a nickname URL argument to determine the tagger ID.

In nav, and for Ajax, provide the right nicknames.
 2011-09-29 12:29:12 -04:00
Evan Prodromou
a18d3facf8 Merge branch '1.0.x' into 1.1.x 2011-09-28 12:24:39 -04:00
Evan Prodromou
baeb84ebb3 Remove unsupported hcard action from xrd 2011-09-27 11:49:38 -04:00
Evan Prodromou
9f954eddc5 remove unsupported hcard action 2011-09-27 11:43:41 -04:00
Evan Prodromou
3063caea83 Incorrect constant for theme warning 2011-09-27 11:32:20 -04:00
Evan Prodromou
5eddfd1eab remove unlinked publicpeopletagcloud 2011-09-27 10:55:10 -04:00
Evan Prodromou
8c710ad2c1 Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline into merge-requests/158 
Conflicts:
	classes/Profile_list.php
	lib/peopletagnoticestream.php
 2011-09-26 17:11:49 -04:00
Evan Prodromou
540c545399 Don't replace URLs if 'shortened' version is longer, unless forced 2011-09-26 17:05:35 -04:00
Brion Vibber
1b25b75b53 Use older-style top reply form when replying from old-school conversation tree view (labeled with .old-school class on one of its parent nodes). 2011-09-26 12:54:33 -07:00
Siebrand Mazeland
c9c8c9ffdc Remove punctuation in e-mail subject. Spotted by OsamaK. 2011-09-26 00:10:34 +02:00
Evan Prodromou
8e04dce947 Old-school settings page 
A page to set or remove old-school settings.
 2011-09-24 10:14:45 -04:00
Evan Prodromou
ea1a11a087 site-wide option to enable old-school settings 2011-09-24 09:46:13 -04:00
Evan Prodromou
ae0b4d49c7 optional conversation tree view 2011-09-24 09:29:12 -04:00
Evan Prodromou
61a3ccf2bf users can choose to just see nicknames in streams 2011-09-24 07:19:52 -04:00
Zach Copley
4c91dc4546 Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3) 
fixes http://status.net/open-source/issues/3393
 2011-09-22 12:51:24 -07:00
Samantha Doherty
bcb0709401 Only load theme-specific IE stylesheets if they exist. 2011-09-22 09:22:08 -04:00
Evan Prodromou
d214d4533c don't cause an error on non-user profile in api 2011-09-21 17:15:55 -04:00
Evan Prodromou
7d64d8c78c Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165 
Conflicts:
	lib/noticelist.php
 2011-09-21 15:33:52 -04:00
Evan Prodromou
12588b1cf7 Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline into merge-requests/166 2011-09-21 15:24:17 -04:00
Evan Prodromou
ad726a15de Use an event to signal that IM settings are available 
Rather than enumerating available classes, define an event that sets a
flag indicating that there's an IM plugin available. Implemented in
implugin.php, so all IM plugins that use that class should
work. Others can hook the event, too.
 2011-09-21 15:15:59 -04:00
Evan Prodromou
c48cdc7d50 Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline into merge-requests/169 2011-09-21 15:09:05 -04:00
Evan Prodromou
1817b25dfc Update the version info for 1.1.x 2011-09-21 10:11:23 -04:00
Ciaran Gultnieks
084bb851aa Make im confirmation codes work instead of sending an invalid URL 2011-09-21 12:25:12 +01:00
Evan Prodromou
4c9dc2530b Update documentation for 1.0.0rc1 2011-09-20 16:05:00 -04:00
Evan Prodromou
6e166b2418 don't show group tagcloud in high-performance mode 2011-09-20 14:04:09 -04:00
Evan Prodromou
081d4edbf5 fallback theme 2011-09-20 12:32:49 -04:00
Evan Prodromou
2d30ed73f3 don't try to add publictagcloud to menu if it's not there 2011-09-19 22:01:28 -04:00
Evan Prodromou
223b806a81 make performance optimization off by default 2011-09-19 22:01:13 -04:00
Evan Prodromou
ddf166e144 setting to turn off expensive queries 2011-09-19 21:55:11 -04:00
Luke Fitzgerald
1f7f0690b3 Correct ImPlugin to XmppPlugin 2011-09-20 02:45:02 +01:00
Luke Fitzgerald
c99e469c5e Show IM configuration page if XMPP, IRC or MSN plugins are enabled 2011-09-20 02:40:15 +01:00
Evan Prodromou
a5518ce35e move more routes around from most specific to least 2011-09-19 19:21:59 -04:00
Evan Prodromou
e2cc7f550a move some routes around to make more specific stuff first 2011-09-18 19:31:29 -04:00
Evan Prodromou
e79cd6eac0 show remote groups correctly in groupsnav 2011-09-18 19:28:56 -04:00
Evan Prodromou
ffe5702dc3 Move more specific routes ahead of more general routes 
A lot of API routes have versions with or without params. I moved the
ones with params up so they match correctly.
 2011-09-18 19:20:55 -04:00