GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
2,941 Commits 8 Branches 4 Tags 310 MiB
04b3add162
Commit Graph

1262 Commits

Author SHA1 Message Date
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
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
750ed7899f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 08:15:59 +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
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
Zach Copley
240231a8bd trac750 linked in stylesheets for login and permissions prompt screens 2009-01-23 05:37:21 +00:00
sarven
d98f8c646a Merge branch 'master' of ../trunk 2009-01-23 05:24:00 +00:00
sarven
500ed2f5eb Cleanup 2009-01-23 05:23:28 +00:00
Evan Prodromou
9dc5d8d0f6 Made avatar upload a two-stage process; first upload, then crop 2009-01-23 06:16:55 +01:00
Robin Millette
c628bbb192 make avatar bigger on single notice pages 2009-01-23 05:11:04 +00:00
Robin Millette
998e6044e5 uiredesign 2009-01-23 04:29:21 +00:00
Robin Millette
e59b8c8758 Merge branch 'master' of /var/www/trunk 2009-01-23 04:10:57 +00:00
Robin Millette
4c58e6b312 uiredesign 2009-01-23 04:10:49 +00:00
sarven
112dd08c62 anon_notice 2009-01-23 04:10:40 +00:00
Robin Millette
3f328256bd uiredesign 2009-01-23 04:07:52 +00:00
Robin Millette
11b99b8144 Merge branch 'master' of /var/www/trunk 2009-01-23 04:03:11 +00:00
Robin Millette
1e1a24d8c1 small bugfix, it's prepare() not initialize() 2009-01-23 04:03:04 +00:00
sarven
961c5af3ce Anonymous notice 2009-01-23 03:47:32 +00:00
Robin Millette
c8b606f17e Merge branch 'master' of /var/www/trunk 2009-01-23 03:32:12 +00:00
Robin Millette
63c5e34bed uiredesign 2009-01-23 03:32:06 +00:00
Evan Prodromou
13bd15b0b5 p -> div for markup wrapper 2009-01-23 04:31:50 +01:00
Evan Prodromou
ed09eece28 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 04:21:08 +01:00
Evan Prodromou
3c8f41deb0 Anonymous message for group page 2009-01-23 04:19:03 +01:00
Zach Copley
12d923df11 Merge branch 'master' of /var/www/trunk 2009-01-23 03:16:31 +00:00
Zach Copley
adf77944e8 trac750 Facebook app proper integrated into new uiredesign 2009-01-23 03:16:03 +00:00
Evan Prodromou
b09a58e8dc Add anonymous message for user pages 2009-01-23 04:15:03 +01:00
Evan Prodromou
59e386db45 Add an anonymous message for the public page 2009-01-23 04:06:03 +01:00
Evan Prodromou
ae0f2009d5 Groups list by members 2009-01-23 03:07:03 +01:00
Evan Prodromou
6949cefa7f add groups-by-posts section 2009-01-23 03:03:17 +01:00
Evan Prodromou
8942e3a445 Add an action to show the list of the latest groups 2009-01-23 03:00:51 +01:00
Evan Prodromou
b9b6e491f4 Don't double-define GROUPS_PER_PAGE 2009-01-23 02:57:48 +01:00
Evan Prodromou
0ae4dff237 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 02:25:32 +01:00
Evan Prodromou
673ec133d2 Add a link to add a new group to user groups list 2009-01-23 02:25:09 +01:00
Robin Millette
56622ef804 Merge branch 'master' of /var/www/trunk 2009-01-23 01:22:25 +00:00
Robin Millette
bee32a6cb0 uiredesign 2009-01-23 01:22:17 +00:00
sarven
0711d45ef3 Merge branch 'master' of ../trunk 2009-01-23 01:20:48 +00:00
sarven
135f00c51b tag user profile and form markup and style 2009-01-23 01:20:20 +00:00
Evan Prodromou
9a4333f5f3 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 02:06:45 +01:00
Evan Prodromou
7bbbd433e8 Some whitespace edits in subedit, and tested that it works 2009-01-23 02:04:13 +01:00
Robin Millette
8a65c5175c Merge branch 'master' of /var/www/trunk 2009-01-23 01:01:01 +00:00
Robin Millette
4a4efc3b0a uiredesign 2009-01-23 01:00:57 +00:00
Evan Prodromou
1132e66f84 Fix over-zealous un-underscoring in userauthorization 2009-01-23 01:41:00 +01:00
Evan Prodromou
120ed87e72 Fix start/stop xml in xrds 2009-01-23 01:39:25 +01:00
Evan Prodromou
8228dc7ed5 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 01:35:39 +01:00
Evan Prodromou
0ecfd7a7ec Update userauthorization, strip out a lot of debug stuff 2009-01-23 01:35:05 +01:00
sarven
1200e005b1 Merge branch 'master' of ../trunk 2009-01-23 00:20:23 +00:00
sarven
2935e8c7ce Minor markup fix 2009-01-23 00:20:05 +00:00
Evan Prodromou
c21a2445aa Update remotesubscribe for new system 2009-01-23 01:16:36 +01:00
Evan Prodromou
482dcf625a Updated recoverpassword 2009-01-23 01:00:01 +01:00
Evan Prodromou
c0d7ce8a3c Updated sup 2009-01-23 00:36:24 +01:00
Evan Prodromou
cc5808cc28 Update finishopenidlogin 2009-01-23 00:30:57 +01:00
Evan Prodromou
4fe5bd9cf1 First steps to getting OpenID working again 2009-01-22 23:17:08 +00:00
Evan Prodromou
88891f8ebd Updated foaf file 2009-01-22 23:08:30 +00:00
Evan Prodromou
4d0ff70109 Add attributes for invite 2009-01-22 22:59:18 +00:00
Evan Prodromou
2fe16b39ba Add local nav to invite 2009-01-22 22:53:05 +00:00
Evan Prodromou
03ce6aee2e convert invite 2009-01-22 22:51:37 +00:00
Evan Prodromou
d6879bfe0c Debug some of the subscriptions+tags problems 2009-01-22 22:38:10 +00:00
Evan Prodromou
04d498784f convert tagother action 2009-01-22 22:02:39 +00:00
Evan Prodromou
10241a6d83 Added featured users to public timeline 2009-01-22 21:42:34 +00:00
Evan Prodromou
058f9fa1eb Add group tag cloud to group 2009-01-22 21:15:21 +00:00
Evan Prodromou
4e7192579a Add personal tag cloud 2009-01-22 20:46:37 +00:00
Evan Prodromou
248fd763bd Add groups by notice to public 2009-01-22 20:17:32 +00:00
Evan Prodromou
b6dad052bd Add a popular notices section to the public page 2009-01-22 19:48:35 +00:00
Evan Prodromou
e9b3e4e7a8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 20:10:42 +01:00
Evan Prodromou
94d3a4b22c Add top posters section to public page 2009-01-22 20:08:16 +01:00
Evan Prodromou
55037403c5 Use cached query results for favorited. Might cause pagination issues. 2009-01-22 19:14:18 +01:00
sarven
ead1384650 .profile form.form_subscriptions_edit style 2009-01-22 16:57:37 +00:00
Evan Prodromou
318b81c027 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 17:19:54 +01:00
Evan Prodromou
0df954aa89 Make subscribers work 2009-01-22 17:19:27 +01:00
Evan Prodromou
01e7859a81 Remove common code from Subscriptions, make tags link visible 2009-01-22 17:12:23 +01:00
Evan Prodromou
30dac77caa add nav menu to usergroups 2009-01-22 17:06:38 +01:00
Robin Millette
3db0778914 uiredesign + phpdocs 2009-01-22 15:37:58 +00:00
Robin Millette
b39d4788b9 uiredesign + phpdocs 2009-01-22 15:37:35 +00:00
Robin Millette
dfb21679e2 uiredesign + phpdocs 2009-01-22 15:30:58 +00:00
Robin Millette
cb2e374bc2 uiredesign + phpdocs 2009-01-22 15:20:58 +00:00
Evan Prodromou
a30d405328 Update subscriptions action 2009-01-22 16:12:00 +01:00
Evan Prodromou
a2a2dd88b5 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 12:35:25 +01:00
Evan Prodromou
6a3204d08e Extract image management code to a helper function 2009-01-22 12:35:09 +01:00
Zach Copley
8990aaebb4 New HTTP error message classes for uiredesign 2009-01-22 03:13:11 -08:00
Robin Millette
914b097910 uiredesign + phpdocs 2009-01-22 09:54:08 +00:00
Robin Millette
a1cb64679b uiredesign + phpdocs 2009-01-22 09:39:53 +00:00
Robin Millette
f871f52624 Merge branch 'master' of /var/www/trunk 2009-01-22 08:02:40 +00:00
Robin Millette
e272adb321 fixed a few bugs and logic problems in groups 2009-01-22 08:01:40 +00:00
Evan Prodromou
904d04993c Fix error in prepare() for checking group membership 2009-01-22 01:53:44 -05:00