Commit Graph

9126 Commits

Author SHA1 Message Date
Rasmus Lerdorf
086d517b87 Fix a few typos 2010-03-04 23:30:04 -05:00
Dave Hall
dbe6b979d7 implement mail headers 2010-03-04 23:10:27 -05:00
Zach Copley
b8001ea107 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-05 03:56:04 +00:00
Zach Copley
e3c4b0c85d A better way to safely delete Foreign_links 2010-03-05 03:55:56 +00:00
Zach Copley
6aac7cc6cd Fix for errant deletion of all Twitter foreign_links 2010-03-05 03:55:39 +00:00
Zach Copley
6a377a4ba4 A better way to safely delete Foreign_links 2010-03-05 03:14:40 +00:00
Zach Copley
029b8c9014 Fix for errant deletion of all Twitter foreign_links 2010-03-05 02:27:01 +00:00
Brion Vibber
064c45890f fix ver ref in upgrade instructions 2010-03-04 14:45:55 -08:00
Brion Vibber
2f41e93339 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-04 14:44:38 -08:00
Zach Copley
980d1a66ec Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  Updated note on geo location and added a note on user roles
  Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.)
2010-03-04 11:19:02 -08:00
Zach Copley
fc3b53853f Make indenting consistent in README 2010-03-04 11:18:30 -08:00
Siebrand Mazeland
3060bdafc5 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Added Breton.

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-04 20:16:30 +01:00
Sarven Capadisli
be4b482f13 Updated note on geo location and added a note on user roles 2010-03-04 14:11:18 -05:00
Siebrand Mazeland
5dbcc184c9 Add Breton to language.php 2010-03-04 20:04:44 +01:00
Brion Vibber
16e2399885 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 11:01:09 -08:00
Siebrand Mazeland
0bb06261d9 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-04 20:00:40 +01:00
Brion Vibber
89833ce1ff Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.) 2010-03-04 11:00:02 -08:00
Zach Copley
e6f379f8a3 Normalize whitespace in the README -- all tabs to (4) spaces 2010-03-04 10:57:35 -08:00
Evan Prodromou
96c06dd75d note betas are obsolete now 2010-03-04 13:56:02 -05:00
Evan Prodromou
292ff3a6ee Merge commit 'gitorious/testing' into testing 2010-03-04 13:53:13 -05:00
Zach Copley
7d1ba4ff3b Remove reference to $config['profile']['banned'] -- superceded by blacklist 2010-03-04 10:48:37 -08:00
Evan Prodromou
1e55266afa Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:46:05 -05:00
Evan Prodromou
1b49e9d278 banned no longer supported 2010-03-04 13:45:31 -05:00
Sarven Capadisli
0736493f46 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:43:49 -05:00
Sarven Capadisli
a4ec64ff45 Slight right alignment for remote button in minilists 2010-03-04 13:43:28 -05:00
Brion Vibber
4d3f90ed19 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 10:41:25 -08:00
Brion Vibber
22c06337a0 updates to queue info in readme 2010-03-04 10:41:07 -08:00
Zach Copley
53f390a074 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  some more editorial on README
  Increased admin navigation width to handle longer text length
2010-03-04 10:34:46 -08:00
Evan Prodromou
c9b6f4d6a6 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:34:13 -05:00
Zach Copley
8242dba179 Fix link to StatusNet bug tracker in README 2010-03-04 10:34:12 -08:00
Evan Prodromou
b98fcffcd2 some more editorial on README 2010-03-04 13:34:05 -05:00
Sarven Capadisli
fadeb6725f Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:32:25 -05:00
Sarven Capadisli
36d86463e4 Increased admin navigation width to handle longer text length 2010-03-04 13:31:49 -05:00
Evan Prodromou
ffbf821809 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:29:41 -05:00
Evan Prodromou
5bd89d92b1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:29:25 -05:00
Evan Prodromou
938c5954fb add blacklist and throttle plugin notes 2010-03-04 13:29:09 -05:00
Sarven Capadisli
9cedb154b4 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:28:53 -05:00
Sarven Capadisli
15aaae67d6 Another update to admin navigation alignment 2010-03-04 13:28:26 -05:00
Brion Vibber
e1f0d9ff39 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 10:24:42 -08:00
Evan Prodromou
1f15e52483 change lede so it doesn't talk about Laconica 2010-03-04 13:24:29 -05:00
Evan Prodromou
80b58db172 change 'mublog' to 'statusnet' in README 2010-03-04 13:22:45 -05:00
Evan Prodromou
bf0e29b465 change lacuser/lacpassword to statusnet-like ones 2010-03-04 13:21:11 -05:00
Brion Vibber
7bd0b8e17e Pull latest .po files from 0.9.x to testing 2010-03-04 10:20:10 -08:00
Evan Prodromou
f7f7f167d6 update version number 2010-03-04 13:18:41 -05:00
Evan Prodromou
046e2b7dc7 change URLs and versions in README 2010-03-04 13:17:48 -05:00
Brion Vibber
f969d6349c Merge branch 'testing' into 0.9.x
Conflicts:
	db/08to09.sql
2010-03-04 10:16:59 -08:00
Evan Prodromou
b720c7554b Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:05:21 -05:00
Evan Prodromou
26f78f5777 change changelog and version 2010-03-04 13:04:22 -05:00
Brion Vibber
a3cb285da8 Add link to http://status.net/wiki/Getting_started on installer success screen. 2010-03-04 09:51:44 -08:00
Sarven Capadisli
bc6a77f334 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 12:51:18 -05:00