Zach Copley
|
d06a929d70
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 09:47:09 +00:00 |
|
Zach Copley
|
ef3f47b8f5
|
trac750 Better styling for the Facebook profile box widget
|
2009-01-23 09:46:29 +00:00 |
|
Evan Prodromou
|
11cb85820d
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 10:37:27 +01:00 |
|
Evan Prodromou
|
e566b8929b
|
These aren't readonly
|
2009-01-23 10:37:04 +01:00 |
|
Evan Prodromou
|
32c9c03cdc
|
remove top posters from public
|
2009-01-23 10:36:16 +01:00 |
|
Zach Copley
|
0ef33663ce
|
Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk
|
2009-01-23 01:20:00 -08:00 |
|
Zach Copley
|
b13374faa5
|
Bring the Twitter compatible API inline with new uiredesign stuff
|
2009-01-23 01:19:19 -08:00 |
|
Robin Millette
|
6b5fb0ab7d
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 09:16:00 +00:00 |
|
Robin Millette
|
4c7f3faf92
|
mark nudge action read-only
|
2009-01-23 09:15:57 +00:00 |
|
Robin Millette
|
0f6bc2190a
|
mark a bunch of actions read-only
|
2009-01-23 09:15:15 +00:00 |
|
sarven
|
bdbdc67957
|
Merge branch 'master' of ../trunk
|
2009-01-23 08:59:54 +00:00 |
|
sarven
|
927576e3f0
|
Using openidlogin instead of openid in order to show the current local
nav item
|
2009-01-23 08:58:54 +00:00 |
|
Evan Prodromou
|
25ff381486
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 09:52:46 +01:00 |
|
sarven
|
0aa2cb35f1
|
Merge branch 'master' of ../trunk
|
2009-01-23 08:52:24 +00:00 |
|
sarven
|
6c9bbdb561
|
openid markup and style
|
2009-01-23 08:52:04 +00:00 |
|
Evan Prodromou
|
daf32e43cd
|
usergroups is read only
|
2009-01-23 09:51:10 +01:00 |
|
Evan Prodromou
|
cdd2032540
|
groups are readonly
|
2009-01-23 09:49:38 +01:00 |
|
Evan Prodromou
|
5f89b88650
|
showstream is readonly
|
2009-01-23 09:45:48 +01:00 |
|
Evan Prodromou
|
9c5ab86d0e
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 09:43:41 +01:00 |
|
Zach Copley
|
1305ecf4bd
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 08:43:34 +00:00 |
|
Zach Copley
|
76cf3cc3d0
|
trac750 Fixed bad url that made the 'skip' step when adding status_update permission fail
|
2009-01-23 08:42:40 +00:00 |
|
Evan Prodromou
|
ad929011a3
|
public is readonly
|
2009-01-23 09:42:23 +01:00 |
|
Evan Prodromou
|
be21ed13b5
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 09:32:05 +01:00 |
|
sarven
|
843358be44
|
Merge branch 'master' of ../trunk
|
2009-01-23 08:19:16 +00:00 |
|
sarven
|
50b9f5f6c5
|
Minor
|
2009-01-23 08:19:00 +00:00 |
|
Evan Prodromou
|
4e5be119d3
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 09:17:51 +01:00 |
|
Zach Copley
|
85321cede0
|
Fix for Twitter bridge bug introduced by uiredesign merge
|
2009-01-23 00:11:05 -08:00 |
|
Evan Prodromou
|
e7d5310a2f
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 09:01:06 +01:00 |
|
Evan Prodromou
|
a7c85bebd5
|
Merge branch 'master' of /var/www/mublog
Conflicts:
actions/api.php
actions/deletenotice.php
actions/recoverpassword.php
actions/remotesubscribe.php
actions/tag.php
actions/tagrss.php
actions/twitapiaccount.php
actions/twitapiusers.php
classes/Notice.php
classes/User.php
lib/common.php
lib/language.php
lib/subs.php
lib/twitterapi.php
lib/util.php
scripts/inbox_users.php
scripts/update_translations.php
Merged development trunk into laconica head. woohoo!
|
2009-01-23 08:58:31 +01:00 |
|
Robin Millette
|
aa100884fb
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 07:51:02 +00:00 |
|
Robin Millette
|
965d4db265
|
Group search
|
2009-01-23 07:50:55 +00:00 |
|
Evan Prodromou
|
7aa496cd8a
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 08:23:40 +01:00 |
|
Zach Copley
|
8114676bd4
|
trac750 Let's try that again - fix for base css href
|
2009-01-23 07:22:01 +00:00 |
|
Evan Prodromou
|
750ed7899f
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 08:15:59 +01:00 |
|
Evan Prodromou
|
aadf10cedb
|
Update version number
|
2009-01-23 08:15:40 +01:00 |
|
Evan Prodromou
|
50ec1cc26e
|
Upload logos for groups
|
2009-01-23 08:15:29 +01:00 |
|
Zach Copley
|
78bf361291
|
trac750 fix href for theme stylesheet
|
2009-01-23 07:09:00 +00:00 |
|
sarven
|
493b77b2e1
|
Minor
|
2009-01-23 06:49:14 +00:00 |
|
sarven
|
b84868d059
|
Default stylesheet
|
2009-01-23 06:39:48 +00:00 |
|
Evan Prodromou
|
da5c5499b8
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 06:33:08 +00:00 |
|
Evan Prodromou
|
745885902a
|
Add several more help files
|
2009-01-23 06:32:56 +00:00 |
|
sarven
|
538518ead6
|
Not using thickbox... yet
|
2009-01-23 06:18:00 +00:00 |
|
sarven
|
c97980b145
|
Missing closing li
|
2009-01-23 06:14:56 +00:00 |
|
Zach Copley
|
94b926be65
|
trac750 small fix to FBJS redirect
|
2009-01-23 06:02:41 +00:00 |
|
Zach Copley
|
3af566d1ec
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 05:59:35 +00:00 |
|
Robin Millette
|
171d89aab7
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 05:57:15 +00:00 |
|
Robin Millette
|
fbd1cf4dfa
|
use new error actions classes to display error
|
2009-01-23 05:57:08 +00:00 |
|
Evan Prodromou
|
277a6e984c
|
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
|
2009-01-23 06:47:43 +01:00 |
|
Zach Copley
|
36d55526d3
|
trac750 fix for crash when a user logs in and hasn't already posted a notice
|
2009-01-23 05:47:34 +00:00 |
|
Zach Copley
|
df25b5f5f5
|
Merge branch 'master' of /var/www/trunk
|
2009-01-23 05:37:45 +00:00 |
|