Mikael Nordfeldth
0cd93c2761
Cron plugin added and now default queue handler
...
Generally the Cron plugin will run if there's still execution time for
1 second since starting the Action processing. If you want to change
this (such as disabling, 0 seconds, or maybe running bigger chunks,
for like 4 seconds) you can do this, where 'n' is time in seconds.
addPlugin('Cron', array('secs_per_action', n));
Add 'rel_to_pageload'=>false to the array if you want to run the queue
for a certain amount of seconds _despite_ maybe already having run that
long in the previous parts of Action processing.
Perhaps you want to run the cron script remotely, using a machine capable
of background processing (or locally, to avoid running daemon processes),
simply do an HTTP GET request to the route /main/cron of your GNU social.
Setting secs_per_action to 0 in the plugin config will imply that you run
all your queue handling by calling /main/cron (which runs as long as it can).
/main/cron will output "0" if it has finished processing, "1" if it should
be called again to complete processing (because it ran out of time due to
PHP's max_execution_time INI setting).
The Cron plugin also runs events as close to hourly, daily and weekly
as you get, based on the opportunistic method of running whenever a user
visits the site. This means of course that the cron events should be as
fast as possible, not only to avoid delaying page load for users but
also to minimize the risk of running into PHP's max_execution_time. One
suggestion is to only use the events to add new queue items for later processing.
These events are called CronHourly, CronDaily, CronWeekly - however there
is no guarantee that all events will execute, so some kind of failsafe,
transaction-ish method must be implemented in the future.
2013-11-19 14:13:33 +01:00
Mikael Nordfeldth
5998825458
We haven't added the cron plugin yet
2013-11-19 14:02:53 +01:00
Mikael Nordfeldth
450ae3043b
Plugins should be initialized with an empty array, not null
2013-11-19 13:52:41 +01:00
Mikael Nordfeldth
c942bdcb43
Comment and typing improvements
...
To make the StatusNet::addPlugin() accept only arrays,
the lib/default.php had to be changed because all plugins
had 'null' as default value instead of an array.
2013-11-19 13:29:26 +01:00
Mikael Nordfeldth
06b068d43b
Don't allow double plugin loading
2013-11-19 13:25:02 +01:00
Mikael Nordfeldth
048a435a5e
GNUSOCIAL, not STATUSNET. Too many changes to be backwards compatible
2013-11-19 13:21:09 +01:00
Mikael Nordfeldth
1a0e17fea6
Minor queue fixes, probably not very important. Preparing for cron
2013-11-13 18:15:21 +01:00
Mikael Nordfeldth
0a93fa68f3
Slightly better indication that notice section shows incomplete text
...
Must still be improved somehow.
2013-11-11 13:18:23 +01:00
Mikael Nordfeldth
a987db2c55
Section notices should not take up too much space.
...
No configuration options for the max amount of characters yet.
2013-11-11 00:47:41 +01:00
Mikael Nordfeldth
1349eb349a
curly braces to pick a character in string is not recommended
2013-11-11 00:45:30 +01:00
Mikael Nordfeldth
a480ff5605
Group mentions got the wrong class. Now lists get their own too!
2013-11-07 08:20:41 +01:00
Mikael Nordfeldth
5176f19f7d
Cache key lead is 'gnusocial' now (restart daemons!)
2013-11-04 17:38:09 +01:00
Mikael Nordfeldth
413f040673
Profile->getGroupCount() should be used for groupcounts
...
This was found in the PHP error log as:
"Trying to get property of non-object in %HTDOCS%/lib/profileaction.php on line 270"
2013-11-02 20:17:14 +01:00
Mikael Nordfeldth
2cecfe8f82
We can only handle Memcached_DataObject in NoResultException
2013-11-02 18:48:28 +01:00
Mikael Nordfeldth
5e054bfdb3
Minor typing stuff and syntax fixes
2013-11-02 17:28:11 +01:00
Mikael Nordfeldth
d289ccb7f2
Minor PHP stylistic features and typing stuff
2013-11-02 13:05:08 +01:00
Mikael Nordfeldth
25e61916f9
There are no LaconicaScripts left
2013-11-02 00:35:59 +01:00
Mikael Nordfeldth
bd86519d50
Minor labeling things for StatusNet to GNU social migration
2013-11-01 14:04:40 +01:00
Mikael Nordfeldth
6bc11b63e3
What was that NewMenu plugin doing there anyway?
2013-11-01 13:57:31 +01:00
Mikael Nordfeldth
f110fc5c9a
Using GNUSOCIAL_VERSION instead of STATUSNET_VERSION
2013-11-01 13:51:41 +01:00
Mikael Nordfeldth
255943d78f
User agents and generators changed to GNU social
2013-11-01 13:46:05 +01:00
Mikael Nordfeldth
ca66860a4f
Better typing and minor fixes to OStatus related stuff
2013-11-01 13:20:45 +01:00
Mikael Nordfeldth
810495708d
Version name strings updated, StatusNet only retained for copyright
2013-10-30 16:37:13 +01:00
Mikael Nordfeldth
58717fa6c5
Forgot to catch no-parent-exception
...
Unfortunately not a specific Exception right now, but we're getting to that.
2013-10-30 14:56:27 +01:00
Mikael Nordfeldth
20bd0c1136
getStreamName will now return nick/fullname based on current user's preferred representation
2013-10-30 13:05:04 +01:00
Mikael Nordfeldth
09ef1fff69
NoticeListItem attentions showed double for User_group
...
...because they each have their own Profile now! Whiie!
2013-10-30 12:56:17 +01:00
Mikael Nordfeldth
e45edd6ae2
Use addPlugin! (esp. XMPP folks should do this)
...
If you're using XMPP by setting $config['xmpp'][*] then you should do:
addPlugin('Xmpp', $config['xmpp']);
because setting it directly in $config[''] won't do anything.
Also, default resource for XMPP is now 'gnusocial'. If you want something
more random, set it in your addPlugin config array.
2013-10-30 12:28:39 +01:00
Mikael Nordfeldth
8dafce34c3
LoginAction somewhat converted to FormAction
2013-10-30 12:23:10 +01:00
Mikael Nordfeldth
f7c6dd4f6e
mentioned was an array, not a single object
2013-10-29 15:06:02 +01:00
Mikael Nordfeldth
c5f6937f5e
User_group->permalink() is a function, not a variable.
2013-10-29 13:42:21 +01:00
Mikael Nordfeldth
9b6633698c
Group discovery from text functions polished
...
Also removed the entirely unused saveGroups function.
Now avoiding multiGet and using listFind in Profile->getGroups()
so we don't have to deal with ArrayWrapper.
2013-10-29 13:40:14 +01:00
Mikael Nordfeldth
f8b49e69d0
Protected function prepare with array $args defaulting to array()
2013-10-29 10:26:46 +01:00
Mikael Nordfeldth
23a6b4595f
Reworked the ActivityContext->attention structure
...
Removing Evan's obscure attentionType solution and directly using the attention array
2013-10-28 22:21:14 +01:00
Mikael Nordfeldth
f99c4b7f07
More OOP-ish tests using instanceof
2013-10-28 22:18:00 +01:00
Mikael Nordfeldth
fa91bc7132
Some getStaticProperty calls to PEAR globalized
2013-10-28 19:03:09 +01:00
Mikael Nordfeldth
9ea57e5cb2
getAcctUri function added with related exception
...
Used in ActivityObject for Atom Title generation.
New events:
* StartGetProfileAcctUri
* EndGetProfileAcctUri
2013-10-28 18:21:10 +01:00
Mikael Nordfeldth
addd84aa22
Make Atom titles a bit more verbose
2013-10-28 17:54:34 +01:00
Mikael Nordfeldth
fcba540a14
Removed legacy OMB. Use OStatus for remote profiles.
2013-10-28 16:22:09 +01:00
Mikael Nordfeldth
e7a4ccb7b5
Enable json-specified objects in queue_item frames
2013-10-28 12:44:06 +01:00
Mikael Nordfeldth
2ef9beb4b1
defines changed to GNU social names instead of StatusNet
2013-10-27 11:27:12 +01:00
Mikael Nordfeldth
c423e84776
No need to know what DBQueueManager got if not debugging
2013-10-22 17:43:17 +02:00
Mikael Nordfeldth
aa36fecd0a
Geonames now not a default plugin
...
In the name of privacy, let's not by default call a bunch of third
party services with our (users') geographical position.
2013-10-22 17:32:06 +02:00
Mikael Nordfeldth
b46c1746f2
Daisychaining bug with exceptions in PHP
2013-10-22 15:36:02 +02:00
Mikael Nordfeldth
f4c0cff032
Only use ActivityVerb::SHARE (forwardId is deprecated)
...
StatusNet >= 1.0 support it.
2013-10-21 22:25:19 +02:00
Mikael Nordfeldth
8004849305
Removing rel='ostatus:attention' in favor of Salmon's rel='mentioned'
...
This was introduced in StatusNet 0.9.x, which is the oldest branch
on the web today as far as I know.
2013-10-21 18:42:15 +02:00
Mikael Nordfeldth
2e3ef4cc07
Use pre-defined const instead of strings
2013-10-21 18:28:04 +02:00
Mikael Nordfeldth
3cab5b36c1
Replace common_good_random with common_random_hexstr
2013-10-21 13:20:30 +02:00
Mikael Nordfeldth
db5df642ba
common_good_rand was _not_ a "good rand", only hex
...
0-F isn't random enough to be called rand, so we rename the function
to avoid confusion with something that is actually good at random.
2013-10-21 13:09:40 +02:00
Mikael Nordfeldth
d632df320a
Apparently only one atom:content is allowed
2013-10-20 13:15:37 +02:00
Mikael Nordfeldth
802734d07e
Switch order of html/text for StatusNet backwards compatibility
...
StatusNet chooses the first content element in an Atom feed, while
it should really choose the 'html' representation for its 'rendered'
and 'text' representation for the (text-only) 'content'.
GNU social will implement a better algorithm for retrieving Atom
feeds, but that is yet to be done. So to avoid having link-less posts
on remote nodes, we'll just do the old switch-a-roo.
Other Atom readers, such as Mozilla Firefox, has the reverse priority
(choosing the last of the content elements).
2013-10-20 12:50:27 +02:00
Mikael Nordfeldth
0398741956
Core plugin list would not merge into $config
2013-10-19 15:25:59 +02:00
Mikael Nordfeldth
565e32aca3
Always generate local HTTPS links if ssl is 'always'
...
The isHTTPS call won't work in cli mode, so install_cli.php should
solve it some other way for initial profile url and User uri.
2013-10-19 14:59:02 +02:00
Mikael Nordfeldth
2a5ba1f74b
Core and Default plugins separated, now loads on install
...
_flow_ reported on IRC that install.php had stopped working. This was
because default plugins had been put into two separate lists, and the
list with AuthCrypt was never loaded when performing an installation.
Core plugins cannot be disabled.
I also removed the Memcache autodetection thing since it should be
solved in a more elegant manner.
2013-10-19 14:38:15 +02:00
Mikael Nordfeldth
2f70866367
Installer redirects to HTTPS if ssl is set to 'always'
2013-10-18 18:17:37 +02:00
Mikael Nordfeldth
e2c50d202f
AuthCrypt now tidied up and enabled by default.
2013-10-17 16:36:15 +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
cd0e3f1fa4
NoProfileException now parent to User* and Group*
2013-10-17 00:32:54 +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
38a69b5597
Better checks during User::register and improved Nickname checks
2013-10-16 14:58:06 +02:00
Mikael Nordfeldth
b764ee8134
Nickname::normalize now checks for path name collision too.
2013-10-16 13:22:43 +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
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
a8bcdc905f
common_sql_now() is recommended before DB_DataObject_Cast::dateTime()
2013-10-14 13:42:27 +02:00
Mikael Nordfeldth
390556d932
Remote Profile Action from ModPlus now more generic
2013-10-08 21:08:02 +02:00
Mikael Nordfeldth
fcf47f315b
Removed deprecated activity:subject
2013-10-08 15:06:19 +02:00
Mikael Nordfeldth
e1c9061735
Atom output of ActivityObject now has html AND text
2013-10-08 15:00:54 +02:00
Mikael Nordfeldth
db363cdad9
Revert "Don't set the title of a notice to its plain-text content."
...
This reverts commit 74ec87c27c
.
2013-10-08 14:06:27 +02:00
Mikael Nordfeldth
9ddc40b6da
NoResultException returns the failed object
2013-10-08 00:21:24 +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
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
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
753019baf2
60 chars was too little, 100 chars seems better. For me.
2013-10-06 20:28:07 +02:00
Mikael Nordfeldth
e93c4d6268
Missed an exclamation mark. Still doesn't linkify groups?
2013-10-06 17:26:55 +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
5974493707
I missed a preg_replace with /e
2013-10-06 12:37:55 +02:00
Mikael Nordfeldth
5f867f98c2
Typing and static declaration in PoCo class
2013-10-06 03:48:41 +02:00
Mikael Nordfeldth
64dbd93534
Some PHP strict warning fixes
2013-10-06 03:37:12 +02:00
Mikael Nordfeldth
1c042028dc
PCRE modifier /e is deprecated in favour of preg_replace_callback()
2013-10-06 03:27:16 +02:00
Mikael Nordfeldth
ac819e5738
fillAvatars would avoid the *ProfileGetAvatar events
2013-10-06 03:01:43 +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
b43be41643
OAuth extlib updated and Twitter comments removed
...
Source: http://oauth.googlecode.com/svn/code/php/OAuth.php
Should we use PECL OAuth?
2013-10-05 16:04:23 +02:00
Mikael Nordfeldth
eb5097aecb
We don't need _that_ noisy queue managers...
2013-10-05 13:12:16 +02:00
Mikael Nordfeldth
8fdc999be4
IM/XMPP Plugin classes use throwing getParent
2013-10-05 12:30:52 +02:00
pztrn
9824b00f4b
Adopted merge request #232 from statusnet to gnusocial
2013-10-05 12:36:48 +04:00
Mikael Nordfeldth
636a8fcaf5
Properly defined globals, $_PEAR caused install to fail. (thanks DRiKE)
2013-10-04 21:29:16 +02:00
Mikael Nordfeldth
fb4e9b234d
Twitter Import improvements. Still buggy?
...
Apparently mrvdb has problems with duplicate inserts and missing files when
unlinking. It could be due to coding, or it could be due to parallelizing.
2013-10-04 13:36: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
3e15bab965
PHP Notice: Trying to get property of non-object
...
The notice was reported in /srv/www/vhosts/se/umeahackerspace/social/%/htdocs/lib/inboxtagcloudsection.php on line 63
2013-10-01 17:43:46 +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
562d5bc5fb
Remove bad common_path() call in context of cssLink().
2013-09-29 23:09:55 +02:00
Mikael Nordfeldth
80c6af0ffe
Uncaught exception when no subscribers/subscriptions in ProfileList
2013-09-26 00:47:56 +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
e9cc87f5b9
Updated some of the INSTALL documentation
...
Also we now recommend the mysqlnd driver, instead of 'mysql', so no need
to mention deprecation in daemon.php comments.
2013-09-25 13:19:03 +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
f268c3f877
Completing extra-element-without-text patch from 4015a58d1c
2013-09-24 01:26:51 +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
Mikael Nordfeldth
1744fec89f
Array to string conversion in queuemanager logger
2013-09-24 00:40:23 +02:00
Mikael Nordfeldth
4015a58d1c
Sometimes there's no text content, so pad the array (thanks mrvdb)
...
mrvdb used '' rather than null for the padding argument. MMN-o changed that.
2013-09-24 00:12:30 +02:00
Mikael Nordfeldth
9d3abc3600
$_PEAR now defined globally as new PEAR, so no static calls are made
2013-09-23 22:27:43 +02:00
Mikael Nordfeldth
8205c56e25
Stylesheet event now removed of StatusNet-remnants
2013-09-23 22:13:12 +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
50e611a1a9
Shouldn't define static classes as abstract.
...
New Exception class added (MethodNotImplementedException)
2013-09-21 18:53:18 +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
39f21d63af
New Managed_DataObject retrieval: listFind
...
This will return a proper DB_DataObject instance (as the desired class)
and not an array, or ArrayWrapper.
2013-09-21 18:18:03 +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
792e1aeb47
StatusNet_HTTPResponse now prefixed with GNUSocial_
2013-09-19 16:11:04 +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
4c6803a054
GNUSOCIAL is the new defined indicator
...
STATUSNET is still there for compatibility, so we don't have to change
all scripts at once yet...
2013-09-18 00:35:49 +02:00
Mikael Nordfeldth
d480ed42d1
Gravatar pretty much equals disregarding privacy
...
Not only that one can often correlate email address md5 hash sums, but
the "functionality" depends on a bunch of external calls.
2013-09-16 21:49:32 +02:00
Mikael Nordfeldth
482296561e
Event::handle only takes array $args
...
This is because it calls call_user_func_array with that exact $args argument.
2013-09-14 18:32:52 +02:00
Mikael Nordfeldth
5e24600304
Minified javascripts are evil! Human readable source, please!
2013-09-14 13:41:49 +02:00
Mikael Nordfeldth
360492472c
updated and moved jquery-cookie
...
Also added to minification Makefile in js/ as it was not delivered from
upstream as .min.js
2013-09-14 13:31:24 +02:00
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
Evan Prodromou
48625da04b
Automatically add or drop fulltext indexes
2011-09-18 18:28:44 -04:00
Evan Prodromou
3eaa3234f9
Drop fulltext indexes that aren't used in new def
2011-09-18 17:54:48 -04:00
Evan Prodromou
951601633b
better handling of tagged notice streams
2011-09-18 12:33:35 -04:00
Evan Prodromou
13e1fab919
be more careful with returned table def for schema
2011-09-18 10:59:01 -04:00
Evan Prodromou
4d09d3c680
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-17 17:00:49 -04:00
Evan Prodromou
945bdf649b
show correct favorites link
2011-09-17 17:00:30 -04:00
Zach Copley
2d6b4497a4
Fix undefined variable
2011-09-17 13:34:08 -07:00
Evan Prodromou
467b840c44
move OMB-specific remote login button to OMB Plugin
2011-09-17 15:08:38 -04:00
Evan Prodromou
fc3d52c120
disable routes that aren't available in single-user mode
2011-09-17 14:37:19 -04:00
Evan Prodromou
ce84555a50
upgrade to beta4
2011-09-16 15:28:11 -04:00
Zach Copley
dcbf2f6871
Better error handling when the email subsystem isn't working. The
...
installer was dying trying to send a confirmation email to the initial
user.
2011-09-15 16:58:28 -07:00
Zach Copley
0bd26ed3f0
Store a list of all paths the router knows about (backward compatibility with Net_URL_Mapper)
2011-09-15 16:58:12 -07:00
Evan Prodromou
7c03a50947
exact match for paths
2011-09-15 09:54:25 -04:00
Evan Prodromou
7c57aab44e
change category on urlmapper.php
2011-09-15 09:51:33 -04:00
Evan Prodromou
601573a8a9
don't forget to add qstring to static paths
2011-09-14 16:13:54 -04:00
Evan Prodromou
f6f147c0db
with new URLMapper, cached router takes more memory, time than re-generating
2011-09-14 12:41:54 -04:00
Evan Prodromou
a4240db48f
Deal with default param patterns more effectively
2011-09-14 12:27:20 -04:00
Evan Prodromou
11f2a3d551
Merge branch '1.0.x' into nummedout
2011-09-14 12:20:37 -04:00
Evan Prodromou
15ae1cddfe
two useful functions for profiling
2011-09-14 12:19:29 -04:00
Evan Prodromou
40924842f4
new URLMapper without Net_URL_Mapper
2011-09-14 12:15:56 -04:00
Brion Vibber
8454b1fbad
Fix for schema upgrade issue when primary keys change; fixes upgrade direct from 0.8.x
...
Previously we were failing to update the primary key during ensureTable(), which could lead to failures when updating some tables (eg queue_item where we changed keys, and the addition of an autoincrement column failed because it conflicted with the old key).
Now if the key is different, we remove the old key at the start and add the new key at the end of the ALTER TABLE.
Not tested on PostgreSQL -- someone please check whether the alter table 'DROP CONSTRAINT PRIMARY KEY' bit works or if it needs to pull a special name for the key.
On MySQL, dropping uses alter table's 'DROP PRIMARY KEY' special case.
2011-09-08 13:03:22 -07:00
Antonin Kral
ab4f4dbab4
add Connection: close when sending redirect
2011-09-08 11:45:34 +02:00
Jean Baptiste Favre
65bf58be80
Fix a UI typo which appear when using $config['site']['indent'] = null
...
Add whitespace after _('Repeated by') as it's done in showNoticeSource function
Typo only appear when minifying HTML and not in normal mode because of TAB inserted.
2011-09-04 21:44:18 +02:00
Zach Copley
c585a43d6f
Remove activity:actor and deprecation warning from Atom Activity Streams serialization
2011-08-31 13:09:52 -07:00
Evan Prodromou
9f75131082
check for 'post' verb in microapps by default
2011-08-31 13:08:25 -07:00
Siebrand Mazeland
c421a43b71
Update translator documentation.
2011-08-30 11:23:05 +02:00
Siebrand Mazeland
1b69be23c4
Remove superfluous whitespace.
2011-08-30 11:22:04 +02:00
Siebrand Mazeland
7e5b4b6e9f
Remove superfluous whitespace.
2011-08-30 11:20:29 +02:00
Siebrand Mazeland
537125e7c6
Update translator documentation.
2011-08-30 11:19:29 +02:00
Siebrand Mazeland
82e1716656
Remove superfluous whitespace.
2011-08-30 11:06:28 +02:00
Zach Copley
0e2d9432b5
Fix parameratized static function call so it works in PHP 5.2
2011-08-29 11:17:59 -07:00
Zach Copley
8665969890
Move conversation id output to statusnet-specific section
2011-08-27 19:01:02 -07:00
Zach Copley
552cbb3370
Revert "add conversation ID to notice output"
...
This reverts commit 00be58829c
.
I already added this with commit e8d45a46
2011-08-27 18:55:51 -07:00
Zach Copley
500ec79e39
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
add conversation ID to notice output
For fave count, don't use distinct
Static -> static
allow posting to groups through atompub
2011-08-27 18:47:19 -07:00
Zach Copley
eaaa978d20
Set site profile after creating initial user during installation
2011-08-27 16:02:00 -07:00
Evan Prodromou
00be58829c
add conversation ID to notice output
2011-08-27 18:49:10 -04:00
Zach Copley
e26d3b0ede
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Issue #546 : enable case-insensitive searching in MySQL
remove more groupnav
remove group nav
shorter title for tag cloud section on groups
remove group nav
move pending queue to sidebar
Move group logo edit from object nav to block actions
Show blocked users from group in section
2011-08-27 14:27:15 -07:00
Zach Copley
e565477e3f
Merge branch 'singleuser-profile' into 1.0.x
...
* singleuser-profile:
* Allow setting single user site profile * Fix site profile array munging
Add "Single User" to installer's site profile form
2011-08-27 14:26:57 -07:00
Zach Copley
7f5080d5e3
* Allow setting single user site profile
...
* Fix site profile array munging
2011-08-27 14:25:12 -07:00
Evan Prodromou
acc4df9edd
shorter title for tag cloud section on groups
2011-08-27 16:08:01 -04:00
Evan Prodromou
d4bfe77f1c
remove group nav
2011-08-27 16:06:45 -04:00
Evan Prodromou
804c343a9f
move pending queue to sidebar
2011-08-27 16:05:58 -04:00
Evan Prodromou
ffd387e2dd
Move group logo edit from object nav to block actions
2011-08-27 15:50:56 -04:00
Evan Prodromou
330af9991f
Show blocked users from group in section
2011-08-27 15:46:05 -04:00
Evan Prodromou
725524c667
Take members and group off of group nav
2011-08-27 15:21:54 -04:00
Evan Prodromou
6ae214afb6
move edit choice to group profile block
2011-08-27 15:10:47 -04:00
Evan Prodromou
8501ddf0ee
don't use fetchAll() for profile lists ever
2011-08-27 13:34:14 -04:00
Evan Prodromou
f81c1f7554
use an array of profiles rather than a looping cursor for profile lists
2011-08-27 12:53:15 -04:00
Evan Prodromou
dd5da6c9e8
Move common nav stuff to GroupAction
2011-08-27 11:28:32 -04:00
Evan Prodromou
507fd9bd69
upgrade version to beta3
2011-08-27 09:42:02 -04:00
Evan Prodromou
95abad5abb
attachment notice section uses explicit joinAdd()
2011-08-27 09:38:46 -04:00
Zach Copley
af97bc896e
Make site profiles work
2011-08-26 21:10:24 -07:00
Evan Prodromou
f251c2e036
Explicit joins for people tags
2011-08-26 11:38:39 -04:00
Evan Prodromou
04dccad3bb
Activity notices on by default
2011-08-26 11:38:05 -04:00
Samantha Doherty
8c84637612
Move header search before nav in the HTML; give it a unique ID.
2011-08-25 22:29:11 -04:00
Evan Prodromou
c0bae505d9
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-25 18:03:30 -04:00
Evan Prodromou
44a46de7ff
use a form for search
2011-08-25 17:59:27 -04:00
Samantha Doherty
8ea5cd0cac
Check for existence of RTL stylesheets; placeholder files for base and neo themes.
2011-08-25 17:48:27 -04:00
Zach Copley
3bdae5aed4
Link in additional stylesheet for RTL languages
2011-08-25 13:12:44 -07:00
Zach Copley
8b9258c0ec
Function to test for RTL language
2011-08-25 12:48:36 -07:00
Zach Copley
e8d45a4644
* Add conversation ID to Twitter compatible API
...
* Fix formatting of blocking info in JSON API output
2011-08-25 11:30:07 -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
94503a50fd
Don't prefill for each conversation
2011-08-25 12:41:25 -04:00
Evan Prodromou
1cab702df9
add source class to notice list items
2011-08-25 12:19:22 -04:00
Evan Prodromou
3fbcba40a6
Don't show large image if it's not available
2011-08-25 11:37:15 -04:00
Evan Prodromou
a053d96bf2
Better list-unwrapping in MoreMenu
2011-08-23 00:32:46 -04:00
Evan Prodromou
5e61ec5e01
avoid producing notices for last element in MoreMenu
2011-08-22 23:53:34 -04:00
Evan Prodromou
0022bb8110
fix calls to staticGet() to avoid problems with default args
2011-08-22 18:06:06 -04:00
Evan Prodromou
7c6399a51a
Remove now-unused statusnet.ini
2011-08-22 18:03:05 -04:00
Evan Prodromou
2f1751568a
pre-fill repeats of notices
2011-08-22 12:39:37 -04:00
Evan Prodromou
d3399e93e8
use listGet() for ConversationNoticeStream
2011-08-22 12:25:04 -04:00
Evan Prodromou
0a17e7cf9f
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
...
Conflicts:
classes/Memcached_DataObject.php
2011-08-22 11:25:13 -04:00
Siebrand Mazeland
5d557a2656
Add translator documentation.
...
Whitespace updates.
2011-08-19 18:13:25 +02:00
Siebrand Mazeland
b1ff67a55e
Add translator documentation.
...
L10n updates.
Whitespace updates.
2011-08-19 18:11:31 +02:00
Zach Copley
76c48a7099
Fix syntax err
2011-08-18 18:17:38 -07:00
Evan Prodromou
ff656a8b3a
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-08-18 17:27:55 -07: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
Evan Prodromou
827b13a2a4
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-08-16 15:59:06 -04:00
Siebrand Mazeland
0a420fd7d0
More list...
2011-08-15 16:06:35 +02:00
Siebrand Mazeland
6f386b2f8b
Update translator documentation.
2011-08-15 15:50:36 +02:00
Evan Prodromou
632ed129eb
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-08-08 12:01:48 -04:00
Evan Prodromou
e09310ffb7
Cache the repeat_of query for noticelists
2011-08-08 10:51:13 -04:00
Evan Prodromou
0c762dde42
pre-fill all notices in conversations on the page
2011-08-08 10:39:45 -04:00
Evan Prodromou
8b32ac85d8
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-05 10:42:42 -04:00
Evan Prodromou
0502e1d737
Properly structure X-XSS-Protection header
2011-08-05 10:42:18 -04:00
Evan Prodromou
7ce2b3c756
change 140-char limit to unlimited by default
2011-08-03 12:50:12 -04:00
Evan Prodromou
16042387a0
pre-fill the addressees of notices in a list
2011-08-03 00:59:09 -04:00
Evan Prodromou
ba6235a446
Get faves in Notice and pre-fill
2011-08-03 00:04:18 -04:00
Evan Prodromou
dfbdd481fa
Pre-fill Notice attachments
2011-08-02 23:12:21 -04:00
Evan Prodromou
9cab0958f5
use Notice::attachments() to get attachments for a notice
2011-08-02 18:22:06 -04:00
Evan Prodromou
d918ee95f4
pre-fetch groups for notices
2011-08-02 18:13:56 -04:00
Evan Prodromou
dc690459f5
1.0.0beta2
2011-08-02 15:12:27 -04:00
Evan Prodromou
513c54fa89
Merge branch 'master' into 1.0.x
...
Conflicts:
lib/common.php
2011-08-02 15:04:14 -04:00
Evan Prodromou
6ce8134471
New release because I'm stupid
2011-08-02 14:40:23 -04:00
Evan Prodromou
edb3f704b9
correctly include UTF-8 alphanum chars in tags
2011-08-02 14:03:12 -04:00
Evan Prodromou
10ce44c297
cleanse tags of non-tag characters when canonicalizing
2011-08-02 13:49:00 -04:00
Evan Prodromou
f6a7335ccd
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-02 13:13:10 -04:00
Evan Prodromou
58d798b607
Change NoticeList::prefill() to a static function
2011-08-02 12:01:41 -04:00
Evan Prodromou
06e2422517
pre-fill avatars for Profiles in a notice list
2011-08-02 11:54:27 -04:00
Evan Prodromou
5a132dbef0
correct pagination for noticelist
2011-08-02 11:22:37 -04:00
Zach Copley
b925eeecde
Fix errors thrown by code trying to broadcast profiles via OMB when the OMB plugin isn't installed
2011-08-02 01:15:30 -07:00
Evan Prodromou
b9cabd45de
Move prefill call to noticelist class
2011-08-01 16:43:44 -04:00
Evan Prodromou
874f1db389
Pre-fill profiles in notice streams
2011-08-01 14:51:59 -04:00
Evan Prodromou
e0238e7c17
Update version number
2011-08-01 11:15:49 -04:00
Brion Vibber
fcc4bbde19
Fix a glitch on AtomPub posting for micro-apps -- hook wasn't returning the new notice back to the calling code.
2011-07-26 12:19:33 -07:00
Evan Prodromou
0ec3047e0c
Move AtomPubClient to its own module
2011-07-25 23:15:32 -04:00
Evan Prodromou
f726df9748
check explicitly for ActivityObject in microappplugin
2011-07-20 11:39:51 -04:00
Evan Prodromou
0ad7411343
Make process*() functions return existing or new notice
2011-07-20 11:33:28 -04:00
Evan Prodromou
383f14c781
Try to get only immediate children (again)
2011-07-19 16:38:58 -04:00
Evan Prodromou
c86f0ffa2f
Avoid slurping objects recursively in activity parsing
2011-07-19 16:18:29 -04:00
Evan Prodromou
22b565a937
special case for parsing embedded activities in SHARE verb
2011-07-19 16:02:28 -04:00
Evan Prodromou
4a6f576478
'type' => 'objectType' for embedded activities
2011-07-18 17:42:28 -04:00
Evan Prodromou
d277f343ca
Encode repeats as share activities
2011-07-18 17:06:03 -04:00
Evan Prodromou
e274ec4900
Merge branch 'testing' into 1.0.x
2011-07-18 10:45:32 -04:00
Evan Prodromou
98064e6336
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-15 17:46:19 -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
c579bcae7b
conversation API
2011-07-15 12:49:52 -04:00
Evan Prodromou
dc7099aa5a
ArrayWrapper::fetchAll() shortcut
2011-07-14 14:40:57 -04:00
Evan Prodromou
18fe1ac524
Revert "Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()""
...
This reverts commit b1c12648f0
.
2011-07-14 13:15:28 -04:00
Evan Prodromou
b1c12648f0
Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()"
...
This reverts commit 9ab0a6f760
.
2011-07-14 13:07:34 -04:00
Evan Prodromou
1280a9345f
use Notice::fetchAll() in ConversationNoticeStream
2011-07-14 12:54:07 -04:00
Evan Prodromou
9ab0a6f760
use Notice::multiGet() for NoticeStream::getStreamByIds()
2011-07-14 12:03:33 -04:00
Shashi Gowda
efb7d28d83
Fix problems in joinAdd with xampp
...
Xampp ships with a different version of DB_DataObject PEAR package that
cannot do joins using objects correctly. This patch fixes the problem
2011-07-09 06:26:46 +05:30
Evan Prodromou
41c2102d0b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-08 10:18:16 -04: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
Evan Prodromou
f6e929d61c
beta1
2011-07-07 13:12:34 -04:00
Evan Prodromou
12e0f89155
don't show see-all if less than hard max
2011-07-07 10:58:44 -04:00
Evan Prodromou
749804f8cb
ListsNav is a MoreMenu
2011-07-07 10:42:31 -04:00
Evan Prodromou
feb53619cf
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
js/util.min.js
2011-07-07 10:27:54 -04:00
Evan Prodromou
1598050f54
Show more menu items when you click More
...
I added the necessary JavaScript to show more menu items when you click More.
2011-07-07 10:26:07 -04:00
Evan Prodromou
1c917ac28f
start making more menu work
2011-07-06 18:40:02 -04:00
Evan Prodromou
74f8c51358
correctly output richer nav IDs
2011-07-06 11:19:47 -04:00
Evan Prodromou
eb430f9cb3
don't add empty classes to menu items
2011-07-06 11:18:53 -04:00
Evan Prodromou
663bc35390
GroupsNav uses new Menu class functionality
2011-07-06 11:10:26 -04:00
Evan Prodromou
0e07124a1e
make Menu class more functional
2011-07-06 11:10:08 -04:00
Evan Prodromou
97d77a7c75
Revert "add a 'more' button for groups menu"
...
This reverts commit 3226f2bef6
.
2011-07-06 10:17:22 -04:00
Zach Copley
038ee13e79
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-05 17:30:01 -07:00
Zach Copley
7150c54a3f
Fix invite button for public sites
2011-07-05 17:27:11 -07:00
Evan Prodromou
3226f2bef6
add a 'more' button for groups menu
2011-07-05 19:20:44 -04:00
Evan Prodromou
7e9c17bd15
make the default scope depend on site/private
2011-07-01 21:50:04 -04:00
flyingmana
3c47d158f4
make cors header deactivatable
2011-06-29 22:39:33 +02:00
Evan Prodromou
13d479bc18
stop sending OMB by default
2011-06-27 13:02:32 -04:00
Evan Prodromou
b25e957be5
correct const for ActivityStreamJSONDocument::CONTENT_TYPE
2011-06-23 11:39:08 -04:00
Evan Prodromou
fadc4df039
use application/stream+json for Activity Streams
2011-06-23 11:24:37 -04:00
Evan Prodromou
83a8cac961
Merge branch '1.0.x' into testing
2011-06-22 17:21:20 -04:00
Evan Prodromou
e5d8fd6857
Add Activity Streams feeds to export data
2011-06-22 17:09:04 -04:00
Evan Prodromou
0f53c07f56
Merge branch '1.0.x' into testing
2011-06-21 11:33:18 -04:00
Evan Prodromou
9f785f6734
Fix addressees when drop-down for a single user is used
2011-06-21 11:32:26 -04:00
Evan Prodromou
f078c19f09
Merge branch '1.0.x' into testing
2011-06-20 12:23:16 -04:00
Evan Prodromou
01996b1a46
Merge remote-tracking branch 'evan/blogplugin' into newblogplugin
2011-06-20 09:34:32 -04:00
Evan Prodromou
8104b1f766
Merge branch '1.0.x' into testing
2011-06-20 09:13:42 -04:00
Evan Prodromou
ab98458399
push regex pattern for UUID to that class
2011-06-20 01:11:08 -04:00
Siebrand Mazeland
26a92b2801
Hopefully fix TRANS message not getting picked up by xgettext.
2011-06-19 11:45:37 +02:00
Siebrand Mazeland
c2ab4af804
Fix incorrect tag (missing colon).
2011-06-19 11:30:35 +02:00
Siebrand Mazeland
173d20e1f9
L10n updates.
2011-06-17 22:36:24 +02:00
Evan Prodromou
e43a6241cb
pass nickname into mail_send_sms_notice_address()
2011-06-14 11:33:52 -04:00
Zach Copley
e1ac64f2cb
Add current class to selected menu items
2011-06-09 19:29:19 -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
a10edb3183
Merge branch 'testing' into 1.0.x
...
Conflicts:
plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
2011-06-07 16:04:49 -04:00
Zach Copley
895447f3dc
Upgrade anti-framing, anti-clickjacking code
2011-06-06 06:08:17 +00:00
Siebrand Mazeland
3dcdf2ef03
Update translator documentation.
2011-06-05 11:12:34 +02:00
Evan Prodromou
f4e17c1bdf
Merge branch '1.0.x' into testing
2011-05-31 17:16:45 -04:00
Evan Prodromou
506958f2c8
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-05-31 17:01:11 -04:00
Evan Prodromou
60a1b0a15a
Change 'listening to your notices' to 'following you'
2011-05-31 17:00:23 -04:00
Evan Prodromou
ac55efeecf
Don't show empty addressees in noticelistitem
2011-05-30 16:20:52 -04:00
Evan Prodromou
0dbdcf2936
Merge branch 'master' into 1.0.x
2011-05-30 11:18:34 -04:00
Evan Prodromou
19b965d991
Merge branch 'master' into testing
2011-05-30 11:18:22 -04:00
Evan Prodromou
9167ba8d2d
ActivityImporter catches thrown exceptions by plugins and marks entry done
2011-05-30 09:57:49 -04:00
Evan Prodromou
97debbab68
use integer iterator for childNodes in ActivityUtils::getLinks()
2011-05-30 09:57:11 -04:00
Evan Prodromou
d7a16929b9
Set the current user on API calls
2011-05-25 14:01:22 -04:00
Evan Prodromou
a838891c0e
set the current user in api actions
2011-05-25 13:04:35 -04:00
Ian Denhardt
31b29fde50
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
plugins/OStatus/actions/ostatusinit.php
2011-05-23 21:50:48 -04:00
Evan Prodromou
b34e267e53
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
Evan Prodromou
cb090ab48d
increment alpha version revision
2011-05-23 12:37:29 -04:00
Siebrand Mazeland
e48c26e156
Update translator documentation, i18n and L10n.
2011-05-20 16:57:05 +02:00
Evan Prodromou
5a86900a34
minor alpha version for i18n build errors
2011-05-20 06:09:37 -07:00
Evan Prodromou
c2f735a84e
rev to alpha3
2011-05-20 06:03:36 -07:00
Samantha Doherty
fbc5de3268
Add missing li tags in settings and admin menus.
2011-05-18 12:13:34 -04:00
Samantha Doherty
4549d36862
Change addressees arrow from hardcoded to CSS.
2011-05-18 09:49:01 -04:00
Samantha Doherty
37cf7c0e8c
Style for invite forms and width fix for Onboard popup.
2011-05-11 17:07:08 -04: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
3b3bf74176
Harcode three newlines that lead to issues with translations (as fixed in Commit:5e7e5dd93cd3d73e2f2c93225cf8688844138380 by Evan).
2011-05-05 12:36:56 +02:00
Evan Prodromou
c97048d01b
merge 0.9.x into 1.0.x
2011-05-04 14:59:39 -07:00
Evan Prodromou
c46406b209
low-level hook for loading templates
2011-05-04 11:28:49 -07:00
Evan Prodromou
6b1732d9a2
remove object nav for search
2011-05-04 10:43:47 -07:00
Evan Prodromou
90eb09624c
let users login with email address
2011-05-02 15:17:08 -07:00
Evan Prodromou
02c5d68bed
Merge branch 'emailsitesetup' into 1.0.x
2011-04-28 12:44:21 -07:00
Evan Prodromou
fad0c875ca
Don't redefine 'STATUSNET' in installer
2011-04-28 12:38:07 -07:00
Siebrand Mazeland
7c3818c00e
Update translator documentation.
2011-04-27 14:30:58 +02:00
Evan Prodromou
d09df28040
utility functions for setting config options in memory
2011-04-26 16:50:42 -04: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
413d9e2fd0
Whitespace updates.
2011-04-24 18:50:55 +02:00
Siebrand Mazeland
8afda686d2
@evan Please check. Doesn't look correct/complete.
2011-04-24 18:50:03 +02:00
Evan Prodromou
f79d59a081
Merge branch '1.0.x' into testing
2011-04-21 16:16:07 -04:00
Evan Prodromou
5fd08b798f
show thumbnails even for links that arent enclosures
2011-04-21 16:13:32 -04:00
Evan Prodromou
963d052653
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-21 15:23:22 -04:00
Siebrand Mazeland
5e97047f8f
Update translator documentation.
...
i18n fixes.
Whitespace updates.
2011-04-21 20:26:58 +02:00
Siebrand Mazeland
98cc1da7b5
Update indentation.
2011-04-21 20:19:51 +02:00
Evan Prodromou
63009f1e1b
Merge branch '1.0.x' into testing
2011-04-21 13:37:15 -04:00
Evan Prodromou
36d56232c6
a little better notice hiding
2011-04-21 13:37:05 -04:00
Evan Prodromou
9fcda5b2da
show the full name for likes
2011-04-21 12:00:10 -04:00
Evan Prodromou
34e26b53d5
show list of people who like something in threadednoticelist
2011-04-21 11:58:24 -04:00
Evan Prodromou
5899a3f5ee
fail gracefully when no IDs for tag cloud
2011-04-20 19:07:07 -04:00
Evan Prodromou
0c0aabeda5
show tag cloud in public stream
2011-04-20 17:17:36 -04:00
Evan Prodromou
4fa7f147b0
Make tag-per-group optional, default false
2011-04-20 16:19:07 -04:00
Evan Prodromou
e686199616
accidentally stored wrong personaltagcloudsection
2011-04-20 16:12:49 -04:00
Evan Prodromou
776c2c99ea
inbox tag cloud section
2011-04-20 16:11:42 -04:00
Evan Prodromou
3904ab9983
only 10 tags per section
2011-04-20 16:11:04 -04:00
Evan Prodromou
cacf627ce3
remove hidden <h2> in notice list
2011-04-20 13:41:50 -04:00
Evan Prodromou
1e2bd48c30
correctly output notice data for nli in microapp
2011-04-19 17:55:57 -04:00
Evan Prodromou
7c31462f86
Let showNotice() go unimplemented
...
Default implementation of showNotice().
2011-04-19 16:00:31 -04:00
Evan Prodromou
efabb002e4
use an adapter pattern to customize notice list item output
2011-04-19 15:43:06 -04:00
Evan Prodromou
1619578818
fix bad variable, show frame length
2011-04-18 19:33:00 -04:00
Evan Prodromou
3fd6b9d474
capture some info if serialization fails on stomp frame
2011-04-18 17:55:38 -04:00
Evan Prodromou
2757bd8428
Revert "put some debugging code into the home and public timelines"
...
This reverts commit aa7b6447a1
.
2011-04-18 16:43:54 -04:00
Evan Prodromou
aa7b6447a1
put some debugging code into the home and public timelines
2011-04-18 16:20:51 -04:00
Evan Prodromou
b81ddc70df
correct category on inboxnoticestream
2011-04-18 16:19:15 -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
9e7b880df7
Revert "disable showing tags; it throws a notice for me"
...
This reverts commit 7d6efbf29e
.
2011-04-18 10:08:26 -04:00
Evan Prodromou
7d6efbf29e
disable showing tags; it throws a notice for me
2011-04-18 10:03:38 -04:00
Evan Prodromou
28d0d9caad
loop through args in common_markup_to_html
2011-04-18 09:51:26 -04:00
Evan Prodromou
b72788d9ce
pass args from Docfile to renderer
2011-04-18 09:47:08 -04:00
Evan Prodromou
99d538af58
docfiles can take arguments
2011-04-18 09:03:43 -04:00
Evan Prodromou
551a4e8324
mail paths for docfile
2011-04-18 09:03:28 -04:00
Evan Prodromou
4784e3fe36
correctly parse help files
2011-04-18 06:30:33 -04:00
Evan Prodromou
e53edc2b6b
allow user properties in documentation files
2011-04-18 06:17:28 -04:00
Evan Prodromou
ef67262a3f
Externalize document-finding code so plugins can use it
2011-04-18 06:16:32 -04:00
Samantha Doherty
368b810a0e
Add new Infield Label jQuery plugin files to action.php
2011-04-18 00:27:46 -04:00
Zach Copley
5206ee7f9a
Allow setting separate name and id in textare inputs, and cols and rows
2011-04-17 15:09:00 -07:00
Zach Copley
606d7d7185
Allow setting separate name and id on form input elements
2011-04-17 14:29:38 -07:00
Evan Prodromou
5e50acb23b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-17 17:00:54 -04:00
Evan Prodromou
b1cc12af2c
use small triangle for notice addressees
2011-04-17 17:00:38 -04: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
25e38ebeca
Add/update translator documentation.
2011-04-17 13:00:52 +02:00
Siebrand Mazeland
d26d408304
Add support for Tagalog.
2011-04-17 10:49:48 +02:00
Siebrand Mazeland
8cfd8450d5
Update/fix translator documentation.
2011-04-17 02:26:53 +02:00
Siebrand Mazeland
858aa37985
i18n fixes.
...
Translator documentation added.
2011-04-17 00:36:14 +02:00
Evan Prodromou
f548831eb1
hide the nickname so it doesn't go into replies
2011-04-16 16:29:09 -04:00
Evan Prodromou
51a7e9961d
Merge branch '1.0.x' into testing
2011-04-16 15:58:16 -04:00
Evan Prodromou
53c927ed8e
don't show addressee info for root notice of conversation
2011-04-16 15:39:54 -04:00
Evan Prodromou
1c3ce200e7
show addressee arrow if just a notice to a user
2011-04-16 15:39:34 -04:00
Evan Prodromou
83dfe5ed3e
show addressees in notice lists
2011-04-16 15:30:50 -04:00
Evan Prodromou
b3e7838552
show best name in noticelistitem
2011-04-16 11:22:46 -04:00
Evan Prodromou
ff782f1d97
Thread by conversation, not id
2011-04-15 18:28:36 -04:00
Evan Prodromou
2dd81d9a5c
add a threading notice stream class
2011-04-15 18:20:54 -04:00
Evan Prodromou
97bae46da1
Revert "Add threading notice stream class to threaded pages"
...
This reverts commit 97a8bae4a9
.
2011-04-15 18:20:06 -04:00
Evan Prodromou
97a8bae4a9
Add threading notice stream class to threaded pages
...
For those pages where threading is important, we now have an extra filtering stream
class to skip stuff in conversations that have "already" been seen.
2011-04-15 18:17:48 -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
c27b9c0722
Update translator documentation.
...
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland
edb467978d
Fix incorrect translator documentation.
2011-04-15 09:31:30 +02:00
Zach Copley
bef1ed75b5
Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x
2011-04-14 22:29:11 +00:00
Evan Prodromou
3d9dc111a2
class on the invite link
2011-04-14 18:28:37 -04:00
Shashi Gowda
7224ca571c
List timeline cache blowing wasn't working. fixed.
2011-04-14 22:28:25 +00:00
Evan Prodromou
873b1fb186
invite button section
2011-04-14 18:19:09 -04:00
Evan Prodromou
f512e3df40
breakup Section::show()
2011-04-14 18:18:39 -04:00
Evan Prodromou
9eba121339
better title for active groups
2011-04-14 18:16:27 -04:00
Evan Prodromou
e5a84bfca2
better title for active groups
2011-04-14 18:16:10 -04:00
Evan Prodromou
9208c94b29
don't show private lists; correct link in header
2011-04-14 17:27:26 -04:00
Evan Prodromou
edee3995c2
no All groups link
2011-04-14 17:14:57 -04:00
Evan Prodromou
c8a58c924b
show lists as a comma-separated list in sidebar
2011-04-14 17:03:10 -04:00
Evan Prodromou
90e6eab68e
show user's lists in sidebar
2011-04-14 16:57:50 -04:00
Evan Prodromou
14308c21db
Don't show featuredusersection by default
2011-04-14 16:25:13 -04:00
Evan Prodromou
a2d1eb399f
disable sms, email by post by default
2011-04-14 16:24:56 -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
80ba45d665
better title for personal tagcloud section
2011-04-14 16:08:26 -04:00
Evan Prodromou
ddb03c9fc6
move follower/following/groups stats to those sections
2011-04-14 16:08:10 -04:00
Evan Prodromou
0c52ed76dd
gallery actions use same aside as profile
2011-04-14 15:50:45 -04:00
Zach Copley
7a00be5cc7
Merge branch 'people_tag_fixes' into 1.0.x
2011-04-14 19:50:44 +00:00
Shashi Gowda
45952ff164
"Lists with you" and "List subscriptions" in the right aside, "Lists" in the left aside
2011-04-14 19:49:43 +00:00
Shashi Gowda
53af608ef8
People tags -> Lists (only UI changes, for experimentation)
2011-04-14 19:49:42 +00:00
Shashi Gowda
22f6151a10
Annihilate profile_tag_inbox.
2011-04-14 19:45:31 +00:00
Evan Prodromou
b64a1ef0e7
No All subscriptions/subscribers links
2011-04-14 15:43:08 -04:00
Evan Prodromou
0ff4dc0a03
just 8 groups per minilist
2011-04-14 15:07:24 -04:00
Evan Prodromou
52e3a72102
just one line of 8 in the minilist
2011-04-14 14:58:24 -04:00
Zach Copley
bcafe0f819
Can't put a form (block level element) inside a span; changed it to a div
2011-04-13 17:34:31 -07:00
Zach Copley
e188a11ef6
Fix public group nav to highlight properly when our group directory is selected
2011-04-13 16:11:34 -07:00
Zach Copley
0f9d6f4c82
DirectoryPlugin - Hijack router mapping for normal groups page to substitute a directory page
2011-04-13 15:09:45 -07:00
Siebrand Mazeland
f20ddaec56
Add plural support where needed for added/removed tags messages.
2011-04-13 13:30:21 +02: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
fcd863bba9
Theming - add some new markup to DM and new notice pages
2011-04-12 11:54:12 -07:00
Evan Prodromou
be467fef91
like search is the default for 1.0.x
2011-04-11 19:00:25 -04:00
Evan Prodromou
4331b8b4f1
make search results privacy-aware
2011-04-11 18:59:58 -04:00
Evan Prodromou
9204719522
inviteonly by default
2011-04-11 17:06:20 -04:00
Evan Prodromou
09cffc1928
hide and disable ToSelector for replies
2011-04-11 12:55:49 -04:00
Evan Prodromou
d197c86a61
show full threaded notice list in conversation view
2011-04-11 12:39:06 -04:00
Evan Prodromou
d7f96307dc
all filtering stream classes take an optional profile parameter
2011-04-11 12:32:35 -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
61f62241da
Get conversation root visible to this user in threadednoticelist
2011-04-11 11:19:11 -04:00
Evan Prodromou
cc9f65ac81
pass profile down to ScopingNoticeStream in publicnoticestream
2011-04-11 11:17:38 -04:00
Evan Prodromou
bae9eacaa1
use -1 for invalid arg default in ScopingNoticeStream
2011-04-11 11:17:14 -04:00
Samantha Doherty
13e2acaf5c
Formatting for profile/group account blocks and entity action buttons.
2011-04-11 10:05:36 -04:00
Zach Copley
3ddaa5bff4
Fix bad i18n function call
2011-04-10 19:07:30 -07:00
Evan Prodromou
70faf76001
threadednoticelist takes a profile param
2011-04-10 20:16:51 -04:00
Evan Prodromou
dfdde5d2bc
groupnoticelist takes a profile param
2011-04-10 20:16:37 -04:00
Evan Prodromou
8b54f28330
getNotices() takes optional last 2 params
2011-04-10 20:16:14 -04:00
Evan Prodromou
dad5db25e2
start the div
2011-04-10 19:34:48 -04:00
Evan Prodromou
57741c46ef
try to fall back to default for exceptions on microapps
2011-04-10 19:33:11 -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
Siebrand Mazeland
cad040ce4e
Leding tabs to spaces.
...
Superfluous whitespace removed.
2011-04-10 19:33:58 +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
c382a1d8cc
fix errant class in notice content
2011-04-09 17:05:59 -04:00
Evan Prodromou
4d0f42aea2
Events for showing the 'tail' of a threaded notice
2011-04-09 16:58:38 -04:00
Evan Prodromou
8aacc4b84a
Revert "Add an indicator saying to whom a notice is addressed"
...
This reverts commit 2c14185a52
.
2011-04-09 16:30:52 -04:00
Evan Prodromou
ec1579474c
add classes to profile and group links in notices
2011-04-09 15:42:27 -04:00
Evan Prodromou
2c14185a52
Add an indicator saying to whom a notice is addressed
2011-04-09 15:41:48 -04: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
Zach Copley
285c2ee72d
Remove debugging statement
2011-04-08 17:41:40 -07:00
Zach Copley
e3789488c6
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
use conversationnoticestream in conversationrepliesaction
use conversationnoticestream in conversationaction
make ConversationNoticeStream accept a profile parameter
enable user directory and extended profile by default
Remove incompatible theme victorian
Remove incompatible theme shiny
Remove incompatible theme pigeonthoughts
Remove incompatible theme mnml
Remove incompatible theme identica
Remove incompatible theme h4ck3r
Remove incompatible theme default
Remove incompatible theme cloudy
Remove incompatible theme cleaner
Remove incompatible theme clean
Remove incompatible theme biz
correctly return for deleted items
show event as deleted
Use pkeyGet() instead of idStream() for fave caching
store oft-requested stuff in the data object
2011-04-08 15:47:18 -07:00
Zach Copley
3022d711e3
Add some more events to aside profile blocks and rework a bit
2011-04-08 15:45:49 -07:00
Evan Prodromou
85c4e11f83
make ConversationNoticeStream accept a profile parameter
2011-04-08 18:03:18 -04:00
Evan Prodromou
dc25564251
enable user directory and extended profile by default
2011-04-08 17:46:49 -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
Shashi Gowda
d442f59693
Fix weird alignment of controls in subscriptions page. The dots are gone now
2011-04-08 17:10:48 +05:30
Shashi Gowda
14a82dae61
Sidebar sections to show peopletags and tag subscriptions.
...
FIXME: currently you can see the subscriptions section only on *your* profileaction pages, is this OK?
2011-04-08 16:22:51 +05:30
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
Siebrand Mazeland
8d99a5f949
Whitespace updates.
2011-04-08 01:49:34 +02:00
Siebrand Mazeland
f9f437f5da
Update translator documentation.
2011-04-08 01:22:00 +02:00
Evan Prodromou
684d0a386d
allow passing a profile to inboxnoticestream
2011-04-07 15:39:23 -04:00
Shashi Gowda
e5495e7df8
Fix subscription lists
2011-04-08 00:39:40 +05:30
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
ca0f59d46a
Revert "add some timing comments to output to debug poor performance"
...
This reverts commit a2782523d7
.
2011-04-07 00:07:39 -04:00
Evan Prodromou
59d0e2f373
cache the notice count for threaded view
2011-04-06 23:17:17 -04:00
Evan Prodromou
a2782523d7
add some timing comments to output to debug poor performance
2011-04-06 18:33:05 -04:00
Evan Prodromou
4b5f76d688
more flexible oEmbed handling
2011-04-06 17:57:33 -04:00
Shashi Gowda
14aef781ad
Use the cool and new NoticeStream for people tag timeline
2011-04-06 11:25:50 +05:30
Siebrand Mazeland
69778f12c8
Update translator documentation.
...
Whitespace updates.
2011-04-06 01:55:29 +02:00
Siebrand Mazeland
3d36c755a3
Fix translator documentation issues.
2011-04-06 01:40:03 +02:00
Evan Prodromou
2138c3b339
a hook for showing the default local nav
2011-04-05 18:07:10 -04:00
Evan Prodromou
a36fa8364a
Move streams nav to groups nav
2011-04-05 17:49:45 -04:00
Evan Prodromou
77441beb97
Merge branch '1.0.x' into testing
2011-04-05 17:20:48 -04:00
Evan Prodromou
9568d17cb9
Add streams to left nav
2011-04-05 17:02:48 -04:00
Evan Prodromou
8697f1a1e7
alpha2
2011-04-05 15:47:35 -04:00
Evan Prodromou
1328023f88
Merge branch '1.0.x' into testing
2011-04-05 13:30:21 -04:00
Evan Prodromou
4b9c3335d4
default to private sites
2011-04-05 13:30:05 -04:00
Evan Prodromou
2d2c134a1f
fix constructor error in FileNoticeStream
2011-04-05 13:28:41 -04:00
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
Samantha Doherty
5bc6a8c614
Style changes for privacy selectors and markers.
2011-04-05 12:38:15 -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
ddbd4801e0
include protected flag for users in JSON or XML
2011-04-04 17:44:23 -04:00
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
cdebd59970
L10n consistency tweak.
2011-04-04 01:08:11 +02:00
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
Brion Vibber
c642eb2771
Switch some strings from heredoc to double-quotes so xgettext picks them up.
2011-04-03 15:37:39 -07:00
Siebrand Mazeland
9a6ee5e859
Update translator documentation.
2011-04-03 23:47:46 +02:00
Siebrand Mazeland
18185b2237
Tabs to spaces.
2011-04-03 23:02:24 +02:00
Siebrand Mazeland
7bd594e9d3
Use _m() instead of ngettext().
2011-04-03 22:08:50 +02:00
Siebrand Mazeland
ea8b468348
Update translator documentation.
...
Remove superfluous whitespace.
i18n/L10n tweaks.
2011-04-03 14:43:18 +02:00
Siebrand Mazeland
b1d451f98b
Upadte translator documentation.
...
Add FIXME for missing class documentation.
i18n/L10n tweaks.
Superfluous whitespace removed.
2011-04-03 14:24:55 +02:00
Siebrand Mazeland
fec3edee45
Fix several L10n and i18n issues.
...
Add dummy method MessageListItem::messageListItemDummyMessages() to allow xgettext to add possible sources to POT files.
Mark a few i18n issues as FIXME as well as some messages for which the use case was not clear to me.
Merged some code on multiple lines into one.
Translator documentation added.
Remove superfluous whiteapace.
2011-04-03 01:09:02 +02:00
Siebrand Mazeland
a466d4573a
Fix incorrect parameter numbering.
2011-04-01 23:40:20 +02:00
Siebrand Mazeland
7abecb61bd
i18n/L10n updates.
...
Translator documentation updated.
Superfluous whitespace removed.
Some FIXMEs added.
2011-04-01 19:47:24 +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
Evan Prodromou
61fe49b100
ActivityImporter gives up on any exception
2011-03-31 13:53:17 -04:00
Brion Vibber
02c2c3a6cc
Provisional workaround for router inconsistencies in background processes that switch site configs.
...
Ensure that router is cleared when we do site setup; we can still fetch the data from cache, so it should stay fast, but should ensure that we don't end up with someone else's routes still set up, which may be an issue breaking some of the bookmark handling that needs routing with a rare plugin.
2011-03-30 14:18:29 -07:00
Brion Vibber
da7c54023d
Format timestamps as UTC in ActivityStreams output. While using local times is legit per spec, it's confusing to have it change around and confuses some clients that don't handle zones right.
2011-03-30 12:36:54 -07: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
Evan Prodromou
f213ac33db
fix call-by-reference deprecation warning in microappplugin.php
2011-03-30 05:10:07 -04: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
Brion Vibber
18a994d105
Fix typo in filteringnoticestream that caused some messages to get lost
2011-03-29 15:19:04 -07:00
Brion Vibber
d7304d5659
php notice fix -- misspelled bit
2011-03-29 15:05:54 -07:00
Evan Prodromou
9f1603462d
Merge branch 'limitdist2' into 1.0.x
2011-03-29 17:32:17 -04: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
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
e862dcdb8a
Merge branch '1.0.x' into limitdist2
2011-03-28 21:56:34 -04:00
Brion Vibber
5d31dd259a
Subscription pending notification mail
2011-03-28 17:15:48 -07:00
Brion Vibber
e5b5c256a3
Working subscription approval!
2011-03-28 17:08:04 -07:00
Brion Vibber
a70e68e09c
Work in progress: can create & cancel sub requests
2011-03-28 16:12:51 -07:00
Evan Prodromou
ec5a43bf4f
let actions set a default address for toselector
2011-03-28 16:24:02 -04:00
Evan Prodromou
dca5e20b91
Make the to-selector clear left
2011-03-28 16:23:31 -04:00
Evan Prodromou
b1783e8d49
make to_user/to_profile consistent in NoticeForm
2011-03-28 12:13:46 -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
Ian Denhardt
d36f0707a4
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2011-03-28 03:25:40 -04:00
Evan Prodromou
c1fd36c043
Merge branch '1.0.x' into limitdist2
2011-03-27 11:36: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
Evan Prodromou
53a3fd822d
add indicator for limited-scope notices
2011-03-26 16:47:36 -04:00
Evan Prodromou
c7f866b032
Caller can set scope for Notice::saveNew()
2011-03-26 15:49:46 -04:00
Evan Prodromou
d69f912b00
Merge branch '1.0.x' into limitdist2
2011-03-25 16:18:10 -04:00
Evan Prodromou
7a56637baa
Make function signature for getNoticeIds agree
...
There were some differences between defaults for the
NoticeStream::getNoticeIds() function and some of its subclasses'
implementations. So, I got them rationalized.
2011-03-25 16:15:55 -04:00
Evan Prodromou
e0d5093ee5
Merge branch '1.0.x' into limitdist2
...
Conflicts:
lib/groupnoticestream.php
lib/taggedprofilenoticestream.php
2011-03-25 15:57:07 -04:00
Evan Prodromou
84984fdbfe
All notice streams check notice scope
...
Added filtering code so that notice streams check notice scope.
Added new class to implement filtering a stream, FilteringNoticeStream.
Added a subclass that does the logic for checking Notice scope.
And made all the streams use ScopingNoticeStream.
2011-03-25 12:22:22 -04:00
Siebrand Mazeland
ac955699b6
Fix use of incorrect method causing i18n issue.
2011-03-25 10:13:26 +01:00
Siebrand Mazeland
3cc7dda478
* PHP short tags "<?" to full tag "<?php".
...
* superfluous whitespace removed.
2011-03-25 10:02:02 +01:00
Evan Prodromou
22bf63bb46
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-24 18:05:32 -04:00
Evan Prodromou
44bcc942b8
Break up stream code to use separate notice stream classes
...
Rearchitect (again!) notice stream code to delegate different functionality up and down the stack.
Now, different classes implement NoticeStream.
2011-03-24 18:04:19 -04:00
Siebrand Mazeland
8a8a194316
Fix typo in documentation.
2011-03-24 17:02:28 +01:00
Siebrand Mazeland
3810482d1c
Fix i18n.
2011-03-24 16:52:32 +01:00
Siebrand Mazeland
53d3455749
Change formatting of i18n slightly. Translator hints were not picked up in pot file. May now they are.
2011-03-24 16:47:29 +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
fd4d535d91
add a fix1 to the version number
2011-03-23 14:34:32 -04:00
Evan Prodromou
2b901894c2
Some fixes to make the notice stream class work
2011-03-23 11:59:01 -04:00
Evan Prodromou
efb6a7b441
let Inbox class go fingerpokin' in streams
2011-03-23 11:42:52 -04:00
Evan Prodromou
0b35ce7c37
New NoticeStream class to reify streams of notices
...
We've been muddling through with 6- or 8-argument functions for managing streams. I'd
like to start thinking of streams as their own thing, and give them some more value.
So, the new NoticeStream class takes over the Notice::stream() function and Notice::getStreamByIds().
There's probably some fine-tuning to do on the object interface.
2011-03-23 11:29:55 -04:00
Brion Vibber
14a6ab2b04
Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins.
2011-03-22 16:50:27 -07:00
Brion Vibber
a12680e8d5
Fix typo in cf45c978
2011-03-22 14:20:21 -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
f81aaa5375
Blend people tags UI into the new theme!
2011-03-22 12:18:12 +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
61960d3668
Add pending members list to group navigation, if group has joins moderated or if it has pending requests open
2011-03-21 17:23:13 -07:00
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
a54eb0941e
Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way.
2011-03-21 15:05:36 -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
Brion Vibber
089c10d5d8
get_class -> class_exists for class loading hack (fixme for 1.0: make sure all these classes are in own files)
2011-03-21 11:43:02 -07:00
Evan Prodromou
0a71622aa7
Widget automatically delegates unimplemented methods to attribute
2011-03-21 11:09:16 -04:00
Zach Copley
fc0ed76ebd
Remove stray get_class() call
2011-03-20 19:37:25 -07:00
Brion Vibber
1fdc72f595
Merge branch '0.9.x'
2011-03-18 14:11:27 -07:00
Brion Vibber
df4afee86c
Tickets #1610 , #1949 : show permalinks on Popular Notices, attachments aside sections
...
These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.
2011-03-18 14:09:41 -07:00
Brion Vibber
4874ab0e7d
Tickets #1610 , #1949 : show permalinks on Popular Notices, attachments aside sections
...
These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.
2011-03-18 13:58:13 -07:00
Siebrand Mazeland
a4e334a0ba
Translator documentation added/updated.
...
i18n updates.
Superfluous whitespace removed.
2011-03-18 18:03:41 +01:00
Siebrand Mazeland
cf45c978d9
Fixed issues with plural handling.
...
L10n/I18n updates.
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 17:59:51 +01:00
Brion Vibber
90a7631592
Caching for conversation root lookup, some logic fixes in threaded view
2011-03-17 17:36:53 -07:00
Brion Vibber
0c2c73659c
Use cached sources for favorites & repeats info on threaded notice lists
2011-03-17 17:06:04 -07:00
Brion Vibber
4afa3caae3
ajax load for additional inline replies; /replies variant of conversationview
2011-03-17 16:27:42 -07:00
Brion Vibber
94ecfc3fcd
Initial use of inline reply area for marking repeats...
2011-03-17 15:17:45 -07:00
Brion Vibber
c70fdef368
Merge branch 'faves' into 1.0.x
2011-03-17 14:48:14 -07:00
Brion Vibber
ed6d5c6e7a
Initial inline listing of favoriters
2011-03-17 14:19:03 -07:00
Brion Vibber
58d39153c6
Favored lists in progress: 'foo, bar and baz'
2011-03-17 13:51:55 -07:00
Brion Vibber
6c236ab0ff
work in progress
2011-03-17 13:25:20 -07:00