GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
3,387 Commits 8 Branches 4 Tags 310 MiB
149fa14bd4
Commit Graph

1398 Commits

Author SHA1 Message Date
Adrian Lang
d2521786f0 Cancel -> Reject in remote subscribe 2009-01-26 14:20:19 +01:00
Evan Prodromou
0e9cdf5859 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-26 14:14:49 +01:00
Evan Prodromou
3e0e7ddb2c Make the newmessage page better with new framework 2009-01-26 14:05:59 +01:00
Evan Prodromou
80e04a8d9f Show a new message form on message/new 2009-01-26 13:46:04 +01:00
Zach Copley
55a4fac6a6 trac750 Better permissions workflow and styling hooks 2009-01-26 06:31:25 +00:00
Robin Millette
89a668344f added group rss action 2009-01-25 19:16:19 +00:00
Evan Prodromou
f06d5eff10 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-25 18:07:55 +01:00
Zach Copley
688d38b101 Fixed broken SQL for people tags view 2009-01-25 02:03:49 -08:00
Evan Prodromou
0d34cd24ab Update notice deletion 
Changed the errors in notice deletion so it now works. Also,
consistently delete records from related tables that refer
to the notice.
 2009-01-24 19:38:40 +01:00
Evan Prodromou
1f4edd70cb whitespace in deletenotice.php 2009-01-24 19:12:47 +01:00
Evan Prodromou
4c9f3297f2 fix title on replies 2009-01-24 18:28:47 +01:00
Zach Copley
40928cd27a Wow, let's try this once more. peopletag.php should be converted to new uiredesign now 2009-01-24 03:21:39 -08:00
Zach Copley
25de8fa06d Okay, let's try that again. uiconversion of peopletag.php 2009-01-24 03:06:46 -08:00
Zach Copley
7a45489f09 converted peopletag.php to new uiredesign; css still looks bad 2009-01-24 02:44:32 -08:00
Evan Prodromou
a611408dca Revert "try to fix groups with a new qry" 
This reverts commit 8f19855cd0.
 2009-01-24 11:05:38 +01:00
Evan Prodromou
8f19855cd0 try to fix groups with a new qry 2009-01-24 10:53:28 +01:00
sarven
8e4f985e45 Minor 2009-01-24 03:45:44 +00:00
sarven
08030196ca new group markup in usergroups matching groups 2009-01-24 03:23:40 +00:00
sarven
0cdaf3e155 Invitation markup and style 2009-01-24 03:18:34 +00:00
sarven
4980f654a8 Notice search markup and style 2009-01-24 03:14:27 +00:00
sarven
18eb40c988 Search form markup and style 2009-01-24 00:58:12 +00:00
sarven
7fa5e22438 Twitter settings styles 2009-01-23 11:42:38 +00:00
sarven
1e5ad33f72 Matching it to avatar layout 2009-01-23 10:47:11 +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
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
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
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
Evan Prodromou
0a81b94a92 Doc comment in showgroup 2009-01-22 01:50:39 -05:00
sarven
a330bdac62 Moved nudge response from util.php to nudge.php 
Adjusted some CSS
 2009-01-22 06:33:38 +00:00
Robin Millette
c20d0612bf uiredesign + phpdocs 2009-01-22 06:02:23 +00:00
Robin Millette
c474209f35 uiredesign + phpdocs 2009-01-22 05:28:09 +00:00
Robin Millette
2272b4ab1d uiredesign + phpdocs 2009-01-22 05:24:32 +00:00
Robin Millette
c31e77e4bc uiredesign + phpdocs 2009-01-22 05:20:29 +00:00
Robin Millette
05754da7bc uiredesign + phpdocs 2009-01-22 05:14:06 +00:00
Robin Millette
02cbcc1b0f uiredesign + phpdocs 2009-01-22 05:11:19 +00:00
Robin Millette
f06c5f7873 Merge branch 'master' of /var/www/trunk 2009-01-22 05:08:28 +00:00
Robin Millette
e38f6165b6 uiredesign + phpdocs 2009-01-22 05:08:18 +00:00
Zach Copley
570a7c64b1 Merge branch 'master' of /var/www/trunk 2009-01-22 04:26:57 +00:00
Zach Copley
1a941d03fd Added some CSS classes for styling doc pages differently 2009-01-22 04:26:15 +00:00
sarven
07b52e19be Minor cleanup for future groups_related 2009-01-22 00:12:16 +00:00
sarven
a57f12b06c selector name cleanup 2009-01-22 00:04:13 +00:00
sarven
d72706ce9d Changed to @class entity_profile from @id user_profile. 2009-01-21 23:33:52 +00:00
sarven
4b42c35269 General markup and style cleanup 2009-01-21 22:44:27 +00:00
sarven
41f74218f2 Profile avatar settings 2009-01-21 20:33:37 +00:00
sarven
ac1cc954ae form_password markup and style 2009-01-21 19:56:18 +00:00
sarven
0b0f25ce93 Public tagcloud and tag cloud styles 2009-01-21 18:35:45 +00:00
Evan Prodromou
3260106537 list of groups to profile page 2009-01-21 13:33:06 -05:00
Evan Prodromou
f980089dd4 change showgroup to use profileminillist 2009-01-21 13:12:26 -05:00
Evan Prodromou
ed9cb94ff3 fix sub/unsub buttons, profileminilist for sections 2009-01-21 13:03:33 -05:00
Evan Prodromou
26bc168c93 An action for showing groups a user is in 2009-01-21 12:19:47 -05:00
Evan Prodromou
0824bb2e1d Merge branch 'master' into groups 2009-01-21 11:52:06 -05:00
Evan Prodromou
4491e82762 Add actions for joining or leaving a group, and fixup JS to match 2009-01-21 11:47:23 -05:00
Evan Prodromou
dcf973ab46 fix edit group prepare, check for admin 2009-01-21 10:20:13 -05:00
Evan Prodromou
57a9e33b3c Add members mini-icons to group page 2009-01-21 10:15:48 -05:00
Evan Prodromou
79db73d4ac remove admin link from group page 2009-01-21 09:57:58 -05:00
Evan Prodromou
1499a5e048 Add tabset to group and admin tabs 2009-01-21 09:55:44 -05:00
Evan Prodromou
5d162aeaef Show members of a group 2009-01-21 09:52:21 -05:00
Evan Prodromou
7076cda746 add edit group action 2009-01-21 09:06:40 -05:00
Evan Prodromou
9dafcce015 add new group action 2009-01-21 09:06:18 -05:00
Evan Prodromou
056649c331 Mark showgroup as readonly action 2009-01-21 09:04:54 -05:00
Evan Prodromou
a7ea08b73a Add group by id for group permalinks 2009-01-21 02:55:55 -05:00
Evan Prodromou
ee4e87f318 Move showgroup action to Group category 2009-01-21 02:55:37 -05:00
Evan Prodromou
26652e92f2 First pass at a group home page 
This is the first pass at a group home page.
 2009-01-21 02:22:10 -05:00
sarven
92e2f3babc Added @title to user_action inputs and anchor and form legends 2009-01-21 07:14:43 +00:00
sarven
27b627c094 Made user_actions styles more consistent 2009-01-21 06:54:17 +00:00
sarven
f90bd303af Merge branch 'master' of ../trunk 2009-01-21 06:32:49 +00:00
sarven
6c78421298 Moved common_profile_new_message_nudge() to showstream.php 2009-01-21 06:31:53 +00:00
Zach Copley
047c87d1cc Converted DeleteAction and DeletenoticeAction to new uiredesign zeitgeist 2009-01-20 22:20:17 -08:00
sarven
f76b565c16 Merge branch 'master' of ../trunk 2009-01-21 05:26:56 +00:00
sarven
db4993970e (Un)subscribe AJAX forms 2009-01-21 04:08:05 +00:00
Evan Prodromou
724abe9ea9 Remove "finishimmediate" action 2009-01-21 03:59:47 +00:00
Evan Prodromou
afde3c62d8 Remove deleteprofile.php 2009-01-21 03:59:30 +00:00
Zach Copley
d6da9779f7 Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk 2009-01-20 19:18:02 -08:00
Zach Copley
61850ceb55 Converted ShowmessageAction to work with new uiredesign 2009-01-20 19:16:52 -08:00
sarven
e9b9795eeb (dis)favor form method call fix 2009-01-21 02:52:16 +00:00
Zach Copley
624ca93c9d Converted direct messaging actions to new uiredesign 2009-01-20 17:49:47 -08:00
sarven
f51984175a Matching markup for tags 2009-01-21 01:22:08 +00:00
Robin Millette
560374e170 uiredesign + phpdocs 2009-01-21 00:07:15 +00:00
Robin Millette
592403cdc3 uiredesign + phpdocs 2009-01-21 00:06:56 +00:00
sarven
1ab0de3ddd If user has fn, then it will not link to their own profile with @class 
'fn'. Only put @class 'fn' on the anchor if there is no fn.
 2009-01-20 23:50:52 +00:00
sarven
bb4a6a514b user_actions form markup and styling 2009-01-20 22:36:57 +00:00
Robin Millette
1cf469e244 uiredesign + phpdocs 2009-01-20 21:31:56 +00:00
Robin Millette
cadad55379 uiredesign + phpdocs 2009-01-20 21:21:00 +00:00
Robin Millette
6e6d651b25 uiredesign + phpdocs. 2009-01-20 21:05:55 +00:00
Robin Millette
4471f62bc5 uiredesign + phpdocs 2009-01-20 20:55:16 +00:00
Robin Millette
1526432842 tiny phpdoc fixes 2009-01-20 20:44:03 +00:00
Robin Millette
5abdf8aae1 Merge branch 'master' of /var/www/trunk 2009-01-20 20:38:05 +00:00
Robin Millette
f93575bd46 uiredesign and phpdocs 2009-01-20 20:29:31 +00:00
sarven
96dc058bfa Using nickname only for uid 2009-01-20 05:58:35 +00:00
sarven
27308afe85 Added mark_hash for content (i.e., to indicate tags with the 
character '#')
 2009-01-20 05:11:45 +00:00
sarven
918bd84c0d Removed extra div 2009-01-20 05:06:46 +00:00