Commit Graph

1496 Commits

Author SHA1 Message Date
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
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
Meitar Moscovitz 6cdc2ff444 Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS. 2009-04-09 13:52:39 -04:00
Sarven Capadisli dcee7f2f62 Merge branch '0.7.x' into 0.8.x 2009-04-08 22:58:21 +00:00
Sarven Capadisli 03a4a4bebf Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-08 22:55:34 +00:00
Sarven Capadisli e5657ca4bb Merge branch '0.7.x' into 0.8.x 2009-04-08 22:55:13 +00:00
CiaranG 85873b1f2b Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master 2009-04-08 22:11:58 +01:00
Evan Prodromou 579332aa24 don't use count() to check for empty page 2009-04-07 23:57:45 -04:00
Evan Prodromou 58dfad5757 Merge branch 'adrianlang-827' of git://gitorious.org/laconica/adrianlang-clone into 0.7.x 2009-04-07 22:29:48 -04:00
Robin Millette afebef50e4 showemptListMessage -> showEmptyListMessage method name cleanup. 2009-04-08 01:20:50 +00:00
Robin Millette 5c87616778 added filler/guide text to user groups list. 2009-04-08 01:19:23 +00:00
Robin Millette ddb59f72db text bugfix to guide text in subscription list. 2009-04-08 01:13:37 +00:00
Robin Millette 3fb6c8218a added filler/guide text to subscribers list. 2009-04-08 01:12:43 +00:00
Robin Millette 68ed6be71f added filler/guide text to subscription list. 2009-04-08 01:05:17 +00:00
Robin Millette b20815e8e2 added missing word to user favorites guide. 2009-04-08 00:16:53 +00:00
Robin Millette cc50031658 added filler/guide text to user favorites. 2009-04-08 00:15:05 +00:00
Sarven Capadisli a839daad2e HTML br is not needed. Using 'clear' in CSS instead. 2009-04-07 23:45:22 +00:00
Robin Millette 79b1e3a488 added filler/guide text to user replies timeline. 2009-04-07 23:25:12 +00:00
Robin Millette d704b3fa8e added filler/guide text to user timeline. 2009-04-07 23:14:02 +00:00
Robin Millette c79bad0601 fixed filler/guide text on personal timeline to take memcached into account. 2009-04-07 22:16:09 +00:00
Evan Prodromou 50b32227d1 Add subscribers, subscriptions, groups to personal page
We show stats, subscriptions info on the personal page in the sidebar.
Pushed code from showstream.php into a common parent class for
personal and profile.
2009-04-07 17:47:08 -04:00
Evan Prodromou 4e3e4fcfff Merge branch '0.7.x' into 0.8.x 2009-04-07 17:14:23 -04:00
Sarven Capadisli 05b04b7970 Changed text "noone" to "no one". 2009-04-07 21:12:11 +00:00
Sarven Capadisli a6e950b7a1 Renamed 'blankfiller' to 'guide'. 2009-04-07 21:09:27 +00:00
Robin Millette 640ae10935 added filler text to personal timeline. 2009-04-07 16:11:03 +00:00
Robin Millette 17fb51f747 added filler text to notice and group search, suggesting other search options. 2009-04-07 03:26:33 +00:00
Robin Millette 9ad8307b7e external search now depends on site.server. 2009-04-06 05:04:11 +00:00
Robin Millette 84d2aa7df4 refactored search suggestions and added forgotten sprintf. 2009-04-06 01:14:59 +00:00