73b8de7c4c
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
2009-02-09 12:03:45 -05:00
43888b5239
trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown.
2009-02-09 15:35:38 +00:00
c604fa8d37
Ticket #1094 Facebook app invites page was failing if no friends had added the app yet
2009-02-08 23:07:56 +00:00
00fda7ae5f
Minor update to the way Facebook app handles listing of friends you've invited.
2009-02-08 21:58:25 +00:00
dec0461d5f
Trac #1159 : Fix peopletag pagination. Also phpcs cleanup.
2009-02-08 13:25:48 -08:00
6e2f045837
Add machine-readable pagination using HTML4.01 `<link rel="next">`, etc.
...
These extra `<link>` elements only appear on pages where pagination
makes sense. They trigger functionality in some user agents, such as
Opera's Navigation Bar for more easily navigating forward and backwards
across a paged set of notices, messages, or group lists, etc.
2009-02-09 00:02:51 +11:00
c2905085c1
trac #1155 ++ replace strlen with mb_strlen for all utf8 strings.
2009-02-07 19:33:18 +00:00
a3d5e00f64
Merge commit 'upstream/0.7.x' into 0.7.x
...
Conflicts:
actions/showstream.php
2009-02-07 11:02:10 -05:00
d6245dca63
Fixed #1048 : Edit avatar link on profile page.
2009-02-06 18:36:34 -05:00
26053c1868
Make adding and removing an incoming email in SMS settings
...
Fixes Bug#1036.
2009-02-06 15:22:48 -05:00
8ec312043f
Add a link to the group search page from a user's own group list.
...
I've seen a request or two pop up for this on the Laconica group on
Identica, and I'd personally like there to be a link to the search
page from my own groups listing, as I often find myself looking for
one and end up at my browser's address bar.
2009-02-07 04:03:25 +11:00
bb2cb65c2a
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-06 03:56:15 -05:00
fc094e0cf4
fix formatting of new Avatar:: calls
2009-02-06 03:55:53 -05:00
343cd6f205
Move common_avatar_* functions to Avatar
...
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
2009-02-06 03:55:48 -05:00
a6cf3a2fb3
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-06 06:28:14 +00:00
ac23321a40
Added primary and secondary form actions. Fixed markup for
...
form_notice_delete
2009-02-06 06:27:04 +00:00
d51be320ca
Removed debugging statements I accidentally left in deletenotice.php
2009-02-05 16:21:23 -08:00
ab82978b2d
Trac #894 and #1013 - fixed bad redirects after delete notice
2009-02-05 16:16:10 -08:00
8775e79e35
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 16:35:19 -05:00
444c794480
Don't show stretchy-box on avatar if not cropping
2009-02-05 16:34:38 -05:00
99d520b351
Two different functions for file size
...
Made two different functions for file size in ImageFile; one uses the
other.
Also, use sprintf() for gettext msgs.
2009-02-05 16:32:58 -05:00
02eecb4f07
Minor markup consistency
2009-02-05 21:26:06 +00:00
383e6c730d
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
2009-02-05 16:02:19 -05:00
d4bdb2dc19
Better fix for displaying max file size.
2009-02-05 15:01:44 -05:00
746a5d7507
Fixed #905 : Presenting image size limit to user.
2009-02-05 14:11:50 -05:00
9febe8ce39
trac #1142 fix tag rss
2009-02-05 18:10:47 +00:00
7ea136ee1b
Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
...
Conflicts:
actions/avatarsettings.php
2009-02-05 12:04:06 -05:00
68a3139d0b
Fix #81 : Profile and personal shows „you“ instead of username when looking at own profile / personal. While doing so I fixed a wrong gettext usage were the result was not sprintf'd, but concat'd.
2009-02-05 11:53:32 -05:00
43feee783b
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 11:47:47 -05:00
7ad3ff4a2c
Allow re-authentication with OpenID
...
"Rememberme" logins aren't allowed to make changes to an account
(since cookie-stealing is too easy). Users have to re-authenticate.
Previously, it was impossible to do so without having a username and
password; this change lets you do it with OpenID, too.
2009-02-05 11:46:17 -05:00
4ced74dc91
Fixed #1140 ; Login form session token not set.
2009-02-05 10:17:19 -05:00
e5b075b912
Matching Facebook app UI to identi.ca. Fixed tabs, add to profile,
...
widths, font-size, and some HTML markup.
2009-02-05 04:54:42 +00:00
7e975b17c5
Fixed #1134 ; Consolidated image scaling functions.
2009-02-04 19:32:15 -05:00
68152dcf3a
Facebook app - reorganized some stuff; better HTML output
2009-02-04 22:54:07 +00:00
a97f8f6a43
merge from dev/0.7.x
2009-02-04 15:40:36 -05:00
2bd52059db
take out redundant code from login
2009-02-04 15:38:26 -05:00
df41b1307f
Removed erroneous comments referring to old common_notice_form() func
2009-02-04 11:55:22 -08:00
5c880bc6cc
Fix for #1057 ; group logo transparecy (and pixilation)
2009-02-04 14:44:12 -05:00
2d063650ef
Make WebChannel and AjaxWebChannel work
...
These command-output channels were using the old common_element_*
functions. They now take an $out constructor parameter, and use that
for output.
The WebChannel has pretty remedial output; it would be nice if it
output a real formatted page.
2009-02-04 07:59:30 -05:00
92c6034b25
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-04 07:26:14 -05:00
355d438cee
Merge branch '0.7.x' of git://gitorious.org/laconica/meitar into meitar/0.7.x
2009-02-04 07:25:36 -05:00
c16ddd6775
trac1095 Profile page had bad alternate links for RSS and Atom feeds
2009-02-03 16:31:41 -08:00
32b1bb381a
Fixed ajaxErrorMsg(). Using startHTML() instead of common_start_html()
2009-02-03 21:46:09 +00:00
aafb73755e
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-03 15:13:06 -05:00
0356953cf8
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
2009-02-03 15:12:55 -05:00
dcf18e9694
trac1104 Destroy method was dying because it was still calling deprecated common_dequeue_notice() func
2009-02-03 11:23:30 -08:00
01b6aca078
Fix PHP warnings when user avatar crop controls aren'tn touched.
2009-02-04 03:34:17 +11:00
ab16bb876b
Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-02 16:46:51 -05:00
3f0eb90128
removed extraneous argument in startHTML calls
2009-02-02 20:47:57 +00:00
5f004c0158
Added "Edit" entity_action.
...
Updated theme files.
2009-02-02 16:33:47 +00:00
55c99d0018
Using startXML() instead of deprecated common_start_xml()
2009-02-01 23:43:07 +00:00
2f37539967
Fixes #1088 : Show number of group members. Unlike the bugreport requested, the stats are displayed similar to userstream stats in a section in the sidebar. Additionaly, I removed a redundant notnull if check in ShowgroupAction->showMembers, fixed a SQL error in User_group->getMembers when no limit is passed, removed return value storing of void function and added an usage of Profile->getBestName.
2009-02-01 22:24:54 +01:00
153208aaa6
trac750 Add footer to Facebook app's login page
2009-01-30 00:07:56 +00:00
733b3543d0
Put license text inside label to align it with "Remember me" label above it. Improve sentence.
2009-01-29 13:18:10 -08:00
5543cd21c6
Fix problems when crop controls not touched
2009-01-29 14:56:22 -05:00
440d7d17b0
wrong tags in tagother
2009-01-29 08:49:19 -05:00
746880e49e
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-29 08:37:51 -05:00
b6fbb9462c
proper pagination for subs and members
2009-01-29 08:37:40 -05:00
c7d06519f0
trac750 update Facebook status when posting to Identi.ca from Facebook
2009-01-29 05:58:27 +00:00
de47c827b7
better upload of group logos
2009-01-28 23:00:01 -05:00
e37e9c2084
Fix password settings
2009-01-28 08:55:03 -05:00
745f733469
Make favorites RSS actually work (uiredesign)
2009-01-27 15:27:04 -08:00
4a176eadcb
Have "Current verified Twitter account" to use the right CSS class: form_note
2009-01-27 14:51:13 -08:00
a5a1e15cba
trac975 - Fixed title for Twitter settings page (thanks meitar)
2009-01-27 14:35:25 -08:00
f9403ae99a
Keeping HTML consistent throughout the site.
2009-01-27 06:21:36 +00:00
e20c3e2b7c
Entered CC3.0 anchor text
2009-01-27 02:37:41 +00:00
1c60afb940
trac750 140 character countdown for FB app
2009-01-27 01:55:36 +00:00
7953192aa0
fix profile in block form
2009-01-26 17:15:32 +01:00
91e63866fb
move block form
2009-01-26 17:14:08 +01:00
8d95151f7a
fix license link in registration page
2009-01-26 16:57:39 +01:00
f3db32d151
Fix direct addressing of messages
2009-01-26 15:45:54 +01:00
a80a536e41
Fix canonical tags in notice and in URLs
2009-01-26 15:03:38 +01:00
12b9d4346f
Warn not-logged-in users when they try to send a message
2009-01-26 14:29:31 +01:00
d2521786f0
Cancel -> Reject in remote subscribe
2009-01-26 14:20:19 +01:00
0e9cdf5859
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-26 14:14:49 +01:00
3e0e7ddb2c
Make the newmessage page better with new framework
2009-01-26 14:05:59 +01:00
80e04a8d9f
Show a new message form on message/new
2009-01-26 13:46:04 +01:00
55a4fac6a6
trac750 Better permissions workflow and styling hooks
2009-01-26 06:31:25 +00:00
89a668344f
added group rss action
2009-01-25 19:16:19 +00:00
f06d5eff10
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-25 18:07:55 +01:00
688d38b101
Fixed broken SQL for people tags view
2009-01-25 02:03:49 -08:00
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
1f4edd70cb
whitespace in deletenotice.php
2009-01-24 19:12:47 +01:00
4c9f3297f2
fix title on replies
2009-01-24 18:28:47 +01:00
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
25de8fa06d
Okay, let's try that again. uiconversion of peopletag.php
2009-01-24 03:06:46 -08:00
7a45489f09
converted peopletag.php to new uiredesign; css still looks bad
2009-01-24 02:44:32 -08:00
a611408dca
Revert "try to fix groups with a new qry"
...
This reverts commit 8f19855cd0
2009-01-24 11:05:38 +01:00
8f19855cd0
try to fix groups with a new qry
2009-01-24 10:53:28 +01:00
8e4f985e45
Minor
2009-01-24 03:45:44 +00:00
08030196ca
new group markup in usergroups matching groups
2009-01-24 03:23:40 +00:00
0cdaf3e155
Invitation markup and style
2009-01-24 03:18:34 +00:00
4980f654a8
Notice search markup and style
2009-01-24 03:14:27 +00:00
18eb40c988
Search form markup and style
2009-01-24 00:58:12 +00:00
7fa5e22438
Twitter settings styles
2009-01-23 11:42:38 +00:00
1e5ad33f72
Matching it to avatar layout
2009-01-23 10:47:11 +00:00
11cb85820d
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 10:37:27 +01:00
e566b8929b
These aren't readonly
2009-01-23 10:37:04 +01:00
32c9c03cdc
remove top posters from public
2009-01-23 10:36:16 +01:00
0ef33663ce
Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk
2009-01-23 01:20:00 -08:00
b13374faa5
Bring the Twitter compatible API inline with new uiredesign stuff
2009-01-23 01:19:19 -08:00
4c7f3faf92
mark nudge action read-only
2009-01-23 09:15:57 +00:00
0f6bc2190a
mark a bunch of actions read-only
2009-01-23 09:15:15 +00:00
25ff381486
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 09:52:46 +01:00
0aa2cb35f1
Merge branch 'master' of ../trunk
2009-01-23 08:52:24 +00:00
6c9bbdb561
openid markup and style
2009-01-23 08:52:04 +00:00
daf32e43cd
usergroups is read only
2009-01-23 09:51:10 +01:00
cdd2032540
groups are readonly
2009-01-23 09:49:38 +01:00
5f89b88650
showstream is readonly
2009-01-23 09:45:48 +01:00
9c5ab86d0e
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 09:43:41 +01:00
1305ecf4bd
Merge branch 'master' of /var/www/trunk
2009-01-23 08:43:34 +00:00
76cf3cc3d0
trac750 Fixed bad url that made the 'skip' step when adding status_update permission fail
2009-01-23 08:42:40 +00:00
ad929011a3
public is readonly
2009-01-23 09:42:23 +01:00
4e5be119d3
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 09:17:51 +01:00
85321cede0
Fix for Twitter bridge bug introduced by uiredesign merge
2009-01-23 00:11:05 -08:00
e7d5310a2f
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 09:01:06 +01:00
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
aa100884fb
Merge branch 'master' of /var/www/trunk
2009-01-23 07:51:02 +00:00
965d4db265
Group search
2009-01-23 07:50:55 +00:00
750ed7899f
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 08:15:59 +01:00
50ec1cc26e
Upload logos for groups
2009-01-23 08:15:29 +01:00
78bf361291
trac750 fix href for theme stylesheet
2009-01-23 07:09:00 +00:00
c97980b145
Missing closing li
2009-01-23 06:14:56 +00:00
94b926be65
trac750 small fix to FBJS redirect
2009-01-23 06:02:41 +00:00
3af566d1ec
Merge branch 'master' of /var/www/trunk
2009-01-23 05:59:35 +00:00
171d89aab7
Merge branch 'master' of /var/www/trunk
2009-01-23 05:57:15 +00:00
fbd1cf4dfa
use new error actions classes to display error
2009-01-23 05:57:08 +00:00
277a6e984c
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 06:47:43 +01:00
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
df25b5f5f5
Merge branch 'master' of /var/www/trunk
2009-01-23 05:37:45 +00:00
240231a8bd
trac750 linked in stylesheets for login and permissions prompt screens
2009-01-23 05:37:21 +00:00
d98f8c646a
Merge branch 'master' of ../trunk
2009-01-23 05:24:00 +00:00
500ed2f5eb
Cleanup
2009-01-23 05:23:28 +00:00
9dc5d8d0f6
Made avatar upload a two-stage process; first upload, then crop
2009-01-23 06:16:55 +01:00
c628bbb192
make avatar bigger on single notice pages
2009-01-23 05:11:04 +00:00
998e6044e5
uiredesign
2009-01-23 04:29:21 +00:00
e59b8c8758
Merge branch 'master' of /var/www/trunk
2009-01-23 04:10:57 +00:00
4c58e6b312
uiredesign
2009-01-23 04:10:49 +00:00
112dd08c62
anon_notice
2009-01-23 04:10:40 +00:00
3f328256bd
uiredesign
2009-01-23 04:07:52 +00:00
11b99b8144
Merge branch 'master' of /var/www/trunk
2009-01-23 04:03:11 +00:00
1e1a24d8c1
small bugfix, it's prepare() not initialize()
2009-01-23 04:03:04 +00:00
961c5af3ce
Anonymous notice
2009-01-23 03:47:32 +00:00
c8b606f17e
Merge branch 'master' of /var/www/trunk
2009-01-23 03:32:12 +00:00
63c5e34bed
uiredesign
2009-01-23 03:32:06 +00:00
13bd15b0b5
p -> div for markup wrapper
2009-01-23 04:31:50 +01:00
ed09eece28
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 04:21:08 +01:00
3c8f41deb0
Anonymous message for group page
2009-01-23 04:19:03 +01:00
12d923df11
Merge branch 'master' of /var/www/trunk
2009-01-23 03:16:31 +00:00
adf77944e8
trac750 Facebook app proper integrated into new uiredesign
2009-01-23 03:16:03 +00:00
b09a58e8dc
Add anonymous message for user pages
2009-01-23 04:15:03 +01:00
59e386db45
Add an anonymous message for the public page
2009-01-23 04:06:03 +01:00
ae0f2009d5
Groups list by members
2009-01-23 03:07:03 +01:00
6949cefa7f
add groups-by-posts section
2009-01-23 03:03:17 +01:00
8942e3a445
Add an action to show the list of the latest groups
2009-01-23 03:00:51 +01:00
b9b6e491f4
Don't double-define GROUPS_PER_PAGE
2009-01-23 02:57:48 +01:00
0ae4dff237
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 02:25:32 +01:00
673ec133d2
Add a link to add a new group to user groups list
2009-01-23 02:25:09 +01:00
56622ef804
Merge branch 'master' of /var/www/trunk
2009-01-23 01:22:25 +00:00
bee32a6cb0
uiredesign
2009-01-23 01:22:17 +00:00
0711d45ef3
Merge branch 'master' of ../trunk
2009-01-23 01:20:48 +00:00
135f00c51b
tag user profile and form markup and style
2009-01-23 01:20:20 +00:00
9a4333f5f3
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 02:06:45 +01:00
7bbbd433e8
Some whitespace edits in subedit, and tested that it works
2009-01-23 02:04:13 +01:00
8a65c5175c
Merge branch 'master' of /var/www/trunk
2009-01-23 01:01:01 +00:00
4a4efc3b0a
uiredesign
2009-01-23 01:00:57 +00:00
1132e66f84
Fix over-zealous un-underscoring in userauthorization
2009-01-23 01:41:00 +01:00
120ed87e72
Fix start/stop xml in xrds
2009-01-23 01:39:25 +01:00
8228dc7ed5
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-23 01:35:39 +01:00
0ecfd7a7ec
Update userauthorization, strip out a lot of debug stuff
2009-01-23 01:35:05 +01:00
1200e005b1
Merge branch 'master' of ../trunk
2009-01-23 00:20:23 +00:00
2935e8c7ce
Minor markup fix
2009-01-23 00:20:05 +00:00
c21a2445aa
Update remotesubscribe for new system
2009-01-23 01:16:36 +01:00
482dcf625a
Updated recoverpassword
2009-01-23 01:00:01 +01:00
c0d7ce8a3c
Updated sup
2009-01-23 00:36:24 +01:00
cc5808cc28
Update finishopenidlogin
2009-01-23 00:30:57 +01:00
4fe5bd9cf1
First steps to getting OpenID working again
2009-01-22 23:17:08 +00:00
88891f8ebd
Updated foaf file
2009-01-22 23:08:30 +00:00
4d0ff70109
Add attributes for invite
2009-01-22 22:59:18 +00:00
2fe16b39ba
Add local nav to invite
2009-01-22 22:53:05 +00:00
03ce6aee2e
convert invite
2009-01-22 22:51:37 +00:00
d6879bfe0c
Debug some of the subscriptions+tags problems
2009-01-22 22:38:10 +00:00
04d498784f
convert tagother action
2009-01-22 22:02:39 +00:00
10241a6d83
Added featured users to public timeline
2009-01-22 21:42:34 +00:00
058f9fa1eb
Add group tag cloud to group
2009-01-22 21:15:21 +00:00
4e7192579a
Add personal tag cloud
2009-01-22 20:46:37 +00:00
248fd763bd
Add groups by notice to public
2009-01-22 20:17:32 +00:00
b6dad052bd
Add a popular notices section to the public page
2009-01-22 19:48:35 +00:00
e9b3e4e7a8
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-22 20:10:42 +01:00
94d3a4b22c
Add top posters section to public page
2009-01-22 20:08:16 +01:00
55037403c5
Use cached query results for favorited. Might cause pagination issues.
2009-01-22 19:14:18 +01:00
ead1384650
.profile form.form_subscriptions_edit style
2009-01-22 16:57:37 +00:00
318b81c027
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-22 17:19:54 +01:00
0df954aa89
Make subscribers work
2009-01-22 17:19:27 +01:00
01e7859a81
Remove common code from Subscriptions, make tags link visible
2009-01-22 17:12:23 +01:00
30dac77caa
add nav menu to usergroups
2009-01-22 17:06:38 +01:00
3db0778914
uiredesign + phpdocs
2009-01-22 15:37:58 +00:00
b39d4788b9
uiredesign + phpdocs
2009-01-22 15:37:35 +00:00
dfb21679e2
uiredesign + phpdocs
2009-01-22 15:30:58 +00:00
cb2e374bc2
uiredesign + phpdocs
2009-01-22 15:20:58 +00:00
Evan Prodromou
Robin Millette
Zach Copley
Meitar Moscovitz
Sean Murphy
Sarven Capadisli
Adrian Lang
Sarven Capadisli
Evan Prodromou
Robin Millette