Commit Graph

5149 Commits

Author SHA1 Message Date
Craig Andrews
091152b6a5 Merge commit 'jeff-themovie/0.8.x-private-returnto' into 0.8.x 2009-08-11 10:42:04 -04:00
Craig Andrews
76d2a71fb0 Merge commit 'jeff-themovie/0.8.x-jcrop-0.9.8' into 0.8.x 2009-08-11 10:41:17 -04:00
Craig Andrews
b93df1ccbc Merge commit 'jeff-themovie/0.8.x-private-search' into 0.8.x 2009-08-11 10:39:44 -04:00
Evan Prodromou
2d29800b6f Merge branch 'master' into 0.8.x
Conflicts:
	lib/mail.php
	lib/rssaction.php
	lib/twitterapi.php
2009-08-11 10:23:11 -04:00
Jeffery To
e432df76d5 Set returnto when redirected to login of a private install 2009-08-11 21:55:24 +08:00
Jeffery To
fedadd5c5b Added opensearch to the list of public actions.
IE7+ will ask for this (opensearch/people and opensearch/notice) on every page access, and as the content is not sensitive, returning it is better than a 307 redirect.
2009-08-11 21:00:51 +08:00
Jeffery To
4d37e919ec Don't show Search in the primary nav if the user isn't logged in and the site is private 2009-08-11 20:47:41 +08:00
Jeffery To
a459313e10 Updated Jcrop to 0.9.8 (avatar cropping wasn't working in IE7 with 0.9.5) 2009-08-11 20:29:45 +08:00
Brett Taylor
73cde378c9 Merge commit 'mainline/0.8.x' into 0.8.x-notices-in-htmloutputter 2009-08-11 15:57:53 +12:00
Brett Taylor
d6bcc635bb two variables $public and $system were generating notices in lib/htmloutputter.php, removed because these two parameters are null by default. 2009-08-11 15:53:37 +12:00
Brett Taylor
04c6272915 fix for trac bug #1805:
bug on line 381 referred to non existant variable, and caused a php notice and potentially would create a misconfigured config.php database type setting.
2009-08-11 15:30:03 +12:00
Brenda Wallace
f2cd83dd51 Revert "changed file.url column type from varcahr(255) to varchar(2047)"
This reverts commit c1b19929f6.
2009-08-11 14:41:48 +12:00
Evan Prodromou
aa9fcb9184 Revert "common_config returns false if the config value is not set. Design::toWebColor checks with is_null. Hence the common_config value should be adjusted."
This reverts commit 5ba46186b7.
2009-08-10 16:42:21 -04:00
Evan Prodromou
3cdefe9983 Revert "Typo, session_name is a function."
This reverts commit d0793c0f44.
2009-08-10 16:42:10 -04:00
Evan Prodromou
36eaf42bbb Revert "UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo."
This reverts commit e1270b26f5.
2009-08-10 16:42:04 -04:00
Adrian Lang
bbf10e5bdf common_config returns false if the config value is not set. Design::toWebColor checks with is_null. Hence the common_config value should be adjusted. 2009-08-10 16:35:09 -04:00
Adrian Lang
77037b3cc3 UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo. 2009-08-10 16:34:56 -04:00
Evan Prodromou
6aee059033 Merge branch 'master' of git@gitorious.org:laconica/mainline 2009-08-10 16:33:36 -04:00
Christopher Vollick
65c37d66c8 $args Was Out Of Scope in CheckMirror.
It looks like when the code was factored out no one noticed this variable doesn't exist here.
2009-08-10 16:33:07 -04:00
Craig Andrews
7dc2717231 Merge commit 'dcostalis/econversation' into 0.8.x 2009-08-10 13:20:56 -04:00
brion
a1a97930f3 Workaround for bug 1317 '"What's up" textarea on iPhone missing proper submit button'
http://laconi.ca/trac/ticket/1317

Mobile Safari shows a 'return' button for making newlines in a <textarea> where it would show a submit button for plain <input> text fields...
However there's a keydown event handler which is supposed to detect hitting enter and submit the form for us. This didn't work on Mobile Safari because it was checking of 13 ("\r") but the iPhone sends us char 10 ("\n") here. Changed to accept both, so we now submit on hitting 'return' on iPhone.

Note: I also added a blur() to move focus out of the textarea, which closes the on-screen keyboard. It will also take focus out of the textarea on other platforms, but this is probably the right thing -- the same thing happens when you push the "send" button after all.

Also note: unfortunately the layout right now looks pretty awful generally while editing on the iPhone; you can't see the send button or character counter while typing at the default zoom, and it doesn't zoom out after you submit so you can't really see where your message is going. This should be dealt with in general by fixing up the mobile skin variant...
2009-08-10 11:58:55 -04:00
Craig Andrews
e9ed20a69d Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x 2009-08-10 11:53:35 -04:00
Adrian Lang
d0793c0f44 Typo, session_name is a function. 2009-08-10 15:24:27 +02:00
Adrian Lang
5ba46186b7 common_config returns false if the config value is not set. Design::toWebColor checks with is_null. Hence the common_config value should be adjusted. 2009-08-10 15:01:00 +02:00
Adrian Lang
e1270b26f5 UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo. 2009-08-10 14:51:41 +02:00
Zach Copley
17dcf1c317 Merge branch 'twitter-oauth' into 0.8.x
Conflicts:

	scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00:00
Zach Copley
06c5f490ea Add Twitter OAuth key and secret example 2009-08-10 07:21:35 +00:00
Zach Copley
681bcbf71e Add synctwitterfriends to daemon startup and stop scripts 2009-08-10 07:18:09 +00:00
Zach Copley
dae74e8ff4 Take token field out of foreign_link
This undoes patch a49272d448
2009-08-10 07:13:00 +00:00
Zach Copley
27548c6903 I forgot that we don't do database upgrades for point releases. So I've
changed Twitter OAuth to store token and token secret in the same field
in foreign_link (credentials).  This should be changed in 0.9.
2009-08-10 07:00:59 +00:00
Zach Copley
fa8433308f Moved some stuff around. More comments and phpcs compliance. 2009-08-10 06:05:43 +00:00
Jeffery To
14b46e2183 Added configuration option to only allow OpenID logins.
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
  OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
  page instead.

The user will still need to set a password to access the API and RSS
feeds.
2009-08-10 13:57:39 +08:00
Brenda Wallace
c1b19929f6 changed file.url column type from varcahr(255) to varchar(2047) 2009-08-10 09:42:53 +12:00
Sarven Capadisli
4a0a6c96ce Updated link colour. 2009-08-09 13:23:35 +02:00
Craig Andrews
060d5c4b8e Fix logic that determines if a URL is relative or absolute in script() and cssLink() 2009-08-08 22:56:42 -04:00
Craig Andrews
1330998b9b Use jQuery instead of window.onLoad, which I believe will be faster and more reliable 2009-08-08 22:55:31 -04:00
Craig Andrews
9853d47137 Update README to use the addPlugin syntax to add the plugin (which seems cleaner) 2009-08-08 22:38:48 -04:00
brion
c6d2e54a71 Throttles updating of the character counter to reduce the performance impact on typing, especially on slower devices (mobiles, netbooks).
http://laconi.ca/trac/ticket/1462
2009-08-08 21:50:31 -04:00
Zach Copley
df12206421 Broke some stuff out into functions. Ran it through phpcs. 2009-08-08 18:13:19 +00:00
Zach Copley
e3bb64cd6c Merge branch '0.8.x' into twitter-oauth 2009-08-08 18:11:47 +00:00
Sarven Capadisli
fe3ce5b6c4 Fixed typo "thier". Ticket 1606 2009-08-08 17:45:53 +02:00
Sarven Capadisli
534d0d804c Fix for removing the first occurance of the duplicate nickname in
textarea when NoticeReply() is used.
2009-08-08 10:44:28 +00:00
Zach Copley
9ec022df93 Only populate attachments array element if there are attachments 2009-08-08 00:57:49 +00:00
Zach Copley
348fa35c6b Also show XML representation of attachments in the API 2009-08-08 00:57:41 +00:00
Zach Copley
0cfdc2b91b Post to Facebook user's stream if notice has an attachment, otherwise post notice as a status update 2009-08-08 00:57:29 +00:00
Zach Copley
2399908138 Better error handling when updating Facebook 2009-08-08 00:57:21 +00:00
Zach Copley
abdd4a3c3e Update to lastest external Facebook libs 2009-08-08 00:57:12 +00:00
Zach Copley
dcfb91ea8b Attempt to reduce the number of calls to FB to speed things up 2009-08-08 00:57:00 +00:00
Zach Copley
b842b34a57 More tinkering with logout. I think I got it this time! It's been driving me crazy. 2009-08-08 00:56:51 +00:00
Brenda Wallace
4e7546fbe2 Call $this->getNotices() always, becuase $this will be the right class.
e.g.
TagrssAction
 or
PublicrssAction
2009-08-08 00:56:01 +00:00