Mikael Nordfeldth
362b6ad2fc
ForceGroup and some qvitter API stuff still used staticGet
2013-10-25 13:20:53 +02:00
Mikael Nordfeldth
a38ed0057a
Moved jbfavre's Twitter card support to Twitter plugin
...
It was causing problems with an undefined TWITTER_SERVICE constant.
2013-10-22 20:35:03 +02:00
Mikael Nordfeldth
a6c52c5ca7
Prepare the RepeatAction for modernisation (more OOP)
2013-10-21 23:27:09 +02:00
Mikael Nordfeldth
145fbf1130
Move nick updating of User entry to Profile->update()
...
Also, timezone and language in User table weren't indexes. So no need
to do them separately.
2013-10-17 16:38:42 +02:00
Mikael Nordfeldth
274b70784f
When updating a User_group nickname, correlate Local_group and Profile
...
...no need to make a separate call to Local_group's setNickname all the time,
or a bunch of redundant code for the Profile table.
Next up is User->update()...
2013-10-17 13:49:20 +02:00
Mikael Nordfeldth
6ed66d9c76
Local_group and User are now assumed to be in same namespace
2013-10-17 01:27:01 +02:00
Mikael Nordfeldth
db7ef52d13
Better use of Nickname validation functions
...
Nickname verifications on registration and updates for profiles (not yet
groups) have been improved.
Minor bugs in RegisterAction were also fixed, where multiple forms would
be outputed because the function did not return after showForm(). This
will be solved more permanently with throwing exceptions in the future.
2013-10-16 15:38:54 +02:00
Mikael Nordfeldth
080352b646
Minor changes to ApiCheckNicknameAction, syntax and exception handling mostly
2013-10-16 13:43:10 +02:00
Mikael Nordfeldth
29d0871e5a
Making many of the API actions more consistent with coding style
...
clientError and serverError exit after they're done so no need for
break or return. Also, $this->format is default.
We also got rid of the incredibly verbose version of $this->isPost()
which was spread all over the place.
Not all of this cleaning up is done yet.
2013-10-15 03:07:40 +02:00
Mikael Nordfeldth
ffdbd8d729
Now using common_local_url properly
2013-10-15 01:20:21 +02:00
Mikael Nordfeldth
f46d675a20
GNU social is with a minor s.
2013-10-15 00:20:36 +02:00
Mikael Nordfeldth
9be368006c
Naming stuff GNUsocial rather than StatusNet
2013-10-15 00:19:03 +02:00
Mikael Nordfeldth
6d739789f6
protected handle function without args for Action
2013-10-14 14:00:12 +02:00
Mikael Nordfeldth
390556d932
Remote Profile Action from ModPlus now more generic
2013-10-08 21:08:02 +02:00
Mikael Nordfeldth
1d8b19fe54
Let's not limit qvitter stuff to 'json' requests
...
Also, cleanup and report errors properly when we try unsupported media types.
2013-10-07 20:54:25 +02:00
Mikael Nordfeldth
cf0570fc99
Cleaning up clientError and serverError
2013-10-07 19:56:45 +02:00
Mikael Nordfeldth
ece8ba8ea4
Calling parent::handle in ApiCheckHubAction
2013-10-07 14:51:23 +02:00
Mikael Nordfeldth
8912cdc7a4
Validate::uri replaced with filter_var for HTTP[S] URL checks
...
Also, a bug in checking the OAuth callback URL for validity was fixed,
where it referenced the wrong variable when going through form data.
2013-10-07 14:46:09 +02:00
Mikael Nordfeldth
2c0790be54
Let the SearchEngine take care of the search, and showJsonTimeline is good enough for now
...
I bet JSONSearchResultsList is a good idea, but we have no immediate use of it right now.
And it's better if the SearchEngine can take care of all that jazz.
2013-10-06 23:09:57 +02:00
Mikael Nordfeldth
87370f0cb1
URL shortening can now be disabled for the 'maxurllength'
...
Also, URL shortening now consistently uses 'maxurllength'...
2013-10-06 22:35:49 +02:00
Mikael Nordfeldth
34a6624452
Qvitter API changes (thanks hannes2peer)
...
I implemented changes from quitter.se's new API that their front-end qvitter
uses, https://github.com/hannesmannerheim/qvitter/blob/master/api-changes-1.1.1/CHANGES
However I left out the URL shortening commens, since I believe whatever behaviour
they experienced that caused them to implement this was a bug (or many) and should
be fixed in their proper areas and that shortening should not be entirely left
out in API calls.
2013-10-06 21:51:50 +02:00
Mikael Nordfeldth
fb94a16217
Moved Avatar retrieval into Avatar class
...
Backwards compatible functions are still in Profile class.
2013-10-06 15:55:06 +02:00
Mikael Nordfeldth
78f9629bf3
Moved shareLocation preference check to Profile class
2013-10-06 13:38:09 +02:00
Mikael Nordfeldth
cc34bb48c7
OAuth related syntax fixes, nothing big
...
Making better use of class autoloading too.
2013-10-06 12:43:18 +02:00
Mikael Nordfeldth
48da97f204
MediaFile code improvements, preparing to implement multi-attachments
...
Maybe in the future we can use this for anonymous file uploads too?
With some kind of anonymous/pseudonymous profile. That'd be neat.
2013-10-05 18:47:45 +02:00
Mikael Nordfeldth
39f43e415d
Do not name anything getOriginal (because DB_DataObject calls that)
...
Avatar->getOriginal has been renamed getUploaded
Notice->getOriginal has been renamed getParent
2013-10-02 15:01:11 +02:00
Mikael Nordfeldth
7979918ba9
Various minor Avatar fixes, but pretty necessary.
...
One typing thing. And a missed exception case.
Get src from displayUrl() instead of url for example.
2013-10-02 14:49:01 +02:00
Mikael Nordfeldth
1d46ca45d1
PHP Notice: Undefined variable: logo
...
It was reported in actions/apitimelinetag.php on line 142
2013-10-01 17:07:16 +02:00
Mikael Nordfeldth
b0dfc70a54
Properly unlink all old avatars when deleting/uploading a new
...
We're also now using $config['image']['jpegquality'] to determine the
quality setting for resized images.
To set Avatar max size, adjust $config['avatar']['maxsize']
The getAvatar call now throws exceptions too. Related changes applied.
Now let's move Profile->avatarUrl to the Avatar class!
2013-10-01 17:00:10 +02:00
Mikael Nordfeldth
a23c4aa236
Avatar resizing improvements and better code reuse
...
* getOriginal added to Avatar class
This is a static function that retrieves the original avatar in a leaner
way than Profile->getOriginalAvatar() did (see below).
This will throw an Exception if there was none to be found.
* getProfileAvatars added to Avatar class
This gets all Avatars from a profile and returns them in an array.
* newSize added to Avatar class
This will scale an original avatar or throw an Exception (originally from
Avatar::getOriginal) if one wasn't found.
* deleteFromProfile added to Avatar class
Deletes all avatars for a Profile. This makes the code much smarter when
removing all avatars from a user.
Previously only specific, hardcoded (through constants) sizes would be
deleted. If you ever changed lib/framework.php then many oddsized avatars
would remain with the old method.
* Migrated Profile class to new Avatar::getOriginal support
Profile class now uses Avatar::getOriginal through its own
$this->getOriginalAvatar and thus remains backwards compatible.
* Updating stock GNU Social to use Avatar::getOriginal
All places where core StatusNet code used the
$profile->getOriginalAvatar, it will now useAvatar::getOriginal with
proper error handling.
* Updated Profile class to use Avatar::newSize
When doing setOriginal, the scaling will be done with the new method
introduced in this merge.
This also edits the _fillAvatar function to avoid adding NULL values to
the array (which causes errors when attempting to access array entries as
objects). See issue #3478 at http://status.net/open-source/issues/3478
2013-09-30 22:23:03 +02:00
Mikael Nordfeldth
a0e107f17f
Implemented WebFinger and replaced our XRD with PEAR XML_XRD
...
New plugins:
* LRDD
LRDD implements client-side RFC6415 and RFC7033 resource descriptor
discovery procedures. I.e. LRDD, host-meta and WebFinger stuff.
OStatus and OpenID now depend on the LRDD plugin (XML_XRD).
* WebFinger
This plugin implements the server-side of RFC6415 and RFC7033. Note:
WebFinger technically doesn't handle XRD, but we serve both that and
JRD (JSON Resource Descriptor), depending on Accept header and one
ugly hack to check for old StatusNet installations.
WebFinger depends on LRDD.
We might make this even prettier by using Net_WebFinger, but it is not
currently RFC7033 compliant (no /.well-known/webfinger resource GETs).
Disabling the WebFinger plugin would effectively render your site non-
federated (which might be desired on a private site).
Disabling the LRDD plugin would make your site unable to do modern web
URI lookups (making life just a little bit harder).
2013-09-30 22:04:52 +02:00
Joshua Judson Rosen
90858804bc
Allow the hostmeta to indirect from one domain to another.
...
e.g.: rozzin@hackerposse.com => rozzin@status.hackerposse.com .
2013-09-29 23:13:45 +02:00
Mikael Nordfeldth
858d9cc3c4
maxNoticeLength test for url-shortening failed on maxContent==0
...
maxContent==0 implies that a notice text can be infinitely long, but
this value was directly transferred to maxNoticeLength, where 0 was
tested if it was longer than the notice length - which of course always
was false.
This commit fixes the problem for infinite length notices that always
got shortened.
2013-09-25 22:48:32 +02:00
Mikael Nordfeldth
64df40e409
Filling in missing endHTML calls for Action AJAX
...
This completes 1c6f9df80e
where a lot
of other functions were fixed (by conforming to startHTML and endHTML)
2013-09-24 02:32:17 +02:00
Mikael Nordfeldth
1c6f9df80e
PHP5.5 fix: Better use of startXML for Action classes (mostly AJAX)
...
I had a problem with PHP5.5 that caused ajax responses to be empty. This
fixes it, as the problem was related to pretty inconsistent calling to
headers, XMLWriter::startDocument etc. etc.
2013-09-24 01:18:33 +02:00
Marcel van der Boom
e9f2a1847d
Wrong call signature used for Event::handle
...
Call needs 2nd parameter to be array.
2013-09-23 14:43:44 +02:00
Mikael Nordfeldth
5f1fea1488
FavorAction upgraded to extend FormAction
...
Includes some minor changes to other things as well, such as the session
token input element now having the same 'name' attribute as everyone else.
(it still retains a 'token-'+noticeid 'id' attribute for clientside JS)
2013-09-23 13:06:09 +02:00
Mikael Nordfeldth
63306081bc
Subscription "get by" functions now don't use ArrayWrappers
...
They were getting in the way of some strict-typing stuff.
2013-09-21 18:38:14 +02:00
Mikael Nordfeldth
93e878d7ca
Make better use of Subscription class
...
removed lib/subs.php as it was essentially only a wrapper for Subscription
2013-09-19 17:29:05 +02:00
Mikael Nordfeldth
c3001ff82b
url shortening fixes for api config and not ur1.ca
...
Will have to change the 'maxnoticelength' code to stop shortening ALL
links if the setting for infinitely long notices is configured.
2013-09-19 01:11:47 +02:00
Mikael Nordfeldth
31bace8cfd
updated and moved jquery-jcrop (no longer .min.js)
...
This won't run properly if other scripts stop javascript execution before
it's time to crop (such as in the Bookmark plugin, which when writing this
hasn't been migrated to Jquery 2.x - so it stops on a '.die' call).
Some images were cleaned up from the theme/base/images/illustrations too.
2013-09-14 13:31:16 +02:00
Jean Baptiste Favre
f0d86cdb64
Add 'twitter:title' meta tag support.
2013-09-10 11:16:34 +02:00
Jean Baptiste Favre
ade8c6992e
Twitter cards implementation. Currently only supports 'photo' cards.
2013-09-10 11:16:27 +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
c5bf6cb05e
Using a bit more of $this->scoped (Action parent class)
...
$this->scoped is the currently active profile, which is intended
to replace the $user object in the long run...
2013-09-09 20:45:20 +02:00
Mikael Nordfeldth
b2a0aa20bf
NewapplicationAction converted to FormAction
...
Cutting down on a bunch of redundant code. We're reusing a lot of stuff
from FormAction and Action now instead of having copies of code all over.
2013-09-02 12:13:46 +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
89b10666bb
IMPORTANT: parent::handlePost() in NewnoticeAction
...
otherwise we don't do csrf checking etc...
2013-09-02 11:05:21 +02:00
Mikael Nordfeldth
0612e5ec87
NewnoticeAction converted to extend FormAction
...
There are still several improvements which can be made, such as not
having an entirely separate setup of ajax form functions. Instead
those should be implemented in FormAction. But at least now we got
rid of the redundant code use in prepare/handle.
2013-09-01 20:56:35 +02:00
Mikael Nordfeldth
83000f6f5e
Proper definition of $args array in NewgroupAction->prepare
...
Also, there is no need to do 'return' after throwing a ClientError
Exception. And we'll use the Action->clientError for logging benefits
until the error handling is properly done all the way to backend.
2013-09-01 19:44:09 +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
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
ea837cea67
added missing return statement after showForm call
...
Issue #3125 at http://status.net/open-source/issues/3125 (and its duplicate 3127) describe buggy behaviour when trying to create a new group - i.e. the group is still created but with nickname NULL.
The reason the group is created is that when failing Nickname::normalize, the function trySave() in actions/newgroup.php doesn't call 'return' - meaning it just keeps going despite the error thrown. It a
So the simple solution to this bug was adding a return call at line 128, inside the catch just after the showForm(...) call.
2013-08-12 12:44:19 +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
Jean Baptiste Favre
c23efdbdb0
PHP 5.4 compatibility: remove call-time pass by reference
2013-06-19 11:16:05 +02:00
Jean Baptiste Favre
fcdd4d2cf0
Fix introduced bug, trying to shorten an empty status.
2013-06-15 19:07:43 +02:00
Jean Baptiste Favre
58a2630933
Code cleaning. Do call shortenLinks only once, right before saving new notice.
2013-06-15 19:07:43 +02:00
Jean Baptiste Favre
344a10be8b
Code cleaning, remove 'TEST' tags.
2013-06-15 19:07:43 +02:00
Jean Baptiste Favre
ec072e0af7
Notice update with media attachment may fail through API when status text + attachment length get higher than max notice length. Calling URL shortener can make global length less than maxlength, though allowing notice update.
2013-06-15 19:07:43 +02:00
Jean Baptiste Favre
6d47fadf42
Fix introduced bug, trying to shorten an empty status.
2013-06-15 19:04:32 +02:00
Jean Baptiste Favre
54374365e9
Code cleaning. Do call shortenLinks only once, right before saving new notice.
2013-06-15 19:04:31 +02:00
Jean Baptiste Favre
f803b22752
Code cleaning, remove 'TEST' tags.
2013-06-15 19:04:31 +02:00
Jean Baptiste Favre
6387e0a90d
Notice update with media attachment may fail through API when status text + attachment length get higher than max notice length. Calling URL shortener can make global length less than maxlength, though allowing notice update.
2013-06-15 19:04:31 +02:00
Jean Baptiste Favre
180cc39c4a
Fix for #3649 issue.
2013-06-15 17:01:10 +02:00
Jean Baptiste Favre
b23a744fba
Fix for #3649 issue.
2013-06-15 16:58:50 +02:00
Jean Baptiste Favre
359f3ca113
Fix for #3651 : oAuth apps list does only show the latest registered application
2013-06-15 14:19:15 +02:00
Jean Baptiste Favre
4284f28dec
Fix for #3651 : oAuth apps list does only show the latest registered application
2013-06-15 14:09:46 +02:00
Evan Prodromou
6aaee4e5fe
$this->q => $q
2012-11-11 22:55:22 -05:00
Evan Prodromou
edf2879021
Divert tag and url searches
2012-11-11 21:27:11 -05:00
Evan Prodromou
64288a62f8
Adding a search notice stream object
2012-11-11 21:05:13 -05:00
Evan Prodromou
c809dd24c5
Don't show big invite button if invites are disabled
2012-10-17 10:10:42 -04:00
Evan Prodromou
86e3cbbcce
Don't show big invite button if invites are disabled
2012-10-17 10:09:40 -04:00
Evan Prodromou
46f6b2c119
Don't call free on the results of a member query
2012-07-04 14:45:50 -04:00
Evan Prodromou
ae84e8f524
Use the current logged-in use for home timeline
2012-07-03 12:22:59 -04:00
Evan Prodromou
b4da5f3785
Merge branch 'master' into 1.0.x
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
Siebrand Mazeland
de7ad991f9
Consistency update.
2012-03-05 00:38:39 +01:00
Evan Prodromou
23bafaba26
add canonical rel
2012-01-26 11:02:29 -05:00
Evan Prodromou
25f1e16952
Revert "don't show profile page of silenced users"
...
This reverts commit 7bb59ad2a1
.
2011-12-31 09:34:59 -08:00
Evan Prodromou
7bb59ad2a1
don't show profile page of silenced users
2011-12-31 09:09:07 -08:00
Evan Prodromou
c9fbe2ead7
remove common_debug() from search.json, search.atom
2011-12-30 22:23:50 -08:00
Evan Prodromou
eb05bdfcaf
remove debug message I'm sick of seeing
2011-12-30 22:16:22 -08:00
Michele macno Azzolari
ad2fd9abd4
Fix whitescreen on recoverpassword with unknown user
2011-12-02 15:48:29 -05:00
Siebrand Mazeland
c2db2483a0
Remove trailing whitespace in UI text.
2011-10-29 14:34:50 +02:00
Evan Prodromou
b8079549ce
Include the current profile in popular notice section for all
2011-10-20 10:54:33 -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
Siebrand Mazeland
7602f605d5
Remove unneeded trailing space.
2011-10-10 15:06:39 +02:00
Siebrand Mazeland
436068dc0d
Use getBestName() instead of nickname per FIXMEs.
...
Update translator documentation.
2011-10-10 15:05:43 +02:00
Evan Prodromou
c85abebc36
Remove missing twittersettings page from subscriptions helper
2011-10-03 09:13:54 -04:00
Evan Prodromou
82badb19c7
Move docs menu to site primary menu
2011-09-30 14:24:27 -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
cd6e0a920f
slightly better usergroups pagination
2011-09-30 11:38: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
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
9f954eddc5
remove unsupported hcard action
2011-09-27 11:43:41 -04:00
Evan Prodromou
5eddfd1eab
remove unlinked publicpeopletagcloud
2011-09-27 10:55:10 -04:00
Evan Prodromou
2678b937b1
fix problem with missing list subscribers
2011-09-26 16:15:38 -04: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
ae0b4d49c7
optional conversation tree view
2011-09-24 09:29:12 -04:00
Evan Prodromou
ddc121c085
New table for all old-school UI prefs
2011-09-24 07:12:34 -04:00
Evan Prodromou
02a30cf47c
start using stream mode prefs instead of separate parameter
2011-09-23 17:50:38 -04:00
Evan Prodromou
66c97a1a1e
switch between conversation and stream for public and group
2011-09-23 17:28:54 -04:00
Evan Prodromou
dba9d71abd
Support mode in all
2011-09-23 17:18:21 -04:00
Evan Prodromou
642901f4ae
No such path 'index', so redirect to home timeline
2011-09-21 16:33:10 -04:00
Evan Prodromou
d594c83a5a
Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline into merge-requests/159
2011-09-21 16:31:38 -04:00
Zach Copley
b6b13a6bc7
Don't access current user without session
2011-09-21 00:40:27 +00:00
Evan Prodromou
bd33036fae
use a dummy notice stream for retweets_of_me under high load
2011-09-19 22:17:40 -04:00
Evan Prodromou
32f7d3edc2
inverted switch for performance on public page
2011-09-19 22:01:47 -04:00
Evan Prodromou
ddf166e144
setting to turn off expensive queries
2011-09-19 21:55:11 -04:00
Evan Prodromou
b44bb472eb
disable public tag cloud on public sites
2011-09-19 19:37:58 -04:00
Evan Prodromou
319639a232
hide popular notice section on non-private sites
2011-09-19 16:19:12 -04:00
Evan Prodromou
e8785927a3
log the problem when there's an exception leaving a group
2011-09-18 19:28:44 -04:00
Evan Prodromou
cf2457f03f
correct link for apitimelinegroup
2011-09-18 17:33:25 -04:00
Evan Prodromou
be4e3593f5
declare attributes of TagAction
2011-09-18 12:52:38 -04:00
Evan Prodromou
951601633b
better handling of tagged notice streams
2011-09-18 12:33:35 -04:00
Evan Prodromou
b80b0d6520
use correct redirect on logout of single-user site
2011-09-17 15:08:04 -04:00
Evan Prodromou
927eae908a
Remove unused xrds stuff from profile (replace in OMB please)
2011-09-14 12:18:46 -04:00
Zach Copley
a1907f20c4
Remove old background validation stuff from paths admin panel
...
fixes http://status.net/open-source/issues/3297
2011-08-27 19:22:02 -07:00
Evan Prodromou
abdae45679
allow posting to groups through atompub
2011-08-27 17:37:10 -04:00
Evan Prodromou
8287f27a95
remove more groupnav
2011-08-27 16:14:11 -04:00
Evan Prodromou
e0f7cf6a6c
remove group nav
2011-08-27 16:13:04 -04:00
Evan Prodromou
dd5da6c9e8
Move common nav stuff to GroupAction
2011-08-27 11:28:32 -04:00
Zach Copley
5f1ace8c04
* Update copyright in version info
...
* add sammyd to contributors
* sort contributors
2011-08-25 16:33:41 -07:00
Zach Copley
297d603feb
Update activity streams JSON to match spec
...
Squashed commit of the following:
commit 0722450267a1d0f4bdc2853f52a85b850329db73
Author: Zach Copley <zach@status.net>
Date: Thu Aug 25 09:58:29 2011 -0700
Updgrade activity object json
commit 882ba1dceaba8a0b3ec3513760aa09f68e41f270
Author: Zach Copley <zach@status.net>
Date: Wed Aug 24 16:30:07 2011 -0700
Update to the JSON activity serialization document
commit 121e441b314b93e184711c3dcc79ada69d429eba
Author: Zach Copley <zach@status.net>
Date: Wed Aug 24 15:08:06 2011 -0700
Output application/json instead of application/stream+json (at least for now)
commit e045e214bffe5e0ddeb0a42555d440b75ae4edde
Author: Zach Copley <zach@status.net>
Date: Wed Aug 24 15:06:40 2011 -0700
Update to use latest property names from the JSON activity spec
2011-08-25 10:01:20 -07:00
Evan Prodromou
0692d9c047
use new stream class rather than old Notice::publicStream()
2011-08-25 11:50:45 -04:00
Evan Prodromou
4f05205fbe
log an exception when we can't join a group
2011-08-23 10:22:03 -04:00
Siebrand Mazeland
83c988e1e7
Fix incorrect translator documentation.
2011-08-21 12:41:03 +02:00
Siebrand Mazeland
ab8c166d49
Add translator documentation.
2011-08-20 20:33:16 +02:00
Samantha Doherty
c8a09b051c
Reinstate labels for oauth application info.
2011-08-19 15:43:56 -04:00
Siebrand Mazeland
d756242f64
Add translator documentation.
...
L10n/i18n fixes.
Whitespace updates.
2011-08-19 17:39:39 +02:00
Siebrand Mazeland
edd8045375
Message tweaks and elaborations as well as translator documentation tweaks. Based on comments by OsamaK.
2011-08-18 15:11:10 +02:00
Siebrand Mazeland
30d0a1d3d9
Simplify message.
2011-08-18 14:21:43 +02:00
Siebrand Mazeland
5115aa3e4c
tag -> list
2011-08-15 16:03:24 +02:00
Siebrand Mazeland
6319003a34
Change "stream" to "timeline" for consistency.
2011-08-15 15:57:36 +02:00
Evan Prodromou
e274ec4900
Merge branch 'testing' into 1.0.x
2011-07-18 10:45:32 -04:00
Zach Copley
6f0bd73e6c
Squashed commit of the following:
...
Move OMB to a plugin
commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 11:16:54 2011 -0700
Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2
* 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
Fix paths
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
Some odds and ends
Remove omb stuff from queuemanager defaults
Add check to make sure we're not untagging an OMB profile to OMB plugin
Move some more subscription stuff and peopletag checks to OMB plugin
Move some OMB-specific unsubscribe stuff to OMB plugin
Finish removing libomb from core extlibs
Fix more conflicts
Fix queuing/queuehandling
Move some stuff around; fix references
Fix conflicts
Move OMB-specific files to OMB plugin
Move some stuff around; fix references
Add OMB plugin README and rm references to OMB in mail StatusNet README
Update paths
Fix define
Basic plugin finished
Move OMB-specific files to OMB plugin
Remove OMB stuff from router
commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 14:38:40 2011 -0700
Fix paths
commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net>
Date: Tue Jul 12 18:17:06 2011 -0700
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:02:08 2011 -0700
Some odds and ends
commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:01:23 2011 -0700
Remove omb stuff from queuemanager defaults
commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:46:44 2011 -0700
Add check to make sure we're not untagging an OMB profile to OMB plugin
commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:34:20 2011 -0700
Move some more subscription stuff and peopletag checks to OMB plugin
commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 16:37:25 2011 -0700
Move some OMB-specific unsubscribe stuff to OMB plugin
commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 15:26:30 2011 -0700
Finish removing libomb from core extlibs
commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:47:32 2011 -0700
Fix more conflicts
commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:49:22 2011 -0700
Fix queuing/queuehandling
commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:46:05 2011 -0700
Fix conflicts
commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:28:59 2011 -0700
Add OMB plugin README and rm references to OMB in mail StatusNet README
commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:50:09 2011 -0700
Update paths
commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:38:03 2011 -0700
Fix define
commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:30:43 2011 -0700
Basic plugin finished
commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:01 2011 -0700
Remove OMB stuff from router
commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 14:38:40 2011 -0700
Fix paths
commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net>
Date: Tue Jul 12 18:17:06 2011 -0700
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:02:08 2011 -0700
Some odds and ends
commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:01:23 2011 -0700
Remove omb stuff from queuemanager defaults
commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:46:44 2011 -0700
Add check to make sure we're not untagging an OMB profile to OMB plugin
commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:34:20 2011 -0700
Move some more subscription stuff and peopletag checks to OMB plugin
commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 16:37:25 2011 -0700
Move some OMB-specific unsubscribe stuff to OMB plugin
commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 15:26:30 2011 -0700
Finish removing libomb from core extlibs
commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:47:32 2011 -0700
Fix more conflicts
commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:49:22 2011 -0700
Fix queuing/queuehandling
commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:46:05 2011 -0700
Fix conflicts
commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:28:59 2011 -0700
Add OMB plugin README and rm references to OMB in mail StatusNet README
commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:50:09 2011 -0700
Update paths
commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:38:03 2011 -0700
Fix define
commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:30:43 2011 -0700
Basic plugin finished
commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:01 2011 -0700
Remove OMB stuff from router
2011-07-15 12:13:57 -07:00
Evan Prodromou
9dc6dc4441
add conversation feed data
2011-07-15 12:55:43 -04:00
Evan Prodromou
c579bcae7b
conversation API
2011-07-15 12:49:52 -04:00
Zach Copley
cd05fc6aee
Remove debugging statement
2011-07-07 17:23:41 -07:00
Zach Copley
969a558339
Change a few things around for CORS header output
2011-07-07 17:19:59 -07:00
Zach Copley
cb183359e2
Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157
2011-07-07 15:58:28 -07:00
Zach Copley
7150c54a3f
Fix invite button for public sites
2011-07-05 17:27:11 -07:00
flyingmana
3c47d158f4
make cors header deactivatable
2011-06-29 22:39:33 +02:00
Evan Prodromou
20396ce8e1
ActivityStreamJSONDocument served as application/stream+json
2011-06-23 11:38:46 -04:00
Evan Prodromou
0755f45bf0
add activitystreams links to other actions
2011-06-22 17:19:46 -04:00
Evan Prodromou
e5d8fd6857
Add Activity Streams feeds to export data
2011-06-22 17:09:04 -04:00
flyingmana
62977ad4f2
allow cross-origin requests for xrd
2011-06-21 23:43:53 +02:00
flyingmana
253a55846a
allow cross-origin requests for host-meta
2011-06-21 21:59:34 +02:00
Siebrand Mazeland
46546ce985
Add translator documentation.
2011-06-19 12:12:47 +02:00
Siebrand Mazeland
36e07218e9
Remove double tag in comment.
2011-06-19 11:15:31 +02:00
Siebrand Mazeland
47d0c198e1
Fix typo in comment.
2011-06-19 11:11:12 +02:00
Siebrand Mazeland
173d20e1f9
L10n updates.
2011-06-17 22:36:24 +02:00
Siebrand Mazeland
b24e4fd9fe
Fix typo. Spotted by Nikerabbit.
2011-06-15 13:25:45 +02:00
Siebrand Mazeland
d6fe675fbe
Update translator documentation per request of Nikerabbit.
2011-06-15 13:25:41 +02:00
Siebrand Mazeland
b7aacc0818
Update translator documentation and L10n.
2011-06-15 13:25:40 +02:00
Evan Prodromou
c227045975
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-06-10 16:50:33 -04:00
Evan Prodromou
331d8a99ba
Merge branch 'statusnetworkapi' into 1.0.x
2011-06-10 16:50:15 -04:00
Zach Copley
1f1616223a
Allow changing the site logo from the site admin panel
2011-06-09 17:05:17 -04:00
Zach Copley
36d619480a
Rip out user, group and site design customization code
...
Squashed commit of the following:
commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:51:47 2011 -0400
Remove design-related stuff from the API
commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:40:16 2011 -0400
Mop up misc design related code
commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:21:00 2011 -0400
Remove Design DB_DataObject class and references to it in schema
commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:15:54 2011 -0400
Remove design-related actions and widgets
commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:10:57 2011 -0400
Remove navigation / routing to design settings actions
commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:03:09 2011 -0400
CurrentUserDesignAction -> Action
commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:54:22 2011 -0400
* GroupDesignAction -> GroupAction (new base class for group actions)
commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:36:40 2011 -0400
OwnerDesignAction -> Action
2011-06-09 16:20:19 -04:00
Evan Prodromou
1b0bafc6cc
Move recoverpassword functionality to User
2011-06-07 11:22:19 -04:00
Evan Prodromou
9a11003c08
add oauth_token_association to core.php so it gets set up correctly
2011-06-02 10:04:00 -04:00
Evan Prodromou
412adfb587
Merge branch '1.0.x' into testing
2011-05-30 15:37:46 -04:00
Evan Prodromou
d544c78276
correctly get profile for scope in apitimelinementions
2011-05-30 15:29:18 -04:00
Evan Prodromou
650af0a271
get the correct context for apitimelinementions
2011-05-30 15:09:42 -04:00
Evan Prodromou
d44000077d
use ReplyNoticeStream for mentions API
2011-05-30 11:22:52 -04:00
Evan Prodromou
5a9d969f22
use ReplyNoticeStream for replies page
2011-05-30 11:22:36 -04:00
Evan Prodromou
32f47004df
get correct profile for friends timeline
2011-05-25 12:51:21 -04:00
Siebrand Mazeland
4aaba2d5f4
Superfluous whitespace removed.
2011-05-20 16:57:21 +02:00
Zach Copley
8597856b56
Fancier invitation form for whitelisted domains
...
Squashed commit of the following:
commit 1c0766e8f9d9e962ec553e2fb35bd2f944ffb4b0
Author: Zach Copley <zach@status.net>
Date: Mon May 9 17:00:51 2011 -0700
Make the invites from the fancier invite form save
commit 9ea45b7cf38eda8dad1d82e87b3400413a532079
Author: Zach Copley <zach@status.net>
Date: Fri May 6 16:14:40 2011 -0700
.js to let the user add (and remove) additional invitees from their domain
commit b2a02339bd11d02c7cba24629dde359e22de32b6
Author: Zach Copley <zach@status.net>
Date: Thu May 5 15:44:49 2011 -0700
Load special whitelist invite .js when loading the invite page
commit 132fed7550b40cd1d46ee506fd83974a116bce32
Author: Zach Copley <zach@status.net>
Date: Wed May 4 18:35:49 2011 -0700
Remove settings class from whitelist inviter form
commit a38437351b505594aead5da86af9a5ed089666b6
Author: Zach Copley <zach@status.net>
Date: Wed May 4 18:21:18 2011 -0700
Make a fancier form for whitelist domain invites
commit 710d4f41edf412871a9c1fbf33af317226485325
Author: Zach Copley <zach@status.net>
Date: Wed May 4 17:34:09 2011 -0700
Add some more events to the invitation page
commit 2449e4e0c1bf11568968cfc3ea2d8e69db2d875e
Author: Zach Copley <zach@status.net>
Date: Wed May 4 17:12:36 2011 -0700
Refactor invite action a bit
2011-05-09 17:07:36 -07:00
Siebrand Mazeland
d906ee1bcb
Update translator documentation and L10n.
2011-05-05 12:47:26 +02:00
Evan Prodromou
c97048d01b
merge 0.9.x into 1.0.x
2011-05-04 14:59:39 -07:00
Evan Prodromou
be57e253fb
'Home' to 'Home timeline'
2011-05-04 10:49:46 -07:00
Evan Prodromou
f67607d2f1
change 'You and friends' to 'Home'
2011-05-04 10:48:12 -07:00
Evan Prodromou
90eb09624c
let users login with email address
2011-05-02 15:17:08 -07:00
Zach Copley
8cc5c175da
Fix broken event names
2011-04-27 17:40:51 -07:00
Siebrand Mazeland
a2e4a1803c
Harmonize message for 'User has no profile.' and update translator documentation.
2011-04-25 22:44:19 +02:00
Siebrand Mazeland
69e1bd3a58
Fix incorrect UI message. Spotted by Nike.
2011-04-24 19:57:47 +02:00
Evan Prodromou
f38a8abd34
re-enable invite button and popular notice section on home stream
2011-04-23 13:45:43 -04:00
Evan Prodromou
07d164f8bd
disable fancy stuff in home sidebar
2011-04-22 09:26:42 -04:00
Evan Prodromou
0c0aabeda5
show tag cloud in public stream
2011-04-20 17:17:36 -04:00
Evan Prodromou
776c2c99ea
inbox tag cloud section
2011-04-20 16:11:42 -04:00
Evan Prodromou
a7a521e46a
Change avatar size on single notice page
2011-04-20 15:47:44 -04:00
Evan Prodromou
5650a6e9f7
Just use avatarSize() method for SingleNoticeItem
2011-04-20 13:39:23 -04:00
Evan Prodromou
24e1491582
don't override show() in SingleNoticeItem
2011-04-20 13:38:13 -04:00
Evan Prodromou
9b65efd64d
don't show notice attachments in single-notice view
2011-04-20 13:37:05 -04:00
Samantha Doherty
f7ffe1df86
Restore local nav to single notice and attachment pages.
2011-04-19 13:28:27 -04:00
Evan Prodromou
138ca38b6f
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
...
Conflicts:
plugins/EmailRegistration/emailregister.php
2011-04-18 20:19:25 -04:00
Siebrand Mazeland
2c105e5575
Update translator documentation.
2011-04-19 01:13:28 +02:00
Evan Prodromou
98b3f5ea91
no extra nulls on home page
2011-04-18 16:28:41 -04:00
Evan Prodromou
7a333e3175
recover password uses login menu
2011-04-18 16:19:00 -04:00
Evan Prodromou
9346d50102
inviter URL corrected
2011-04-18 13:40:27 -04:00
Evan Prodromou
122b38f354
check for valid email on invite
2011-04-18 13:26:46 -04:00
Evan Prodromou
d3215adfa1
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-18 12:54:23 -04:00
Evan Prodromou
17adc94df7
DocFile::fromTitle() -> DocFile::forTitle()
2011-04-18 10:10:38 -04:00
Evan Prodromou
c30dcbebbc
no notice form on invites
2011-04-18 10:04:57 -04:00
Evan Prodromou
4a8a424bdf
Use mail templates for invite text
2011-04-18 09:04:11 -04:00
Evan Prodromou
ef67262a3f
Externalize document-finding code so plugins can use it
2011-04-18 06:16:32 -04:00
Siebrand Mazeland
cb28496054
Update people tag related UI messages.
...
Update translator documentation accordingly.
2011-04-17 23:28:11 +02:00
Siebrand Mazeland
4ab995dd1e
Complete "people tag" to "list" in UI messages.
...
Update translator documentation accordingly.
Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
Siebrand Mazeland
d68a86f019
people tag -> list
2011-04-17 02:15:17 +02:00
Siebrand Mazeland
049f23cdb3
people tag -> list
2011-04-17 02:11:46 +02:00
Siebrand Mazeland
271881d4dc
Fix translator documentation.
2011-04-17 02:09:47 +02:00
Siebrand Mazeland
f1316677d8
Add forgotten comment tag.
2011-04-17 02:06:17 +02:00
Siebrand Mazeland
c74adb5401
Fix typo in comment.
2011-04-17 00:53:29 +02:00
Evan Prodromou
d9f27fcb14
move Invite button to top
2011-04-16 16:12:04 -04:00
Evan Prodromou
3ba4258f9e
use notice list instead of threaded for list view
2011-04-15 18:56:24 -04:00
Evan Prodromou
9eafc8d0ba
use threadingnoticestream for groups
2011-04-15 18:54:35 -04:00
Evan Prodromou
ee81f98828
use threadingnoticestream for inbox
2011-04-15 18:51:18 -04:00
Evan Prodromou
52fce18e0a
use threading notice stream wrapper for public
2011-04-15 18:47:56 -04:00
Zach Copley
da6822c1f0
Merge branch 'lists_fixes' into 1.0.x
2011-04-15 20:50:04 +00:00
Shashi Gowda
b78e5de474
Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists.
2011-04-16 00:52:58 +05:30
Siebrand Mazeland
55b58f0f1f
Update translator documentation.
2011-04-15 10:20:34 +02:00
Siebrand Mazeland
44bdc2ddaf
Remove obsolete code.
...
Update translator documentation.
2011-04-15 10:12:49 +02:00
Zach Copley
335390f2ca
Merge branch 'onboarding-remix' into 1.0.x
...
* onboarding-remix:
* Show the right menus in the aside after successful registration * Events surrounding successful registration output
2011-04-14 15:46:40 -07:00
Zach Copley
951ee1faff
* Show the right menus in the aside after successful registration
...
* Events surrounding successful registration output
2011-04-14 15:45:05 -07:00
Evan Prodromou
3df69fe5ba
show invite button in public
2011-04-14 18:19:59 -04:00
Evan Prodromou
0cc73b3b2a
show invite button section on home page
2011-04-14 18:19:18 -04:00
Evan Prodromou
93bfacad3b
no object nav for invite
2011-04-14 18:15:47 -04:00
Evan Prodromou
9ef13976fc
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-14 16:09:18 -04:00
Evan Prodromou
4bda1b2a36
groups show same aside as profile
2011-04-14 15:53:18 -04:00
Evan Prodromou
b8a057bc2d
hide subscription tag sections
2011-04-14 15:51:07 -04:00
Evan Prodromou
f1da1a24d1
hide subscriber tag sections
2011-04-14 15:51:00 -04:00
Shashi Gowda
53af608ef8
People tags -> Lists (only UI changes, for experimentation)
2011-04-14 19:49:42 +00:00
Evan Prodromou
8def44bc57
no object nav for showstream
2011-04-14 15:47:01 -04:00
Shashi Gowda
22f6151a10
Annihilate profile_tag_inbox.
2011-04-14 19:45:31 +00:00
Evan Prodromou
4b5cbea16a
no popular notice section for tags
2011-04-14 15:33:59 -04:00
Evan Prodromou
c7a4aaddfc
show correct preview URL and hide delete button if avatar is not local
2011-04-14 11:47:55 -04:00
Zach Copley
03de85ed46
Make it so input forms that don't have navigation don't accidentally get hidden. Add a "nonav" class to them.
2011-04-12 14:20:19 -07:00
Zach Copley
5454d22b79
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Show both empty and full notice search results inside event wrapper
More interesting test notices in createsim.php
2011-04-12 11:55:01 -07:00
Zach Copley
fcd863bba9
Theming - add some new markup to DM and new notice pages
2011-04-12 11:54:12 -07:00
Evan Prodromou
606884385c
Show both empty and full notice search results inside event wrapper
2011-04-12 14:29:12 -04:00
Evan Prodromou
4331b8b4f1
make search results privacy-aware
2011-04-11 18:59:58 -04:00
Evan Prodromou
9c424cb7e6
events for validating outgoing invites
2011-04-11 16:49:28 -04:00
Evan Prodromou
25c5a1f0ef
hooks for adding email addresses
2011-04-11 16:38:57 -04:00
Evan Prodromou
d197c86a61
show full threaded notice list in conversation view
2011-04-11 12:39:06 -04:00
Evan Prodromou
1b00eb2599
Fix undefined variable in showgroup
2011-04-11 11:54:42 -04:00
Evan Prodromou
820e19e197
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-11 11:20:27 -04:00
Evan Prodromou
19bd6fded4
pass user profile to ThreadedNoticeList in PublicAction
2011-04-11 11:18:12 -04:00
Siebrand Mazeland
abbe0cf4ab
Add space between two sentences.
2011-04-11 15:25:43 +02:00
Evan Prodromou
70faf76001
threadednoticelist takes a profile param
2011-04-10 20:16:51 -04:00
Evan Prodromou
5304373b0b
Merge branch '1.0.x' into testing
2011-04-10 14:20:46 -04:00
Siebrand Mazeland
f0d762f196
Update/add translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.
Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855).
2011-04-10 19:59:55 +02:00
Zach Copley
e75c9988eb
Merge branch 'people_tags_rebase' into 1.0.x
...
Conflicts:
EVENTS.txt
2011-04-10 08:10:01 +00:00
Evan Prodromou
cfff80a730
If you search for a tag, redirect to tag page
2011-04-09 17:30:59 -04:00
Siebrand Mazeland
5a377a24c9
Fix incorrect translator documentation. Spotted by OsamaK.
2011-04-09 21:08:41 +02:00
Shashi Gowda
f47027abbe
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
lib/profileblock.php
theme/default/css/display.css
2011-04-09 21:57:45 +05:30
Evan Prodromou
9a86e64b46
use conversationnoticestream in conversationrepliesaction
2011-04-08 18:03:42 -04:00
Evan Prodromou
79f3c0939b
use conversationnoticestream in conversationaction
2011-04-08 18:03:34 -04:00
Shashi Gowda
4d61760154
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-08 17:16:20 +05:30
Sam Nicholls
4bf5158d43
Modified actions/login.php to redirect logged in users who hit login/ to
...
the site index.
Removed the throwing of a clientError in favour of a common_redirect to
index to fix Issue 2990: "If logged in, just redirect to home page on
/login"
2011-04-08 12:06:55 +01:00
Shashi Gowda
c44a94e8f5
Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS.
2011-04-08 14:51:05 +05:30
Evan Prodromou
fbc18a3c67
change apitimelinehome to use InboxNoticeStream
2011-04-07 15:35:00 -04:00
Evan Prodromou
831eaa039b
use inboxnoticestream in RSS 1.0
2011-04-07 15:28:25 -04:00
Evan Prodromou
328373e29c
use inboxnoticestream in API
2011-04-07 15:28:09 -04:00
Evan Prodromou
5dfb8e2bc4
Use InboxNoticeStream class for inbox
...
Move the code for inbox fetching to the InboxNoticeStream class.
2011-04-07 14:54:42 -04:00
Shashi Gowda
ad86eb78d3
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
js/util.min.js
lib/default.php
2011-04-07 23:13:45 +05:30
Evan Prodromou
36b331d469
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Evan Prodromou
7533c7cfe1
Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."
...
This reverts commit 880661de4e
.
2011-04-05 12:53:49 -04:00
Shashi Gowda
ced00cf0bd
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-05 10:28:05 +05:30
Evan Prodromou
b41c62a27c
single flag for private groups
2011-04-04 16:58:52 -04:00
Shashi Gowda
57198a7464
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
Siebrand Mazeland
2dbdb0f185
Translator documentation updated/added.
...
i18n tweaks.
Superfluous whitespace removed.
YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
2011-04-04 00:41:48 +02:00
Siebrand Mazeland
84a2fb44b9
Add/update translator documentation.
2011-04-04 00:12:52 +02:00
Siebrand Mazeland
9a6ee5e859
Update translator documentation.
2011-04-03 23:47:46 +02:00
Siebrand Mazeland
436a02959c
Tabs to spaces.
2011-04-03 22:44:41 +02:00
Siebrand Mazeland
c17d8e0f5f
Update translator documentation.
...
i18n tweaks.
Add FIXME for missing class documentation.
Remove superfluous whitespace.
2011-04-01 19:47:22 +02:00
Siebrand Mazeland
f64c312942
Update translator documentation.
2011-03-31 22:48:03 +02:00
Siebrand Mazeland
4292fa1fc4
Tweak page titles. Thanks @evan for thinking with me.
2011-03-31 22:43:57 +02:00
Evan Prodromou
f70bcbdb6b
save private stream values
2011-03-30 16:23:13 -04:00
Shashi Gowda
5a2bab07b2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
2011-03-30 15:47:42 +05:30
Brion Vibber
20ca5027cc
Consolidate common code in micro-apps custom notice type display actions.
...
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
2011-03-29 16:58:15 -07:00
Brion Vibber
674e3c2a0e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/apistatusesretweet.php
actions/repeat.php
classes/Notice.php
lib/command.php
2011-03-29 16:26:20 -07:00
Brion Vibber
9adbb49fc9
Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.
...
Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)
These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel.
2011-03-29 16:20:12 -07:00
Siebrand Mazeland
0a19674c9f
@evan Fixed message domain for messages in plugins for recent commits.
...
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Brion Vibber
880661de4e
Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view.
2011-03-29 15:40:07 -07:00
Evan Prodromou
9f1603462d
Merge branch 'limitdist2' into 1.0.x
2011-03-29 17:32:17 -04:00
Siebrand Mazeland
ede8fabb55
Fix incorrect translator documentation. Spotted by AVRS.
2011-03-29 23:14:40 +02:00
Siebrand Mazeland
700018fd09
L10n/i18n updated.
...
Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks.
2011-03-29 23:00:29 +02:00
Siebrand Mazeland
a8af04feea
Update translator documentation.
...
Superfluous whitespace removed.
L10n consistency updates.
2011-03-29 21:30:36 +02:00
Siebrand Mazeland
f2d7c33ad3
Update translator documentation.
...
Remove superfluous whitespace.
Various L10n/i18n updates.
2011-03-29 21:30:35 +02:00
Evan Prodromou
32145484c2
Disallow repeats (retweets) of private notices
...
We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.
Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI.
2011-03-29 11:53:26 -04:00
Evan Prodromou
7b8fc701e0
don't show notices to out-of-scope viewers
2011-03-28 22:21:41 -04:00
Evan Prodromou
e862dcdb8a
Merge branch '1.0.x' into limitdist2
2011-03-28 21:56:34 -04:00
Brion Vibber
e5b5c256a3
Working subscription approval!
2011-03-28 17:08:04 -07:00
Brion Vibber
df5def8ce4
Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet.
2011-03-28 15:13:59 -07:00
Brion Vibber
11b40ddb1b
work in progress...
2011-03-28 13:59:48 -07:00
Evan Prodromou
798b03fb5f
set default address for showstream
2011-03-28 16:24:28 -04:00
Evan Prodromou
a7380d5933
set default address for showgroup
2011-03-28 16:24:17 -04:00
Evan Prodromou
5147404ea2
ToSelector widget to send private notices
...
A new widget, ToSelector (Sorry, couldn't think of anything better)
that lets you select an addressee for a notice and whether it's
private.
2011-03-28 11:02:20 -04:00
Siebrand Mazeland
52d29a17a0
Fix incorrect translator documentation. Spotted by AVRS.
2011-03-28 01:43:01 +02:00
Evan Prodromou
889b35be9c
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-27 11:26:57 -04:00
Evan Prodromou
c7defb32f9
NoticeForm constructor takes array of optional parameters
...
NoticeForm::__construct() had 9 parameters, and I was about to add a
few more, so I figured it'd be better to use an $options array instead.
2011-03-27 11:25:24 -04:00
Siebrand Mazeland
1adaa6a2ab
Update grammar for feed title. Not sure why this was not "%s's". I chose the safe, more verbose way.
2011-03-27 13:05:24 +02:00
Siebrand Mazeland
074be0d51e
i18n fixes.
...
Translator documentation updates.
2011-03-25 17:12:53 +01:00
Siebrand Mazeland
e0cccfc40d
Translator documentation updated.
...
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME for missing class documentation.
2011-03-24 12:09:50 +01:00
Siebrand Mazeland
78edb4bf56
Update translator documentation.
...
Remove superfluous whitespace.
L10n/I18n updates.
FIXMEs added for missing documentation or headers.
2011-03-24 11:48:53 +01:00
Siebrand Mazeland
3be26565fb
Update translator documentation.
...
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation.
2011-03-24 11:48:51 +01:00
Brion Vibber
265f9af6f7
Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons...
2011-03-23 15:21:12 -07:00
Evan Prodromou
83fb5e6023
Mass replacement of #-comments with //-comments
...
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
Shashi Gowda
13e9e41d2f
Blend in with some new code. New menus, etc.
2011-03-22 08:30:16 +05:30
Shashi Gowda
bf121a695a
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
classes/Profile.php
2011-03-22 07:59:06 +05:30
Shashi Gowda
31c1177970
Merge branch '1.0.x' into people_tags_rebase
...
Conflicts:
EVENTS.txt
actions/peopletag.php
actions/tagother.php
classes/Notice.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/personalgroupnav.php
plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
Brion Vibber
942887ca8c
Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.
2011-03-21 17:17:18 -07:00
Brion Vibber
6bdb1053ad
Pending members queue list -- doesn't yet allow approval.
2011-03-21 16:40:10 -07:00
Brion Vibber
471a480587
Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests.
2011-03-21 16:26:41 -07:00
Brion Vibber
541dfa04fe
Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated.
2011-03-21 14:35:29 -07:00
Brion Vibber
0bec9cfdbc
Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
...
UI for setting the join policy is in, but not yet used.
2011-03-21 13:51:13 -07:00
Siebrand Mazeland
84e5ca6158
Translator documentation added/updated.
...
Superfluous whitespace removed.
L10n update.
2011-03-18 20:37:04 +01:00
Siebrand Mazeland
902990bb72
Add myself to contributors array.
2011-03-18 20:15:57 +01:00
Siebrand Mazeland
7ef8bd9275
i18n updates.
...
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 20:12:59 +01:00
Siebrand Mazeland
8a2002afe7
Translator documentation added/updates.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 17:04:38 +01:00
Siebrand Mazeland
b7178d2197
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x
2011-03-18 16:09:27 +01:00
Siebrand Mazeland
0de0ae2f48
Update/add translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 13:48:47 +01:00
Siebrand Mazeland
6f9c277494
* Add FIXME: $profile appears to be undefined.
...
* Update translator documentation.
2011-03-18 13:10:55 +01:00
Brion Vibber
4afa3caae3
ajax load for additional inline replies; /replies variant of conversationview
2011-03-17 16:27:42 -07:00
Evan Prodromou
7cf12f093e
Merge branch '1.0.x' into testing
...
Conflicts:
lib/common.php
2011-03-17 09:20:32 -04:00
Siebrand Mazeland
b74a7d7a75
Change email to SMS. Spotted by Nikerabbit.
2011-03-17 13:59:22 +01:00
Siebrand Mazeland
9785140da5
Update translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-17 11:46:49 +01:00
Brion Vibber
0bf40bd748
Output avatar/author along with ProfileNoticeListItem items on ShowProfileAction -- they get hidden in CSS anyway, and we need the author data for the inline reply form if you end up replying to yourself/someone else from a profile stream view.
...
Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.
2011-03-16 14:54:14 -07:00
Brion Vibber
5ec018ca19
Fix tag nesting bug on group page
2011-03-16 10:58:18 -07:00
Evan Prodromou
9b4533058c
no profileblock on login actions
2011-03-16 10:05:07 -04:00
Evan Prodromou
bbba1f6e16
Show group actions in profile block
2011-03-16 09:57:10 -04:00
Evan Prodromou
2d4554ea03
Remove UserProfile class
2011-03-16 09:57:10 -04:00
Evan Prodromou
561458650f
profile group uses account profile block
2011-03-16 09:57:09 -04:00
Brion Vibber
08b430a247
Event hook for notice search pages
2011-03-15 15:33:37 -07:00
Brion Vibber
e985a41a7e
Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input.
...
If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through.
Also switched from deprecated static DOMDocument::loadXML() to non-static call.
2011-03-15 10:11:13 -07:00
Brion Vibber
9e9cbdf505
Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input.
...
If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through.
Also switched from deprecated static DOMDocument::loadXML() to non-static call.
2011-03-15 10:09:20 -07:00
Brion Vibber
34e7d8ddf2
For good measure; trip short error mode in earlier on ajax shownotice
2011-03-14 13:44:39 -07:00
Brion Vibber
c7e7cc79da
'ajax' param on shownotice action so we can pull items in full html version for realtime
2011-03-14 13:05:30 -07:00
Siebrand Mazeland
eaef01233a
Fix incorrect parameter documentation. Spotted by Nikerabbit.
2011-03-14 18:01:22 +01:00
Siebrand Mazeland
e2defc1f7c
* update/add translator documentation.
...
* remove superfluous whitespace.
* minor updates to L10n/i18n.
2011-03-11 17:07:27 +01:00
Zach Copley
a984aae564
Show a reasonable error message when an image is bad, instead of
...
letting the exception continue bubbling up.
2011-03-10 15:18:14 -08:00
Zach Copley
b7548fb9e2
Show a reasonable error message when an image is bad, instead of
...
letting the exception continue bubbling up.
2011-03-10 18:14:22 +00:00
Brion Vibber
4d5f8e7876
Ticket #3076 : fix regression in password recovery when email address given that doesn't match
...
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
2011-03-09 15:48:46 -08:00
Brion Vibber
e74590d414
Ticket #3076 : fix regression in password recovery when email address given that doesn't match
...
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
2011-03-09 15:46:24 -08:00
Evan Prodromou
a4b3edaf40
Login actions don't show the notice form
2011-03-09 10:11:59 -05:00
Brion Vibber
5b0ca315b4
'note' -> 'notice' in an error message -- thx to AVRS on IRC for the catch on translatewiki.net :D
2011-03-08 10:58:14 -08:00
Evan Prodromou
55b4303ea4
Merge branch '3cl' into 1.0.x
2011-03-07 14:30:30 -05:00
Shashi Gowda
382e4d2cdb
people tag actions
2011-03-07 00:43:31 +05:30
Shashi Gowda
371e923c37
Twitter lists compatible people tags api
2011-03-07 00:36:06 +05:30
Siebrand Mazeland
e9933871e5
* fix i18n and L10n issues.
...
* update translator documentation.
* remove superfluous whitespace.
2011-03-05 17:03:12 +01:00
Siebrand Mazeland
a127ba78a8
* translator documentation updated.
...
* superfluous whitespace removed.
* small refactoring in noticeform.php to allow proper translator hints.
2011-03-05 00:24:19 +01:00
Siebrand Mazeland
b37e12ed34
* translator documntation updated
...
* superfluous whitespace remove
* minor L10n and i18n updates
2011-03-05 00:13:04 +01:00
Brion Vibber
9689bda21c
Loading the original form instead of faking up our own. Sorta works but not pretty :D
2011-03-04 14:11:11 -08:00
Siebrand Mazeland
d55a831d97
Update translator documentation.
2011-03-03 01:42:54 +01:00
Siebrand Mazeland
399c83db87
Fix typo in documentation. Spotted by Nikerabbit.
2011-03-02 23:06:45 +01:00
Brion Vibber
8cacecb6dc
Use threaded replies in group inbox view
2011-03-01 16:29:11 -08:00
Zach Copley
5bf0c9f610
Fix mising require_once (now required here because of rearranging)
2011-03-01 15:31:06 -08:00
Zach Copley
243b396660
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-01 15:26:02 -08:00