Evan Prodromou
f519858044
Merge branch '1.0.x' into 1.1.x
...
Conflicts:
lib/framework.php
2011-11-16 12:00:13 -05:00
Evan Prodromou
68676ad31d
Merge branch '1.0.x'
2011-11-16 11:56:32 -05:00
Evan Prodromou
e2c65d72ae
Merge branch 'master', remote-tracking branch 'origin'
2011-11-16 11:56:02 -05:00
Siebrand Mazeland
b4ecb24907
Localisation updates from http://translatewiki.net .
2011-11-12 23:35:01 +01: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
0b69efe6f8
mismatched \n in ja translation file
2011-11-07 12:39:42 -05:00
Evan Prodromou
b5e1cf13e6
Merge branch '1.0.x'
2011-11-07 12:36:52 -05:00
Siebrand Mazeland
c2db2483a0
Remove trailing whitespace in UI text.
2011-10-29 14:34:50 +02:00
Siebrand Mazeland
151ff6beb7
Localisation updates from http://translatewiki.net .
2011-10-29 14:30:42 +02:00
Evan Prodromou
a4ec8bb047
More free email domains
2011-10-25 10:00:19 -04:00
Evan Prodromou
cb819f28cb
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-10-25 09:42:16 -04:00
Evan Prodromou
ec20544baf
More free or consumer email domains
2011-10-25 09:42:02 -04:00
Evan Prodromou
6793616521
Success exit from settag.php if desired state already exists
...
If you're adding a tag that already exists, or deleting a tag that
doesn't exist, using settag.php, the exit value is 0 instead of
previous -1. This makes scripting around tags a wee bit easier.
2011-10-24 20:13:10 -04:00
Evan Prodromou
499e7d7c41
Squashed commit of the following:
...
commit 74c5e4cce42ae601c07b447e100f097c15ebf9d2
Author: Evan Prodromou <evan@status.net>
Date: Thu Oct 20 12:48:52 2011 -0400
Add back in some optimization indices lost in schema conversion
commit ef5c2acfcd123b25910a1c8bb4ae01a3f9608e5e
Author: Evan Prodromou <evan@status.net>
Date: Thu Oct 20 12:29:57 2011 -0400
restore some of the lost optimized indices on notice table
2011-10-20 12:50:39 -04:00
Evan Prodromou
053e99733f
add rel=nofollow to bookmark links if needed
2011-10-20 11:47:44 -04:00
Evan Prodromou
e64ae1f03d
Don't start <p> element until we've checked for attachments
2011-10-20 10:57:58 -04:00
Evan Prodromou
ba3f6b2db9
Merge branch '1.0.x'
2011-10-20 10:54:41 -04:00
Evan Prodromou
b8079549ce
Include the current profile in popular notice section for all
2011-10-20 10:54:33 -04:00
Evan Prodromou
1b916fe36b
remove unused Popularity class; use PopularNoticeStream instead
2011-10-20 10:43:11 -04:00
Evan Prodromou
6a6ac58faf
remove unused Popularity class; use PopularNoticeStream instead
2011-10-20 10:42:54 -04:00
Evan Prodromou
a294ccb96b
Merge branch '1.0.x'
2011-10-20 10:41:21 -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
9f2fa37ea9
Merge branch '1.0.x'
2011-10-16 04:44:59 -04:00
Evan Prodromou
b42cc773ed
Script to move a statusnetwork from one db server to another
...
This script helps move a statusnetwork from one DB server to
another. It's for use with multi-site installations (like status.net).
2011-10-16 04:44:08 -04:00
Evan Prodromou
d27b7627a5
more robust handling of bad data in offline backup queue handler
2011-10-12 17:03:56 -04:00
Evan Prodromou
e78d84556e
more robust handling of bad data in offline backup queue handler
2011-10-12 17:03:43 -04:00
Evan Prodromou
bb874b62b7
add a \n for japanese email
2011-10-12 16:16:42 -04:00
Evan Prodromou
5b2a85303a
add a \n for japanese email
2011-10-12 16:15:55 -04:00
Siebrand Mazeland
6120af3901
Localisation updates from http://translatewiki.net .
2011-10-10 15:58:00 +02:00
Siebrand Mazeland
7602f605d5
Remove unneeded trailing space.
2011-10-10 15:06:39 +02:00
Siebrand Mazeland
436068dc0d
Use getBestName() instead of nickname per FIXMEs.
...
Update translator documentation.
2011-10-10 15:05:43 +02:00
Evan Prodromou
70827f3379
write all activity files to the feed file
2011-10-07 14:37:09 -04:00
Evan Prodromou
7075214589
dump out activities to directory
2011-10-07 13:56:47 -04:00
Evan Prodromou
43128e5da5
Move GROUPS_PER_PAGE to lib/framework
2011-10-07 13:52:38 -04:00
Evan Prodromou
7f4b23b8ed
Use string output
2011-10-07 10:30:22 -04:00
Evan Prodromou
0d35673d5a
add version for OfflineBackup
2011-10-07 10:01:44 -04:00
Evan Prodromou
737e23544a
send backup files
2011-10-07 09:36:52 -04:00
Evan Prodromou
d92acda02a
start doing some writing
2011-10-06 17:31:50 -04:00
Evan Prodromou
d37bc805c6
first pass, some files ready
2011-10-05 12:05:05 -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
Evan Prodromou
d852e871f5
Merge branch 'master' into 1.0.x
2011-10-03 09:32:24 -04:00
Evan Prodromou
c9d635b675
Fix hand-made trim in getPath() with ltrim (duh)
2011-10-03 09:26:42 -04:00
Evan Prodromou
6145df6670
trim initial '/' from paths
2011-10-03 09:15:53 -04:00
Evan Prodromou
2930484d4f
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-10-03 09:14:17 -04:00
Evan Prodromou
c85abebc36
Remove missing twittersettings page from subscriptions helper
2011-10-03 09:13:54 -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