Commit Graph

4787 Commits

Author SHA1 Message Date
Sarven Capadisli 79b06ade27 Removed OpenID link from the primary global navigation in order to
keep a single Login idea because we have several ways to login
already: regular login, OpenID and Facebook (and probably LDAP, Open
Social in the future)
2009-07-08 00:42:14 +00:00
Zach Copley 802b909518 user/show API method needs to fall back to basic auth so that
verify_credentials works correctly.
2009-07-07 14:21:44 -07:00
Zach Copley 673cdab874 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-07-07 20:15:05 +00:00
Zach Copley 8bc924224b Update translations updater script to use Pootle 2009-07-07 20:13:39 +00:00
Craig Andrews 79c61e0c8c maildaemon makes mail attachments into notice attachments 2009-07-07 15:56:24 -04:00
Craig Andrews 5f72423523 File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web 2009-07-07 15:55:10 -04:00
CiaranG d846c5fc99 Merge commit 'br3nda/0.8.x-noticesfix' into 0.8.x 2009-07-07 20:53:28 +01:00
CiaranG bb1548451a Merge commit 'br3nda/0.8.x-pgschema' into 0.8.x 2009-07-07 20:48:26 +01:00
Evan Prodromou 84e676b687 Merge branch 'queuemanager' into 0.8.x 2009-07-07 11:35:00 -04:00
Evan Prodromou dd705ddaf7 Merge branch 'tos' into 0.8.x 2009-07-07 11:34:49 -04:00
Sarven Capadisli 247cf2ea8f Updated support for 800px width design 2009-07-07 04:08:51 +00:00
Sarven Capadisli c266e0d68c Added max-height to designsettings and attachment view images 2009-07-07 00:43:56 +00:00
Sarven Capadisli 65ef1cb72a Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-07-07 00:23:42 +00:00
Sarven Capadisli acb305b34a Changed img max-width to all attachment views 2009-07-07 00:22:43 +00:00
Zach Copley 4fffe1874f Fix redundant page display for group design settings 2009-07-06 16:44:35 -07:00
Zach Copley 195ec6820b fix bad function call
Conflicts:

	actions/twitapiusers.php
2009-07-06 15:56:10 -07:00
Dan Moore a9c1e66570 Bringing users/show in line with Twitter as far as specifying user. 2009-07-06 15:51:17 -07:00
Zach Copley 91684830e5 fix bad function call 2009-07-06 15:49:26 -07:00
Zach Copley 701a237e8c Merge branch 'mgrdcm-review' into 0.7.x
* mgrdcm-review:
  Bringing users/show in line with Twitter as far as specifying user.
2009-07-06 15:48:14 -07:00
Zach Copley 5e067c2c81 Add special basic auth handling for friendships/show. Other fixups. 2009-07-06 13:21:16 -07:00
Zach Copley d40075ae9c Support undocumented 'id' parameter in /statuses/show API method 2009-07-06 11:57:21 -07:00
Sarven Capadisli d48d27d79f Updated margin/width value for nested notices 2009-07-05 22:57:35 +00:00
Evan Prodromou 5875c02cbb also hide your own design 2009-07-05 14:37:37 -04:00
Evan Prodromou e6c54a59e1 set/get viewdesigns flag and use it 2009-07-05 14:33:12 -04:00
Evan Prodromou d4db9d83d8 Revert "Merge branch '0.8.x' into cachenonexistent"
This reverts commit e21d2cfdb5.
2009-07-05 12:44:18 -04:00
Evan Prodromou bfae5489cb Merge branch 'master' of git@gitorious.org:laconica/mainline 2009-07-05 12:05:19 -04:00
Evan Prodromou e21d2cfdb5 Merge branch '0.8.x' into cachenonexistent 2009-07-05 11:53:39 -04:00
Evan Prodromou 83adf9fa1a don't hide unsub button for remote users 2009-07-05 11:47:14 -04:00
Evan Prodromou 5fe1af94b2 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-07-05 11:33:17 -04:00
Evan Prodromou ac361791c4 fix caching of faves by own, other 2009-07-05 11:32:57 -04:00
Evan Prodromou 9f6bea473e cache failure to find in memcached 2009-07-05 11:31:39 -04:00
Evan Prodromou 23e6dafff6 better handling of frames and notices 2009-07-05 11:01:07 -04:00
Sarven Capadisli 53b7fb7f1c Using box-shadow on the site_nav_local_views li instead of a. 2009-07-04 18:28:24 +00:00
Evan Prodromou cb019f7aad don't send unused variable for streams 2009-07-04 01:43:35 -04:00
Evan Prodromou 66a4a60e0b better debug logging in stomp queue manager 2009-07-04 01:43:18 -04:00
Evan Prodromou 49eaa04b50 return singleton if initialized 2009-07-04 01:42:42 -04:00
Evan Prodromou 9dee9e1612 new default daemon jid 2009-07-04 01:20:39 -04:00
Evan Prodromou 6d72864618 don't try to show non-object 2009-07-04 01:17:37 -04:00
Evan Prodromou f63702579a don't say we're connecting if we're not 2009-07-04 01:16:58 -04:00
Evan Prodromou 49c5c6f92b move handling code into queuemanager 2009-07-04 00:31:28 -04:00
Evan Prodromou 741eb1a28b Merge branch '0.8.x' into queuemanager 2009-07-03 23:34:44 -04:00
Evan Prodromou eedfaa7d1a clean up payload memory 2009-07-03 23:34:28 -04:00
Zach Copley e3c70cc30c Merge branch 'friendships_show' into 0.8.x
* friendships_show:
  Implement friendships/show API method
  Route and stub for new friendships/show API method
2009-07-03 15:43:14 -07:00
Zach Copley 2881b553fe Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
  null for both args in conversation
  no limit on conversation stream
  fixed limit for conversations
  only show subscribe button in profile list for local users
  move peoplesearchresults class to action/peoplesearch
  only show subscription controls to owner
2009-07-03 15:42:55 -07:00
Zach Copley a2a4cc35f6 Implement friendships/show API method 2009-07-03 15:42:12 -07:00
Evan Prodromou 088fa6befc null for both args in conversation 2009-07-03 10:48:15 -04:00
Evan Prodromou e2f8b8d65d no limit on conversation stream 2009-07-03 10:40:23 -04:00
Evan Prodromou 04c713e671 fixed limit for conversations 2009-07-03 10:37:39 -04:00
Evan Prodromou c04e3c7769 only show subscribe button in profile list for local users 2009-07-03 10:14:02 -04:00
Evan Prodromou 72d0ee4e25 move peoplesearchresults class to action/peoplesearch 2009-07-03 10:10:12 -04:00