Evan Prodromou
55d7bb4701
Merge branch '0.7.x' into 0.8.x
2009-04-15 11:35:43 -04:00
Evan Prodromou
5ff8d8d447
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
...
Conflicts:
actions/public.php
2009-04-15 10:25:26 -04:00
Adrian Lang
8439477201
Add escaping of /.
2009-04-15 13:29:52 +02:00
Fil
e8fc34e75c
Use preg_quote to fix http://laconi.ca/trac/ticket/1342
2009-04-15 10:35:15 +02:00
Adrian Lang
99f4367d03
Merge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong call of common_local_url.
...
These changes add opera-readable prev/next relations.
2009-04-15 09:38:19 +02:00
Adrian Lang
fc6cedd222
Make OMB work if the configured domain name does not exclusively contain lower case letters.
...
If the configured domain is mixed-case OAuth throws invalidsignature errors. The current URL is part of the signated parts; since the consumer does not pass the current URL, the service has to get it itself and add it to the other OAuth params for signature rebuilding. OAuth.php uses $_SERVER for this, however, the domain is lcased in $_SERVER. Hence we pass the complete current URL as generated by common_local_url to OAuthRequest.
2009-04-15 09:18:43 +02:00
Sarven Capadisli
3cc94cc0bc
Merge branch '0.7.x' into 0.8.x
2009-04-14 23:35:06 +00:00
Sarven Capadisli
64e4b8a20f
Updated remaining files and styles for style separation for themes
2009-04-14 23:32:09 +00:00
Robin Millette
533a463879
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-14 23:03:31 +00:00
Robin Millette
2039466495
trac#1223 Show most popular notices per tag in the tag page sidebar.
2009-04-14 23:03:19 +00:00
Evan Prodromou
41b247ac1a
Merge branch '0.7.x' into 0.8.x
2009-04-14 14:29:51 -04:00
Zach Copley
ad5dd9030b
Add option to Twitter settings for importing Friends Timeline
2009-04-13 19:19:26 -07:00
Evan Prodromou
4c9be4d566
typo in api.php
2009-04-13 15:52:15 -04:00
Evan Prodromou
3a0c59052a
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-13 15:51:12 -04:00
Evan Prodromou
e9e75fc9d5
isReadOnly() now takes arguments
...
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
Sarven Capadisli
ed3d68435f
Using farbtastic jQuery plugin to select design colours.
2009-04-13 05:39:23 +00:00
Sarven Capadisli
4a8c23fe32
Updated path for jCrop
2009-04-13 03:49:37 +00:00
Sarven Capadisli
2341f99224
Merge branch '0.7.x' into 0.8.x
2009-04-12 21:50:57 +00:00
Sarven Capadisli
7a00dc749d
Updated styles for the Authrization subscription form inputs
2009-04-12 21:50:14 +00:00
Sarven Capadisli
6cfa587385
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-12 21:41:20 +00:00
Sarven Capadisli
e9e7671d5f
Updated markup for entity_profile on Authorize subscription page.
2009-04-12 21:40:29 +00:00
Sarven Capadisli
a9461356b8
Created Design page for users to customize the way their profile pages
...
look by changing the background image and picking a colour palette for
text.
2009-04-12 20:30:14 +00:00
Evan Prodromou
f934cf2ac0
Update XML generation and list of actions in public XRDS
...
Updated the XML generation calls and list of actions in the public
XRDS document.
2009-04-12 15:34:38 -04:00
Evan Prodromou
925ac16e1f
tag stream is read-only
2009-04-10 22:47:40 -04:00
Sarven Capadisli
c9c5ec0e4b
Merge branch '0.7.x' into 0.8.x
2009-04-10 17:39:56 +00:00
Meitar Moscovitz
6cdc2ff444
Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS.
2009-04-09 13:52:39 -04:00
Sarven Capadisli
dcee7f2f62
Merge branch '0.7.x' into 0.8.x
2009-04-08 22:58:21 +00:00
Sarven Capadisli
03a4a4bebf
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-08 22:55:34 +00:00
Sarven Capadisli
e5657ca4bb
Merge branch '0.7.x' into 0.8.x
2009-04-08 22:55:13 +00:00
CiaranG
85873b1f2b
Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master
2009-04-08 22:11:58 +01:00
Evan Prodromou
579332aa24
don't use count() to check for empty page
2009-04-07 23:57:45 -04:00
Evan Prodromou
58dfad5757
Merge branch 'adrianlang-827' of git://gitorious.org/laconica/adrianlang-clone into 0.7.x
2009-04-07 22:29:48 -04:00
Robin Millette
afebef50e4
showemptListMessage -> showEmptyListMessage method name cleanup.
2009-04-08 01:20:50 +00:00
Robin Millette
5c87616778
added filler/guide text to user groups list.
2009-04-08 01:19:23 +00:00
Robin Millette
ddb59f72db
text bugfix to guide text in subscription list.
2009-04-08 01:13:37 +00:00
Robin Millette
3fb6c8218a
added filler/guide text to subscribers list.
2009-04-08 01:12:43 +00:00
Robin Millette
68ed6be71f
added filler/guide text to subscription list.
2009-04-08 01:05:17 +00:00
Robin Millette
b20815e8e2
added missing word to user favorites guide.
2009-04-08 00:16:53 +00:00
Robin Millette
cc50031658
added filler/guide text to user favorites.
2009-04-08 00:15:05 +00:00
Sarven Capadisli
a839daad2e
HTML br is not needed. Using 'clear' in CSS instead.
2009-04-07 23:45:22 +00:00
Robin Millette
79b1e3a488
added filler/guide text to user replies timeline.
2009-04-07 23:25:12 +00:00
Robin Millette
d704b3fa8e
added filler/guide text to user timeline.
2009-04-07 23:14:02 +00:00
Robin Millette
c79bad0601
fixed filler/guide text on personal timeline to take memcached into account.
2009-04-07 22:16:09 +00:00
Evan Prodromou
50b32227d1
Add subscribers, subscriptions, groups to personal page
...
We show stats, subscriptions info on the personal page in the sidebar.
Pushed code from showstream.php into a common parent class for
personal and profile.
2009-04-07 17:47:08 -04:00
Evan Prodromou
4e3e4fcfff
Merge branch '0.7.x' into 0.8.x
2009-04-07 17:14:23 -04:00
Sarven Capadisli
05b04b7970
Changed text "noone" to "no one".
2009-04-07 21:12:11 +00:00
Sarven Capadisli
a6e950b7a1
Renamed 'blankfiller' to 'guide'.
2009-04-07 21:09:27 +00:00
Robin Millette
640ae10935
added filler text to personal timeline.
2009-04-07 16:11:03 +00:00
Robin Millette
17fb51f747
added filler text to notice and group search, suggesting other search options.
2009-04-07 03:26:33 +00:00
Robin Millette
9ad8307b7e
external search now depends on site.server.
2009-04-06 05:04:11 +00:00
Robin Millette
84d2aa7df4
refactored search suggestions and added forgotten sprintf.
2009-04-06 01:14:59 +00:00
Robin Millette
1ee24a2aaf
added filler text to people search, suggesting other search options.
2009-04-05 23:11:40 +00:00
Sarven Capadisli
e21844c7e4
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-03 21:48:23 +00:00
Sarven Capadisli
e632f3be6f
Merge branch '0.7.x' into 0.8.x
2009-04-03 21:47:39 +00:00
Robin Millette
8f969f8f98
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-03 20:37:35 +00:00
Robin Millette
439d521c86
Tiny change to the public tag cloud dealing with empty page.
2009-04-03 20:37:29 +00:00
Robin Millette
9698247722
Added filler text to popular page for when it's empty, encouraging user to add favorites and/or register.
2009-04-03 20:35:18 +00:00
Robin Millette
e1fec6db2f
Simplified code for empty public timeline.
2009-04-03 20:34:27 +00:00
Evan Prodromou
fa3ca0548f
fix output of conversation
2009-04-03 16:12:33 -04:00
Evan Prodromou
68ae282198
Merge branch '0.7.x' into 0.8.x
2009-04-03 15:36:16 -04:00
Evan Prodromou
81c72956a6
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-03 15:31:07 -04:00
Robin Millette
4d4e6ead9c
added filler text to public tagcloud for when it's empty, encouraging user to post and/or register.
2009-04-03 19:16:35 +00:00
Evan Prodromou
5eacffcb3a
try to reduce memory usage in FOAF output
2009-04-03 14:18:29 -04:00
Evan Prodromou
5f79653acb
redirect FOAF file on non-canonical nickname
2009-04-03 14:00:52 -04:00
Evan Prodromou
d68ac2e1d3
Merge branch '0.7.x' into 0.8.x
2009-04-03 12:47:25 -04:00
Evan Prodromou
26194cd1d6
i18n for legend in remote sub form
2009-04-02 06:10:32 -04:00
Sarven Capadisli
798984381f
Merge branch '0.7.x' into 0.8.x
2009-04-02 06:44:54 +00:00
Evan Prodromou
e28c4689ce
add sup with arguments
2009-04-01 18:29:10 -04:00
Evan Prodromou
c172cbafaa
Try to do intelligent redirect codes
...
After fixing the redirect code output, there are a lot of weirdnesses
with e.g. form handling. Try to add explicit redirect codes where
needed -- principly when handling a POST.
2009-04-01 15:30:59 -04:00
Robin Millette
3861e348a4
added filler text to public timeline for when it's empty, encouraging user to post and/or register.
2009-03-30 21:07:48 +00:00
Sarven Capadisli
27b45eeb48
Merge branch '0.7.x' into 0.8.x
2009-03-30 15:15:40 +00:00
Evan Prodromou
7b02d9d2e1
Merge branch 'master' into 0.7.x
2009-03-30 11:11:33 -04:00
Evan Prodromou
650a86d79a
add fullname to title and h1 for groups
2009-03-30 10:28:44 -04:00
Evan Prodromou
ce212c3903
full name in title and h1 of the personal profile
2009-03-30 09:58:49 -04:00
Evan Prodromou
73fbf65800
full name in title and h1 of the personal profile
2009-03-30 09:58:28 -04:00
Evan Prodromou
2becd5849d
Merge branch 'master' into 0.7.x
...
Conflicts:
lib/router.php
2009-03-25 12:56:52 -04:00
Evan Prodromou
1116526f08
fixed pagination variable problem
2009-03-25 12:32:46 -04:00
Evan Prodromou
8c073a34ce
Merge branch '0.7.x' into 0.8.x
2009-03-23 15:55:07 -04:00
Sarven Capadisli
fadae96a74
Password recover and change form markup updated.
2009-03-22 20:21:32 +00:00
CiaranG
a9a71297f4
Use correct page information for notice search. See ticket #1333
2009-03-20 22:02:35 +00:00
CiaranG
b4c273113c
A couple more 'Join Now' messages that need disabling when the site is closed or invite only
2009-03-19 21:55:03 +00:00
CiaranG
0e1186dfd0
Get rid of 'Join now...' message if site is closed or invite only. See ticket #1335
2009-03-19 18:08:49 +00:00
Evan Prodromou
8f64c247fd
redirect to original URL or URI for remote notices
2009-03-19 11:38:25 -04:00
Evan Prodromou
3d8a8aa03c
redirect to original URL or URI for remote notices
2009-03-19 11:36:24 -04:00
Evan Prodromou
d1b2a9d708
Somewhat better behaviour with mixed caps in search
...
Deal somewhat better with mixed caps in people and notice search.
2009-03-19 11:01:58 -04:00
Brenda Wallace
18c8a55ba6
use common_database_tablename instead of repeating that if structure everywhere
2009-03-17 10:36:12 +13:00
Brenda Wallace
c2e529c72b
quoted the users table
2009-03-17 10:27:29 +13:00
Evan Prodromou
b3a0eea3b6
Merge branch '0.7.x' into 0.8.x
...
Conflicts:
classes/Notice.php
lib/action.php
lib/router.php
lib/twitter.php
2009-03-12 11:56:23 -04:00
CiaranG
c08e4d904e
PostgreSQL - a few more query compatibility issues (submitted by oxygene)
2009-03-11 23:46:23 +00:00
Adrian Lang
2cbb67c21e
Define undefined variable.
2009-03-11 10:40:24 +01:00
Adrian Lang
6367def2d8
Remove OAuthRequest as storage from userauthorization.
...
Since we are not really handling a fullblown OAuth request (No signature, nonce, consumer) we should not use this class, rather store the plain param array in the session.
2009-03-11 10:33:26 +01:00
Adrian Lang
df7565ddcc
Remove second OAuth request validation.
2009-03-11 10:32:12 +01:00
Adrian Lang
24713499a9
Fixes #827 : Laconica expects full OAuth message for user auth request.
...
When a user subscribes to a remote profile, he is redirected to his own service to confirm the request. This authorization request is specified in http://oauth.net/core/1.0#auth_step2 . According to the standard, it does not have to pass consumer_key, nonce, timestamp or signature. The only specified parameters are oauth_token and oauth_callback, both optional.
2009-03-11 10:30:30 +01:00
Adrian Lang
1ba3ac9ee3
Make OMB work if the configured domain name does not exclusively contain lower case letters.
...
If the configured domain is mixed-case OAuth throws invalidsignature errors. The current URL is part of the signated parts; since the consumer does not pass the current URL, the service has to get it itself and add it to the other OAuth params for signature rebuilding. OAuth.php uses $_SERVER for this, however, the domain is lcased in $_SERVER. Hence we pass the complete current URL as generated by common_local_url to OAuthRequest.
2009-03-11 10:27:54 +01:00
Adrian Lang
72338b8c26
Merge branch '0.7.x' of http://git.gitorious.org/laconica/erichelgeson-clone into review/0.7.x
2009-03-11 10:07:41 +01:00
Zach Copley
622cc150d8
Fix xml:lang attr
2009-03-10 18:30:58 -07:00
Zach Copley
1e29cbd691
Make search API Atom feeds more valid
2009-03-10 18:17:20 -07:00
Zach Copley
a989c58c11
Fix tag URIs in Atom feeds for search thru the API
2009-03-10 17:20:43 -07:00
Zach Copley
df07786f28
Allow unauthenticated users to view /api/statuses/replies/id.format
...
(they can already see @replies via friends_timeline anyway).
2009-03-10 16:48:14 -07:00
Zach Copley
91980c73a7
Updates to the API to improve Atom feeds
2009-03-10 16:15:57 -07:00
Eric Helgeson
c6cd87c106
Changed all $config[][] calls to common_config()
2009-03-09 20:01:35 -05:00
CiaranG
945bbf00dc
PostgreSQL - a couple more GROUP BY queries that needed to be explicit
2009-03-09 20:24:56 +00:00
Adrian Lang
f87ef9b72b
Fixes #1277 : Typo in variable name in actions/twitapidirect_messages.php.
2009-03-09 09:45:40 +01:00
Adrian Lang
fbe794e44d
Improve handling of null values in profile parameters.
...
This commit fixes two issues:
- Allowing remote users to clear profile parameters via OMB.
- Improved handling of profile parameters which evaluate to
false ('0' for example)
2009-03-09 08:06:31 +01:00
Adrian Lang
6ab9d6b140
Remove additional output as response to updateprofile.
...
This output breaks our own response validation and is not part of the OMB spec.
2009-03-08 17:09:09 +01:00
Adrian Lang
4c8c9bb9df
Define undefined variable.
2009-03-08 17:06:18 +01:00
CiaranG
2133d5a4e7
PostgreSQL - some more fixes to make queries compatible with both databases. (submitted by oxygene)
2009-03-08 16:16:10 +00:00
Evan Prodromou
f66775658c
trying to kill the can't-leave-a-group bug
2009-03-07 17:47:43 -08:00
Evan Prodromou
7d7d78b7f7
you can _so_ leave a group if you're its admin
2009-03-07 17:43:59 -08:00
Evan Prodromou
d014d43c68
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-03-07 17:14:55 -08:00
Adrian Lang
f8d1381717
Corrected redirect targets for some group actions. These redirects can occur when the canonical name differs from the passed name.
2009-03-08 01:37:27 +01:00
Evan Prodromou
c21d61840d
Let people view friends_timeline of others
...
Add some code to view others' friends timelines through API.
2009-03-07 14:13:33 -08:00
Evan Prodromou
1a63d7d829
fix case of OAuthUtil method
2009-03-07 13:35:19 -08:00
Evan Prodromou
ba9c589bb2
fix for change in OAuthUtil upstream
2009-03-07 13:32:44 -08:00
Adrian Lang
3383e78063
More api actions which need no auth when called with parameter.
2009-03-07 13:16:54 +00:00
Adrian Lang
162da3cbc5
Correct api method names for rss2 and atom feeds in all.php action.
2009-03-07 12:39:36 +00:00
Zach Copley
ac7170bf6c
Atom search results for Twitter-compatible API + phpcs stuff
2009-03-06 21:09:43 -08:00
Evan Prodromou
13c183e2f4
Merge branch '0.7.x' into 0.8.x
2009-03-06 16:17:58 -08:00
Zach Copley
b1f337fe01
First crack at Twitter-like JSON search results for the API
2009-03-06 13:33:47 -08:00
Zach Copley
38b6946349
Stubs for Twitter-compatible API search methods
2009-03-04 18:14:52 -08:00
Zach Copley
77e4fad9fa
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-03-04 16:21:37 -08:00
Zach Copley
36bb33fb1d
Made /api/account/verify_credentials.format return an extended user object. Updates to status and user API objects.
2009-03-04 16:17:40 -08:00
CiaranG
115519a5e7
PostgreSQL - made all 'weight' calculating SQL expressions compatible with both databases, and made some GROUP BY queries more explicit about the fields they are selecting, for the same reason.
2009-03-04 15:32:26 +00:00
Sarven Capadisli
753b699916
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-03-04 05:15:41 +00:00
Sarven Capadisli
dcdf47cff2
Avatar crop fix for shrinking/stretching of images when user doesn't
...
scale it with the Jcrop tool (but hits Crop). This will use the lower
value from width/height.
2009-03-04 05:11:18 +00:00
CiaranG
35677336de
Catch bad replyto IDs before saving a new notice to avoid a constraint violation. This happens, for example, when posting for the first time on a fresh install
2009-03-03 21:33:52 +00:00
Evan Prodromou
fc44c9a7f4
Merge branch '0.7.x' into 0.8.x
2009-02-28 21:11:16 -08:00
Evan Prodromou
02ba71b0f1
start conversation action
2009-02-28 15:12:31 -08:00
Adrian Lang
bdb8c12d97
Completely refactored noticesearch list, now using subclassing for highlighting. Fixes #1240 and probably other bugs.
2009-02-27 15:43:38 -08:00
Adrian Lang
d005b37071
Fixes #1241 : in-reply-to links were broken due to copy and paste error (Variable name was wrong).
2009-02-27 15:43:10 -08:00
Adrian Lang
210647a56c
Fix replyto parameter in newnotice
2009-02-27 15:41:47 -08:00
Adrian Lang
a90a8da5c3
Broadcast profile via OMB after avatar change.
2009-02-27 15:41:23 -08:00
Adrian Lang
d4b6e7266a
Correctly handle avatars at updateProfile
2009-02-27 15:39:42 -08:00
Adrian Lang
616fd16bc5
Auth_Yadis_Yadis::PlainHTTPFetcher expects plain arrays, not hashes.
2009-02-27 15:39:28 -08:00
Adrian Lang
89197210cf
Fixes #1067 : Avatar stretched on authorize remote subscription page. The img tag used a wrong class which had a width: 100% applied.
2009-02-27 15:39:10 -08:00
Evan Prodromou
2bf5b23016
fix notice in register
2009-02-26 13:36:10 -08:00
Evan Prodromou
8c3fe83c64
Make allrss.php work with phpcs
2009-02-23 13:27:22 -08:00
Zach Copley
cab322d21b
Ticket #1108 - Added 'social graph' methods to the API
2009-02-22 20:04:47 -08:00
Zach Copley
8e0508dad3
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-22 17:03:41 -08:00
Zach Copley
cdab8d55a9
Ticket #925 - make verify_credentials return 'Authorized' if no return type specified
2009-02-22 17:01:41 -08:00
Evan Prodromou
3a999af4d9
Change common_local_url() to take 4 arguments
...
I changed common_local_url() to take an additional optional argument
-- for query parameters. Being persnickety, I made it the third of
four, and moved the last one ($fragment) down a slot. That required
changing a couple of calls.
2009-02-20 17:30:09 -05:00
Evan Prodromou
12636d9fb1
don't use SUP in group rss
2009-02-20 17:14:13 -05:00
Evan Prodromou
4aa9b95f51
use return value of common_check_user() in login.php
2009-02-20 16:58:19 -05:00
Leslie Michael Orchard
9a0e71f9bf
Fixing a bunch of undefined variable warnings in OpenID signup process
2009-02-20 16:37:59 -05:00
Evan Prodromou
5ec5a22dc7
make tagother work with router
2009-02-20 10:04:28 -05:00
Evan Prodromou
c0497d28f4
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-20 09:54:50 -05:00
Evan Prodromou
a0ddbecfbc
Merge branch '0.7.x' of evan@dev.controlyourself.ca:/var/www/evan into 0.7.x
2009-02-20 09:54:17 -05:00
Zach Copley
28e1c163e3
Open the /api/laconica/config.format API method so clients can determine whether a site is "private".
2009-02-18 15:33:52 -08:00
Evan Prodromou
d8b6762e6d
move peoplesearchresults to its own module
2009-02-18 09:35:59 -05:00
Meitar Moscovitz
4327ae19d4
Fixes ticket:1053; removes spacing between hash and tag on profile page.
2009-02-17 18:37:02 +11:00
Evan Prodromou
b727e8be33
Set @-message notification options in email settings
...
Set the @-message notification options in email settings.
2009-02-16 18:45:05 -05:00
Evan Prodromou
4ad5d55ecf
Add events for filtering and logging new notices
2009-02-13 10:52:26 -05:00
Zach Copley
47e595b092
Merge branch 'queuehandlers' into 0.7.x
2009-02-12 14:41:27 -08:00
Evan Prodromou
3b5fd8fb6b
Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
...
This reverts commit 9f035e2847
.
It's a lot of complicated stuff, and the global handler probably does
fine.
2009-02-12 16:05:37 -05:00
Evan Prodromou
b09eb06dae
Revert "Just discovered the PEAR_Error handling function in index.php. Duh."
...
This reverts commit 616bdd43a9
.
Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
2009-02-12 16:04:43 -05:00
Zach Copley
986068d6e7
Merge branch '0.7.x' into queuehandlers
2009-02-11 23:07:49 -08:00
Zach Copley
616bdd43a9
Just discovered the PEAR_Error handling function in index.php. Duh.
...
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
2009-02-11 22:08:20 -08:00
Zach Copley
9f035e2847
Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
...
up, but are actually expected and can safely be ignored.
2009-02-11 21:41:56 -08:00
Zach Copley
7155cf813d
Move/reorg Twitter broadcast code to lib/twitter.php in prep for
...
making a twitterqueuehandler.
2009-02-11 17:46:53 -08:00
Sarven Capadisli
012288bdf6
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 16:53:01 +00:00
Sarven Capadisli
fc293545be
Minor. Changed from @class location to label
2009-02-11 16:50:07 +00:00
Evan Prodromou
22b10399aa
Unify feeds definition in actions
...
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.
I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.
I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Evan Prodromou
ad65c447d5
fix Atom link, add Atom and RSS 2.0 to <head>
2009-02-11 10:35:15 -05:00
Meitar Moscovitz
2fb8c58c84
Merge branch 'dev-0.7.x' into link-rel-paginate
2009-02-12 02:27:13 +11:00
Evan Prodromou
27e23f2dd3
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
2009-02-11 10:11:26 -05:00
Evan Prodromou
26b0bc3aab
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-11 09:54:23 -05:00
Evan Prodromou
1a7337f2fd
Moved /doc/ to /doc-src/
...
Moved the doc/ dir to /doc-src/ so that the actual
markdown files aren't substituted for the docs.
2009-02-10 22:33:57 -05:00
Robin Millette
7763f804ca
trac #233 Explicitely show we have an rss feed for notice searches.
2009-02-10 22:04:47 +00:00
Meitar Moscovitz
b240a17194
Beginning to refactor document relationship links to reduce common code.
...
My attempts here are to mimic the `pagination()` method shared by
actions. I'm tentatively adding the `$count` property to actions so that
we can query the number of notices ''being displayed'' per page prior to
calling the actual `pagination()` method itself, since document
relationship `<link>` elements need to be output inside of `showHead()`,
before `showContent()`, which is where `pagination()` is, gets called.
2009-02-10 20:25:44 +11:00
Meitar Moscovitz
3585012380
Merge branch 'dev-0.7.x' into link-rel-paginate
2009-02-10 18:28:12 +11:00
Sean Murphy
d8ed013612
Merge commit 'upstream/0.7.x' into 0.7.x
2009-02-09 20:18:27 -05:00
Sean Murphy
55fcc150fe
Fixed #1025 : Delete avatar option.
2009-02-09 20:17:56 -05:00
Evan Prodromou
47a5d2b7f0
Fixed remote subscribe avatar problems
...
Had some Avatar file-copying issues; seem to be fixed.
2009-02-09 23:13:11 +00:00
Meitar Moscovitz
8cb3035b89
Merge branch 'dev-0.7.x' into link-rel-paginate
2009-02-10 05:05:04 +11:00
Evan Prodromou
c87a0c3f58
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-09 12:09:44 -05:00
Evan Prodromou
9b7c57d094
whitespace and formatting in showstream.php
2009-02-09 12:07:21 -05:00
Evan Prodromou
73b8de7c4c
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
2009-02-09 12:03:45 -05:00
Robin Millette
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
Zach Copley
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
Zach Copley
00fda7ae5f
Minor update to the way Facebook app handles listing of friends you've invited.
2009-02-08 21:58:25 +00:00
Zach Copley
dec0461d5f
Trac #1159 : Fix peopletag pagination. Also phpcs cleanup.
2009-02-08 13:25:48 -08:00
Meitar Moscovitz
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
Robin Millette
c2905085c1
trac #1155 ++ replace strlen with mb_strlen for all utf8 strings.
2009-02-07 19:33:18 +00:00
Sean Murphy
a3d5e00f64
Merge commit 'upstream/0.7.x' into 0.7.x
...
Conflicts:
actions/showstream.php
2009-02-07 11:02:10 -05:00
Sean Murphy
d6245dca63
Fixed #1048 : Edit avatar link on profile page.
2009-02-06 18:36:34 -05:00
Evan Prodromou
26053c1868
Make adding and removing an incoming email in SMS settings
...
Fixes Bug#1036.
2009-02-06 15:22:48 -05:00
Meitar Moscovitz
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
Evan Prodromou
bb2cb65c2a
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-06 03:56:15 -05:00
Evan Prodromou
fc094e0cf4
fix formatting of new Avatar:: calls
2009-02-06 03:55:53 -05:00
Evan Prodromou
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
Sarven Capadisli
a6cf3a2fb3
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-06 06:28:14 +00:00
Sarven Capadisli
ac23321a40
Added primary and secondary form actions. Fixed markup for
...
form_notice_delete
2009-02-06 06:27:04 +00:00
Zach Copley
d51be320ca
Removed debugging statements I accidentally left in deletenotice.php
2009-02-05 16:21:23 -08:00
Zach Copley
ab82978b2d
Trac #894 and #1013 - fixed bad redirects after delete notice
2009-02-05 16:16:10 -08:00
Evan Prodromou
8775e79e35
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 16:35:19 -05:00
Evan Prodromou
444c794480
Don't show stretchy-box on avatar if not cropping
2009-02-05 16:34:38 -05:00
Evan Prodromou
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
Sarven Capadisli
02eecb4f07
Minor markup consistency
2009-02-05 21:26:06 +00:00
Evan Prodromou
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
Sean Murphy
d4bdb2dc19
Better fix for displaying max file size.
2009-02-05 15:01:44 -05:00
Sean Murphy
746a5d7507
Fixed #905 : Presenting image size limit to user.
2009-02-05 14:11:50 -05:00
Robin Millette
9febe8ce39
trac #1142 fix tag rss
2009-02-05 18:10:47 +00:00
Evan Prodromou
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
Adrian Lang
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
Evan Prodromou
43feee783b
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-05 11:47:47 -05:00
Evan Prodromou
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
Sean Murphy
4ced74dc91
Fixed #1140 ; Login form session token not set.
2009-02-05 10:17:19 -05:00
Sarven Capadisli
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
Sean Murphy
7e975b17c5
Fixed #1134 ; Consolidated image scaling functions.
2009-02-04 19:32:15 -05:00
Zach Copley
68152dcf3a
Facebook app - reorganized some stuff; better HTML output
2009-02-04 22:54:07 +00:00
Evan Prodromou
a97f8f6a43
merge from dev/0.7.x
2009-02-04 15:40:36 -05:00
Evan Prodromou
2bd52059db
take out redundant code from login
2009-02-04 15:38:26 -05:00
Zach Copley
df41b1307f
Removed erroneous comments referring to old common_notice_form() func
2009-02-04 11:55:22 -08:00
Sean Murphy
5c880bc6cc
Fix for #1057 ; group logo transparecy (and pixilation)
2009-02-04 14:44:12 -05:00
Evan Prodromou
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
Evan Prodromou
92c6034b25
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-04 07:26:14 -05:00
Evan Prodromou
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
Zach Copley
c16ddd6775
trac1095 Profile page had bad alternate links for RSS and Atom feeds
2009-02-03 16:31:41 -08:00
Sarven Capadisli
32b1bb381a
Fixed ajaxErrorMsg(). Using startHTML() instead of common_start_html()
2009-02-03 21:46:09 +00:00
Evan Prodromou
aafb73755e
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-03 15:13:06 -05:00
Evan Prodromou
0356953cf8
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
2009-02-03 15:12:55 -05:00
Zach Copley
dcf18e9694
trac1104 Destroy method was dying because it was still calling deprecated common_dequeue_notice() func
2009-02-03 11:23:30 -08:00
Meitar Moscovitz
01b6aca078
Fix PHP warnings when user avatar crop controls aren'tn touched.
2009-02-04 03:34:17 +11:00
Evan Prodromou
ab16bb876b
Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x
2009-02-02 16:46:51 -05:00
Robin Millette
3f0eb90128
removed extraneous argument in startHTML calls
2009-02-02 20:47:57 +00:00
Sarven Capadisli
5f004c0158
Added "Edit" entity_action.
...
Updated theme files.
2009-02-02 16:33:47 +00:00
Sarven Capadisli
55c99d0018
Using startXML() instead of deprecated common_start_xml()
2009-02-01 23:43:07 +00:00
Adrian Lang
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
Zach Copley
153208aaa6
trac750 Add footer to Facebook app's login page
2009-01-30 00:07:56 +00:00
Zach Copley
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
Meitar Moscovitz
5543cd21c6
Fix problems when crop controls not touched
2009-01-29 14:56:22 -05:00
Evan Prodromou
440d7d17b0
wrong tags in tagother
2009-01-29 08:49:19 -05:00
Evan Prodromou
746880e49e
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
2009-01-29 08:37:51 -05:00
Evan Prodromou
b6fbb9462c
proper pagination for subs and members
2009-01-29 08:37:40 -05:00
Zach Copley
c7d06519f0
trac750 update Facebook status when posting to Identi.ca from Facebook
2009-01-29 05:58:27 +00:00
Evan Prodromou
de47c827b7
better upload of group logos
2009-01-28 23:00:01 -05:00
Meitar Moscovitz
e37e9c2084
Fix password settings
2009-01-28 08:55:03 -05:00
Zach Copley
745f733469
Make favorites RSS actually work (uiredesign)
2009-01-27 15:27:04 -08:00
Zach Copley
4a176eadcb
Have "Current verified Twitter account" to use the right CSS class: form_note
2009-01-27 14:51:13 -08:00
Zach Copley
a5a1e15cba
trac975 - Fixed title for Twitter settings page (thanks meitar)
2009-01-27 14:35:25 -08:00
Sarven Capadisli
f9403ae99a
Keeping HTML consistent throughout the site.
2009-01-27 06:21:36 +00:00
Sarven Capadisli
e20c3e2b7c
Entered CC3.0 anchor text
2009-01-27 02:37:41 +00:00
Zach Copley
1c60afb940
trac750 140 character countdown for FB app
2009-01-27 01:55:36 +00:00
Evan Prodromou
7953192aa0
fix profile in block form
2009-01-26 17:15:32 +01:00
Evan Prodromou
91e63866fb
move block form
2009-01-26 17:14:08 +01:00
Evan Prodromou
8d95151f7a
fix license link in registration page
2009-01-26 16:57:39 +01:00
Evan Prodromou
f3db32d151
Fix direct addressing of messages
2009-01-26 15:45:54 +01:00
Adrian Lang
a80a536e41
Fix canonical tags in notice and in URLs
2009-01-26 15:03:38 +01:00
Evan Prodromou
12b9d4346f
Warn not-logged-in users when they try to send a message
2009-01-26 14:29:31 +01:00
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