Commit Graph

6186 Commits

Author SHA1 Message Date
Evan Prodromou
7ae10c27b0 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	lib/util.php
2009-11-10 14:26:49 -05:00
Evan Prodromou
8d5c2b3129 fixup output of object attributes in db error code 2009-11-10 14:06:30 -05:00
Brion Vibber
737fe76347 Performance fix for subscription/subscriber lists based on feedback from ops.
Extended subscription table indexes for subscriber and subscribed to include the created field, which is used to sort for display. This lets us skip a filesort and do the join much more efficiently.
Alter table from 08to09.sql needs to be run manually (though no ill effects if you forget other than not getting the perf improvement).
2009-11-10 08:47:54 -08:00
Brion Vibber
9d0687b055 Adjusting indexes to make favorites query more efficient, based on feedback from ops.
fave_user_id_idx index changed from (user_id) to (user_id,modified), so the timestamp ordering can be done straight from the index while we're looking up the user's notices.
Added to 08to09.sql and 08to09_pg.sql; may need to be run manually by folks doing development.
(No harm if you don't update it, the favorites tab/rss feed will just stay inefficent.)
2009-11-10 08:23:24 -08:00
Brion Vibber
486dbe6aef Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
Notice: Undefined index: p in /Library/WebServer/Documents/mublog/lib/common.php on line 41

This reverts commit 223fee2ad1.
2009-11-10 07:57:58 -08:00
Brion Vibber
333c376c95 Merge remote branch 'statusnet/0.9.x' into 0.9.x 2009-11-10 06:44:53 -08:00
Sarven Capadisli
069d3f2b2f Added hook for the Group navigation items 2009-11-10 13:52:47 +00:00
Sarven Capadisli
91da72ede0 Updated block @title text (shouldn't say from group) 2009-11-10 13:09:15 +00:00
Sarven Capadisli
2f3e414cd1 Updated group block markup 2009-11-10 13:08:58 +00:00
Brenda Wallace
223fee2ad1 just sent a http 200 for the check-fancy from install.php 2009-11-10 15:53:07 +13:00
Craig Andrews
3be1205714 Add a new event: CanUserChangeField 2009-11-09 17:43:37 -05:00
Brion Vibber
088081675f Revert "Remove more contractions"
This reverts commit 5ab709b739.

Missed this one yesterday...
2009-11-09 20:01:46 +01:00
Evan Prodromou
22310d17a4 shorten flag notification and include a class 2009-11-09 13:45:10 -05:00
Evan Prodromou
4845aefa69 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-09 13:42:19 -05:00
Sarven Capadisli
2577c85a38 Added flag icon for UserFlag plugin 2009-11-09 11:11:06 +00:00
Sarven Capadisli
ff81384ee3 Fixed notice option alignment in IE 2009-11-09 11:10:24 +00:00
Evan Prodromou
aa0d9a8615 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 21:23:25 -05:00
Evan Prodromou
f086dddf43 add a method to Theme class to list available themes 2009-11-08 21:18:57 -05:00
Sarven Capadisli
8e58f24173 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 23:10:34 +00:00
Sarven Capadisli
2a0a363e1d Updated Realtime plugin to use the util's NoticeReply object 2009-11-08 23:06:25 +00:00
Siebrand Mazeland
b78a35ec73 Localisation updates from translatewiki.net (2009-11-08) 2009-11-09 00:00:57 +01:00
Siebrand Mazeland
c4f28a2d36 Update pot again 2009-11-08 23:52:01 +01:00
Siebrand Mazeland
ccdabf4446 Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find. 2009-11-08 23:50:12 +01:00
Siebrand Mazeland
2b16baa76a Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:36:53 +01:00
Brion Vibber
2917fad209 Revert "More precise field label"
This reverts commit 6483fbd8fa.

"SMS address" header here makes no sense; it would be inconsistent with the other tabs and headings on the same and related pages, and would look very awkward with another giant "SMS" right above it
2009-11-08 23:35:12 +01:00
Siebrand Mazeland
b10f362ede Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:33:58 +01:00
Siebrand Mazeland
5ab709b739 Remove more contractions
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
Brion Vibber
fc5002015b Revert "* [Cc]an't -> [Cc]annot"
This reverts commit 0ab17f382b.
2009-11-08 23:28:51 +01:00
Brion Vibber
ec6a38a627 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 23:27:24 +01:00
Brion Vibber
c7961fe6dc Revert "More specifics on 'address'"
This reverts commit 1872d07602.

"instant messages address" is very awkward phrasing; prefer not to be changing UI in such ways while updating localisations.
2009-11-08 23:26:16 +01:00
Siebrand Mazeland
104a47e4a2 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:22:50 +01:00
Siebrand Mazeland
0ab17f382b * [Cc]an't -> [Cc]annot
* [Cc]ould't -> [Cc]ould not
2009-11-08 23:22:38 +01:00
Brion Vibber
a034fb0b82 Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
This reverts commit 81b4a381d9.
IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations.
2009-11-08 23:22:13 +01:00
Evan Prodromou
cbae1b0c8b add utilities for calculating local and installation theme root dirs 2009-11-08 17:16:50 -05:00
Siebrand Mazeland
221b779e88 Harmonise UI message "No such user." 2009-11-08 23:10:44 +01:00
Evan Prodromou
111f6a775d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 17:06:41 -05:00
Evan Prodromou
b7e2e3fd2b Restructure theme.php to define a class Theme
For various reasons, it's nicer to have a class for theme-file paths
and such. So, I've rewritten the code for determining the locations of
theme files to be more OOPy.

I changed all the uses of the two functions in the module (theme_file
and theme_path) to use Theme::file and Theme::path respectively.

I've also removed the code in common.php that require's the module;
using a class means we can autoload it instead.
2009-11-08 17:04:46 -05:00
Siebrand Mazeland
da444f8a15 Remove unused message 2009-11-08 22:46:30 +01:00
Siebrand Mazeland
43132eb55e Several updates to UI messages 2009-11-08 22:45:18 +01:00
Siebrand Mazeland
c10e390395 Remove unused message 2009-11-08 22:41:11 +01:00
Siebrand Mazeland
99ebb56529 !. => ! 2009-11-08 22:39:02 +01:00
Siebrand Mazeland
1872d07602 More specifics on 'address' 2009-11-08 22:37:09 +01:00
Siebrand Mazeland
6483fbd8fa More precise field label 2009-11-08 22:34:52 +01:00
Siebrand Mazeland
99a3c3abd2 Remove unused message from pot 2009-11-08 22:29:09 +01:00
Siebrand Mazeland
81b4a381d9 * check usage of 'people' in UI and change it to 'users' or something else in most places
* change some contractions to full text in UI messages
2009-11-08 22:26:13 +01:00
Sarven Capadisli
9f9ae8c10b entity_action responses look more inactive now 2009-11-08 20:53:11 +00:00
Sarven Capadisli
2a8b6c49a1 Minor alignment 2009-11-08 20:47:24 +00:00
Sarven Capadisli
cb1013fa59 Fixed Flagged for review view 2009-11-08 20:31:53 +00:00
Sarven Capadisli
dc6b2d3ac8 Fixed subscribe button styles 2009-11-08 20:31:29 +00:00
Sarven Capadisli
c2e6673b17 Changed icons file to gif because of colour correction. Reduced file
size also
2009-11-08 20:18:39 +00:00