Zach Copley
6bc37a3254
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
...
* '0.8.x' of git@gitorious.org:laconica/dev:
Removed extra slash
Killed the FB Connect profile-pic bounce in all browsers
2009-07-01 16:25:38 -07:00
Zach Copley
0e78e1cc52
Show HTML for thumbnails instead of redirecting. Remove dead code.
2009-07-01 16:24:22 -07:00
Sarven Capadisli
e39b2378be
Removed extra slash
2009-07-01 23:18:35 +00:00
Zach Copley
92e30b438e
Killed the FB Connect profile-pic bounce in all browsers
2009-07-01 22:47:21 +00:00
Sarven Capadisli
b8d32a5118
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-07-01 20:59:49 +00:00
Sarven Capadisli
c832888234
Centres the overlay container as best as it can (given that we can't
...
calculate the height of the XHR response container without actually
loading it into the DOM).
2009-07-01 20:57:21 +00:00
Evan Prodromou
90557e9147
correctly return count of notices
2009-07-01 14:45:48 -04:00
Evan Prodromou
0057f3da81
show all the notices, not just latest 20
2009-07-01 14:45:09 -04:00
Evan Prodromou
3b6ff92495
don't redirect on local file for ajax action
2009-07-01 13:50:44 -04:00
Evan Prodromou
89240cee95
update joverlay to latest version
2009-07-01 13:46:54 -04:00
Evan Prodromou
8d9827c9af
add the readable source for joverlay
2009-07-01 13:46:32 -04:00
Evan Prodromou
67e3bf0f05
remove extra / in attachment code
2009-07-01 13:43:36 -04:00
Evan Prodromou
721ba6c88f
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-07-01 12:58:49 -04:00
Evan Prodromou
8a8390c1a7
exclude p argument when calculating selfUrl
2009-07-01 12:58:16 -04:00
Evan Prodromou
e52997e52f
change queuehandler class to use queuemanager interface
2009-07-01 12:11:02 -04:00
Evan Prodromou
a35138b268
add fail() method to dbqueuemanager and fix logging
2009-07-01 12:10:25 -04:00
Evan Prodromou
2325d934a8
add fail() method to stompqueuemanager
2009-07-01 12:10:11 -04:00
Evan Prodromou
557418bc1e
better transport choices when xmpp is disabled
2009-07-01 12:09:41 -04:00
Evan Prodromou
887d35cfc8
better queue manager detection, new method fail()
2009-07-01 12:09:18 -04:00
Evan Prodromou
f61645aef8
take out session handler notification
2009-07-01 11:38:10 -04:00
Evan Prodromou
e0bf8ad95b
Add UnQueueManager for immediate handling
...
Perhaps it's a little precious, but I took out the switches in
util.php to determine what's supposed to be sent when, and made
a queuemanager class that will just do things when they're supposed to
be done.
2009-07-01 11:34:12 -04:00
Evan Prodromou
7b66a12913
save frames for StompQueueManager
2009-07-01 11:10:23 -04:00
Evan Prodromou
4c256a6d7e
better hook variables for StartQueueManager
2009-07-01 11:09:58 -04:00
Evan Prodromou
58b427869a
compile errors in DBQueueManager
2009-07-01 11:09:42 -04:00
Sarven Capadisli
6c28a07cf5
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-07-01 00:50:19 +00:00
Sarven Capadisli
015492daac
Improves the FB user avatar "bounce" in some browsers
2009-07-01 00:49:40 +00:00
Dan Moore
fbb7757c4b
Cleaning up comments at top of favor.php.
2009-06-30 17:04:49 -07:00
Jeff Mitchell
b416df9312
Add site-wide option to change the length at which URLs are auto-shortened
2009-06-30 16:46:33 -07:00
Zach Copley
ccbc5c447d
Merge commit 'jeff-themovie/small-fixes' into 0.8.x
...
* commit 'jeff-themovie/small-fixes':
Fix missing max_id in API search calls
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
Fix "Trying to get property of non-object" errors when accessing the people search results page
Fix "Undefined variable: cnt"
Fix "Trying to get property of non-object" errors in groupeditform.php
Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Zach Copley
b10dba2798
Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
...
* commit 'jeff-themovie/invite-enabled':
Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Zach Copley
190d45cd05
Merge commit 'jeff-themovie/notice-search-no-results' into 0.8.x
...
* commit 'jeff-themovie/notice-search-no-results':
Fixes the notice search RSS feeds / API results for searches that return no matches.
2009-06-30 15:38:14 -07:00
Zach Copley
c2c631d19d
Merge commit 'jeff-themovie/group-rss-empty' into 0.8.x
...
* commit 'jeff-themovie/group-rss-empty':
Fixes two PHP Warnings ("Invalid argument supplied for foreach() in /var/www/mmmu/lib/rssaction.php") when accessing the RSS feed of a group that has no notices.
2009-06-30 15:12:50 -07:00
Zach Copley
907b5f7b40
Merge commit 'erichelgeson/no-posts-verbage' into 0.8.x
...
* commit 'erichelgeson/no-posts-verbage':
Needed the else. Tested logged in/out ; site closed/inviteonly/both
Verbage of a closed invite only site, it shouldnt ask you to register.
2009-06-30 14:57:19 -07:00
Zach Copley
4405648afb
Merge commit 'br3nda/0.8.x-backgroundfix' into 0.8.x
...
* commit 'br3nda/0.8.x-backgroundfix':
also check for write permission to background folder
2009-06-30 14:50:28 -07:00
Jeff Mitchell
c3cffaf9c7
Laconica defaults to a locale 'en' which uses language 'en'. Unfortunately, this language doesn't exist -- properly it's en_US. This causes a lot of spammy messages in syslog. This fix simply changes 'en' to have
...
the same properties as 'en-us', i.e. a language of en_US and a description of 'English (US)'.
2009-06-30 14:36:40 -07:00
Evan Prodromou
fc20da19bb
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-30 16:12:01 -04:00
Evan Prodromou
7ed94b23a2
added Mail/mimeDecode as mime-decode fallback
2009-06-30 16:11:46 -04:00
Zach Copley
c162bf4d22
Forgot to include ImsettingsAction in the list of Actions to override
...
in order to add a Facebook tab to the Connect menu.
2009-06-30 11:55:34 -07:00
Evan Prodromou
4a926cad4e
add showcache.php script for debugging memcached issues
2009-06-30 12:25:18 -04:00
Evan Prodromou
c5ce56b878
calculate date once for SUP
2009-06-30 11:53:50 -04:00
Evan Prodromou
4e6cd42757
conversation code changes
2009-06-30 11:50:16 -04:00
Zach Copley
424dd56b2a
Merge branch 'defat-fbconnect' into 0.8.x
2009-06-30 04:59:38 +00:00
Zach Copley
13d5479a11
Only output Facebook namespace, scripts, css, etc. when strictly necessary
2009-06-30 04:57:59 +00:00
Sarven Capadisli
a9fd175994
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-06-30 03:06:37 +00:00
Sarven Capadisli
ccfe0e018d
Updated jOverlay version and set max-width for images
2009-06-30 03:05:45 +00:00
Zach Copley
e00f433314
Only use FB's Javascript logout, not its PHP method too
2009-06-30 01:54:08 +00:00
Zach Copley
dfb4ed5265
Factor out code to tell whether user's logged into FB into its own method
2009-06-30 00:49:59 +00:00
Zach Copley
c01e8c0bd1
Fixed grammar in class comment blocks
2009-06-29 17:04:09 -07:00
Zach Copley
4321e02c7b
Delete orphaned background imgs. Design settings code now passes
...
phpcs.
2009-06-29 16:57:36 -07:00
Zach Copley
d19ffc73c2
Merge branch '0.8.x' into design_reset
...
* 0.8.x:
Using max-width:480px for settings_design_background-image image
Using role for admin indicator. Added margin-left.
2009-06-29 15:38:17 -07:00