Commit Graph

1522 Commits

Author SHA1 Message Date
Sarven Capadisli c8fd3c5765 Merge branch '0.7.x' into 0.8.x 2009-05-01 17:03:51 +00:00
Evan Prodromou 19a2194704 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-05-01 07:13:19 -04:00
Ori Avtalion c5e72e248f Several whitespace fixes 2009-05-01 07:12:13 -04:00
Ori Avtalion 9cac6413a3 Add s to user favorite notices 2009-05-01 07:11:28 -04:00
Sarven Capadisli d30df07908 Merge branch '0.7.x' into 0.8.x
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
2009-05-01 00:16:25 +00:00
CiaranG b79fef3074 Fixed remote subscription, broken in fc6cedd222 2009-04-29 23:43:42 +01:00
Zach Copley 8295402fb3 Added 'mentions' the the list of API methods requiring bare auth 2009-04-29 13:16:52 -07:00
Zach Copley e85cddba45 Ticket #1428 - Changed replies API method to "mentions". 2009-04-28 23:31:00 -07:00
Zach Copley 54795f2c41 Merge branch 'twitter-import' into 0.8.x 2009-04-24 14:29:56 -07:00
Zach Copley 06746f3fac Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-23 02:19:12 +00:00
Zach Copley c4941e9043 Added ajax responses 2009-04-23 02:17:59 +00:00
Robin Millette fe3241183e fix join a group link from user homepage when he hasn't posted anything yet 2009-04-23 01:03:17 +00:00
Adrian Lang 0dd90461cd Merge branch '0.7.x' of git://gitorious.org/laconica/mgrdcm-twitapibools into review/master 2009-04-20 13:09:05 +02:00
Robin Millette 39c0e3a9ef fix 0.7.x 0.8.x merge conflict in register.php 2009-04-18 21:14:31 +00:00
Dan Moore 48846c3805 Fixing spaces/tabs. 2009-04-18 15:54:23 -04:00
Dan Moore b764c3be78 This should change the JSON representation of the booleans 'following' and 'notifications', but unlike the previous change, I was unable to test this. 2009-04-18 15:42:44 -04:00
Dan Moore 90fb7be99a Bringing the presentation of boolean variables (favorited, truncated, profile_background_tile) and the result from friendships/exist in JSON results from the Twitter Compatible API in line with what the real Twitter API does.
Currently, laconica returns text strings enclosed in quotes instead of bare Javascript booleans.  This change fixes that.

See http://laconi.ca/trac/ticket/1326 for one open issue related to this.
2009-04-18 15:33:36 -04:00
Robin Millette eec323b5b7 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-18 19:08:48 +00:00
Robin Millette 4b54a418f3 trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds 2009-04-18 19:08:33 +00:00
Evan Prodromou e8382b1292 incorrect variable access 2009-04-17 13:03:33 -07:00
Evan Prodromou 231c61a7eb store invite code in session so openidfinish can find it 2009-04-17 12:52:26 -07:00
Robin Millette e5094c3359 fix merge conflict 0.7.x 0.8.x in util.php and register.php. 2009-04-17 17:04:05 +00:00
Sarven Capadisli 34d904b180 Ticket 1404. Showing the link to the members list page. 2009-04-17 01:11:38 +00:00
Zach Copley 6848e93cd5 Merge branch '0.8.x' into twitter-import 2009-04-16 15:00:58 -07:00
Robin Millette 362cac0a96 Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm. 2009-04-16 17:34:19 +00:00
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