Commit Graph

49 Commits

Author SHA1 Message Date
Evan Prodromou
5d09b6b3f0 Merge branch '0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b change controlyourself.ca to status.net 2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Evan Prodromou
622c0b24c3 move redirect-to-openid code to OpenID plugin 2009-08-04 13:17:43 -04:00
Evan Prodromou
8f122dd71e new action for when we redirect to login page 2009-08-04 13:10:37 -04:00
Evan Prodromou
91e088d341 make some actions CurrentUserDesignActions 2009-05-23 23:40:11 -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
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
Evan Prodromou
97c98cf59a Break up settings into two tabset
Made two tabsets: account and connect. Removed "Invite" from
the global nav to make room.
2009-01-17 22:30:44 +00:00
Evan Prodromou
2bea8b8359 Modify settingsaction to better work with new framework 2009-01-16 20:00:26 +00:00
Evan Prodromou
be445a4b91 Update settingsaction.php to new framework 2009-01-16 19:35:37 +00:00
Zach Copley
5e061d2060 Some fixups of patches not already migrated to trunk to bring inline with PEAR coding stds
darcs-hash:20081225144601-7b5ce-4846f3d036c36037836d15ed672c10ba33f9f84c.gz
2008-12-25 09:46:01 -05:00
csarven
33196c24f4 Jcrop v2 (POST cropping to be completed)
darcs-hash:20081210021607-eefa4-c3590f3e734255faf098bf5ca09fc17901a6db70.gz
2008-12-09 21:16:07 -05:00
Evan Prodromou
b264c03d32 move opening brace of class declaration to next line
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
2008-12-23 14:49:23 -05:00
Evan Prodromou
04ef1ba8ee change function headers to K&R style
Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).

darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
2008-12-23 14:33:23 -05:00
Evan Prodromou
eb2f9c98ac replace NULL with null
Another global search-and-replace update. Here, I've replaced the PHP
keyword 'NULL' with its lowercase version. This is another PEAR code
standards change.

darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz
2008-12-23 14:21:29 -05:00
Evan Prodromou
edbc0c665c replace all tabs with four spaces
The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
2008-12-23 14:19:07 -05:00
millette
15c1d4f5e4 trac31 url_auto_shortening by sgmurphy
darcs-hash:20081106205926-099f7-6bcfd7969a159a12b1ba6a9ee254e44a07b94761.gz
2008-11-06 15:59:26 -05:00
Evan Prodromou
2944989d8a hide IM settings if xmpp disabled
darcs-hash:20080922214003-5ed1f-f183262f41a430710946470133f61694e322fcad.gz
2008-09-22 17:40:03 -04:00
Zach Copley
9eca4e0874 Fold password form into profile settings
darcs-hash:20080907053604-7b5ce-4e01cefdbab4cc73a28960b265c23abf5e2f2b0a.gz
2008-09-07 01:36:04 -04:00
Zach Copley
4f1c30fd88 Conflated Avatar and Profile settings + removed a bunch of unnecessary whitespace
darcs-hash:20080905194732-7b5ce-2797acd4d04f3b02c4ad67be629badbae469e8ed.gz
2008-09-05 15:47:32 -04:00
zach
a90b556e21 Twitter integration - Oh look, a Twitter settings tab.
darcs-hash:20080822034157-462f3-398e2ba92d9c38520ea6518c3ff614b41f3cc7ec.gz
2008-08-21 23:41:57 -04:00
Evan Prodromou
1ba234a9b6 make settings and search menus localisable
darcs-hash:20080817150244-84dde-7f2e4dec226aa9754dfc970386e62076f952db72.gz
2008-08-17 11:02:44 -04:00
zach
7e6870db91 base class is_readonly() now returns false by default
darcs-hash:20080722212056-ca946-e4bd9eef8e3d8991414932e9fc7b8c9a31f818c0.gz
2008-07-22 17:20:56 -04:00
zach
038f762bce Added is_readonly() method to all Actions
darcs-hash:20080722171501-ca946-160bad6c4f80be2b3b105ea9b913f1c0f9edb0ef.gz
2008-07-22 13:15:01 -04:00
Evan Prodromou
5fd0a788d5 start sms settings
darcs-hash:20080720193005-84dde-97e098996309550dc98b658923d84620e7715c69.gz
2008-07-20 15:30:05 -04:00
Evan Prodromou
61487d4cd0 move email settings to its own tab
darcs-hash:20080715221826-84dde-8a3692f95199818c11dbb0be159d07f1ab10cf6a.gz
2008-07-15 18:18:26 -04:00
Mike Cochrane
7e38142d4a Resolve conflicts and convert _t( to _( where it was introduced again.
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
2008-07-10 00:51:26 -04:00
Mike Cochrane
87b494f1eb Convert _t() to _() for gettext.
darcs-hash:20080708094531-533db-83399a46e6ec4c0fcc6249b0235961f969d1ae73.gz
2008-07-08 05:45:31 -04:00
Evan Prodromou
6eb9e89209 refactor common code between searches and between search and settings
darcs-hash:20080709231031-84dde-929095ca3844ed6fe7ebd535fc9696678a5fcb0f.gz
2008-07-09 19:10:31 -04:00
Evan Prodromou
7a88255681 show current tab correctly on settings menu
darcs-hash:20080702131911-84dde-aea1a69547187d3f66e435f14becb2e9013edb39.gz
2008-07-02 09:19:11 -04:00
Evan Prodromou
c64f137497 refactor common behaviour in settings pages
darcs-hash:20080630170342-84dde-5d7feb88a0a707b24c8070802a7ec99dd1f35687.gz
2008-06-30 13:03:42 -04:00
Evan Prodromou
be3a44651c implement rememberme functionality
Added a checkbox on login or register to remember the current user. If
the login is successful, this sets a cookie with a random code (saved
in the DB). If they come back, and they aren't logged in "normally",
we check to see if they have a rememberme cookie. If so, we log them
in.

However, they can't change settings -- cookie theft is too prevalent.
So we mark a session as having a "real" (password or OpenID) login, or
not. In settings pages, we check to see if the login is "real", and if
not, we redirect to the login page.

darcs-hash:20080624025234-34904-ad20001bf35bf41fcb63a0c357fd929aacc55fdb.gz
2008-06-23 22:52:34 -04:00
Evan Prodromou
ae40dfe842 add imsettings to menu
darcs-hash:20080623223641-34904-2758e19c70026a0c169e99d86481d87b0b4bc79c.gz
2008-06-23 18:36:41 -04:00
Evan Prodromou
0299b6f2ca add OpenID settings to settings menu
darcs-hash:20080618065508-84dde-855999e8433ac5882638635c43bd52b8940b59d4.gz
2008-06-18 02:55:08 -04:00
Evan Prodromou
83e303fe27 fancy URLs should remember page
darcs-hash:20080615035012-84dde-0450954528a270f46a4ac5d2b077af793ba8c1f3.gz
2008-06-14 23:50:12 -04:00
Evan Prodromou
f406ba4501 show selection in settings menu
darcs-hash:20080611160520-84dde-6e5b2d12cd9f0f601ffd57bc68246df738d6145a.gz
2008-06-11 12:05:20 -04:00
Evan Prodromou
7edc6e18fa take out home/profile menu for all pages, use same format for settings menu
darcs-hash:20080611015609-84dde-e2789990adb9a166aa76d119b1e941dbf18fbcc9.gz
2008-06-10 21:56:09 -04:00
Evan Prodromou
816fe407fa better menuish stuff
darcs-hash:20080520205152-84dde-4261d3d07e172a365e383f75c646d46cdbfaeecb.gz
2008-05-20 16:51:52 -04:00
Evan Prodromou
52600ce0b0 trim whitespace
darcs-hash:20080520191412-84dde-a607dbe848279639630edd1ab4616d05cc2318d1.gz
2008-05-20 15:14:12 -04:00
Evan Prodromou
86cc2a16a9 fix link to profilesettings in settings menu
darcs-hash:20080519141736-84dde-20ee1ffc994ca10ae3ccd6ec765512ad0cd0385c.gz
2008-05-19 10:17:36 -04:00
Evan Prodromou
466f0489c3 fix created, messages
darcs-hash:20080517195201-84dde-8f8269284e5fc00e9f2a6d8187059d0f59eae007.gz
2008-05-17 15:52:01 -04:00
Evan Prodromou
a654d63eb0 fix check for POST
darcs-hash:20080517171501-84dde-b8d6a1cc106372c9127d73442b4740f2de7e7b22.gz
2008-05-17 13:15:01 -04:00
Evan Prodromou
3b14b7901c fixes to make it all lint
Ran everything through php -l, found out that it didn't compile.

So: fixed the am-I-running-in-Laconica check at the top of each file.
Some syntax fixes in shownotice, showstream, common.

darcs-hash:20080517154701-84dde-8d38da89c5b9cb3b40704adb04a4de880c204181.gz
2008-05-17 11:47:01 -04:00
Evan Prodromou
3803cf2153 upload and change avatars
code to upload and change avatars.

combined some code in the settings area, too.

darcs-hash:20080517122045-84dde-8e13994e627805f29679c9533c2f62db81dc0925.gz
2008-05-17 08:20:45 -04:00
Evan Prodromou
fac522f4d7 settings and avatars
Did considerable work on the settings section.

Redesigned the DB to allow avatars. Each avatar image has a size and
an URL. There can be multiple avatars per profile, just different sizes.

Added accessors in Profile for avatar. Show the avatar in lots of
places, where it makes sense. Constants for avatar sizes in common.php.

darcs-hash:20080515162844-84dde-fe0630366e247c02ca8ca9d1cc6b963cfce57a26.gz
2008-05-15 12:28:44 -04:00