Commit Graph

4089 Commits

Author SHA1 Message Date
Evan Prodromou
d76bb2fd11 Revert "allow snapshots to be disabled easily"
This reverts commit 0838143d58.

Already handled with the 'never' option.
2009-04-16 13:05:35 -04:00
Evan Prodromou
ca5753255f Merge branch '0.8.x' into stats 2009-04-16 12:58:07 -04:00
Evan Prodromou
546ab05dba update version string for dev version 2009-04-16 12:57:57 -04:00
Evan Prodromou
8521f1c4ac Merge branch '0.8.x' into stats 2009-04-16 12:55:43 -04:00
Evan Prodromou
d6b336a938 change # comments to // in config.php.sample 2009-04-16 12:55:33 -04:00
Evan Prodromou
0838143d58 allow snapshots to be disabled easily 2009-04-16 12:53:17 -04:00
Evan Prodromou
6a247acb45 Do some phpcs reformatting for snapshot 2009-04-16 12:50:29 -04:00
Evan Prodromou
415abdfdef config options for snapshots 2009-04-16 12:50:13 -04:00
Evan Prodromou
5128448c77 code complete on snapshot.php 2009-04-16 12:41:30 -04:00
CiaranG
3e3fec39ff Clarification in README regarding welcome/default users, as it has tripped a couple of people up 2009-04-16 17:21:06 +01:00
Evan Prodromou
c4040303ce initial snapshot stuff 2009-04-16 10:18:16 -04:00
Evan Prodromou
3081b2e317 start of querybyid 2009-04-16 08:44:48 -04:00
Evan Prodromou
55d7bb4701 Merge branch '0.7.x' into 0.8.x 2009-04-15 11:35:43 -04:00
Evan Prodromou
573d4cf0fb Merge branch 'nobase' into 0.7.x 2009-04-15 11:31:57 -04:00
Evan Prodromou
7ba3f8aeb3 script to trim very old notices from inboxes 2009-04-15 11:30:33 -04:00
Evan Prodromou
ff7d711810 add user id to statistics 2009-04-15 10:27:41 -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
Evan Prodromou
8da76e0810 add user id to statistics 2009-04-15 10:05:16 -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
Adrian Lang
e876b74e8b Add license notice to install.php, replace short and asp style tags by more portable long tag form. 2009-04-15 08:38:05 +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
Sarven Capadisli
d6a31c90a8 Removed skin config option 2009-04-14 23:17:25 +00:00
Sarven Capadisli
7095c93f66 Simpler separation of themes. New themes can either make use of the
default styles or make their own.
2009-04-14 23:13:02 +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
98f6bbb90c escape slash in regexp 2009-04-14 16:02:51 -04:00
Zach Copley
cd9a247980 Fix bad dates in API's JSON search results 2009-04-14 16:02:26 -04:00
Evan Prodromou
b142c26010 Make stuff work with no base 2009-04-14 16:02:09 -04:00
Evan Prodromou
0073a75dff Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-14 16:01:22 -04:00
Evan Prodromou
b1940bcb7b escape slash in regexp 2009-04-14 16:01:02 -04:00
Sarven Capadisli
0b3bd63a30 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-14 19:14:39 +00:00
Sarven Capadisli
4c29cda000 Merge branch '0.7.x' into 0.8.x 2009-04-14 19:14:32 +00:00
Zach Copley
9f2e2e4b2c Notice sources: Fixed Nambu, added Tricklepost and sorted the list. 2009-04-14 11:50:59 -07: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
Zach Copley
01695dc346 Fix bad dates in API's JSON search results 2009-04-13 15:03:34 -07:00
Evan Prodromou
1bae34e24f typo in lib action 2009-04-13 15:55:53 -04:00
Evan Prodromou
a801ee0843 typo in api.php 2009-04-13 15:55:38 -04:00
Evan Prodromou
7f81597a81 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:55:25 -04:00
Evan Prodromou
4684d34713 typo in lib action 2009-04-13 15:54:16 -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
4f966709e6 Added farbtastic's default stylesheet 2009-04-13 17:30:25 +00:00
Sarven Capadisli
d4291f1f9b Moved Cloudy's layout styles in skin to theme. 2009-04-13 17:29:15 +00:00
Sarven Capadisli
526cdd8a81 Merge branch '0.7.x' into 0.8.x 2009-04-13 17:26:58 +00:00