Evan Prodromou
99f8501d32
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
...
Conflicts:
config.php.sample
2009-05-11 17:53:23 -04:00
Robin Millette
d010d811ba
db stuff for URLs: redirections, oembed, etc.
2009-05-11 13:45:00 -04:00
Zach Copley
bc190595d1
Added TwitterStatusFetcher into daemon startup and shutdown subsystem
2009-05-07 02:07:31 -07: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
Zach Copley
e85cddba45
Ticket #1428 - Changed replies API method to "mentions".
2009-04-28 23:31:00 -07:00
Robin Millette
d71fbe9d96
fixed subscriptions dropdown action
2009-04-24 20:28:39 +00:00
Robin Millette
f2f4e8c586
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-24 20:01:25 +00:00
Robin Millette
c008c0d4a5
fixed trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds.
2009-04-24 20:01:03 +00:00
Evan Prodromou
1c0d82de3b
8-char limit on transports
2009-04-23 10:09:08 +00:00
Evan Prodromou
7c383dc1d4
alert to what transport we're checking for
2009-04-23 10:08:26 +00:00
Evan Prodromou
ece70bf326
incorrect config setting for inboxes
2009-04-23 09:35:10 +00:00
Evan Prodromou
85c7b8df71
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-23 05:24:13 -04:00
Evan Prodromou
aee45ea91d
Add an inbox queue handler
...
Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.
2009-04-23 05:08:48 -04:00
Evan Prodromou
640628de2d
A queuehandler for blowing caches offline
...
We add a queuehandler for blowing the memcached caches off-line. This
should speed up the processing of new notices.
2009-04-23 05:03:19 -04:00
Evan Prodromou
77c5aecaf5
Merge branch 'dev/0.8.x' into 0.8.x
2009-04-23 03:22:37 -04:00
CiaranG
ec5e06a542
Suppress errors when checking for the existence of files that might be restricted by open_basedir - should resolve issue #1310
2009-04-21 23:36:15 +01: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
Adrian Lang
558fa2743e
Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion.
2009-04-20 12:15:12 +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
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
4b54a418f3
trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds
2009-04-18 19:08:33 +00:00
Tobias Diekershoff
7196410bb0
shortening links in notices from XMPP
...
This patch enables shortening of links, that where send from XMPP.
The problem was, that in util.php common_current_user() is not
finding the user account from which is posted, so the service to
shorten is not known, so no shortening at all...
This patch cleans up the xmppdaemon a little bit and hard codes ur1.ca
as shortening service _if_ the user is not set. Ugly but working.
2009-04-18 19:00:20 +02:00
Robin Millette
cb645558a5
Fixed file that was removed by mistake.
2009-04-17 17:35:51 +00:00
Robin Millette
2873940265
Fixed file that was removed by mistake.
2009-04-17 17:31:22 +00:00
Robin Millette
2e06d5a2cb
file was removed by mistake.
2009-04-17 17:24:41 +00:00
Robin Millette
c024ee935a
file was removed by mistake.
2009-04-17 17:23:12 +00: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
Robin Millette
2eb1eb8683
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-17 16:47:18 +00:00
Robin Millette
21873b806d
cosmetic fixes.
2009-04-17 16:46:49 +00:00
Zach Copley
4d0e4f733b
Make API dates more compatible with Twitter - ticket 1432
2009-04-16 14:40:57 -07:00
Robin Millette
ed05569716
Add an even (hook): StartPersonalGroupNav.
2009-04-16 17:58:52 +00:00
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
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
Evan Prodromou
c4040303ce
initial snapshot stuff
2009-04-16 10:18:16 -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
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
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
Sarven Capadisli
3cc94cc0bc
Merge branch '0.7.x' into 0.8.x
2009-04-14 23:35:06 +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
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
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
Evan Prodromou
41b247ac1a
Merge branch '0.7.x' into 0.8.x
2009-04-14 14:29:51 -04: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
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
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
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
Sarven Capadisli
030477b02a
Separation of themes (i.e., layout, typography) and skins (i.e., background
...
images, colours).
A theme can have multiple skins.
Majority of the changes in this commit are due to restructuring the
path/files for themes and skins.
Both theme and skin will be set to 'default' if not set in
config.php.
This commit also allows each instance of this software to create
its own theme without having to override any style from the default
distribution.
Added Cloudy theme.
2009-04-12 02:08:55 +00:00
Sarven Capadisli
3b9f235e42
Trimming the accept header parts for better content type comparison.
...
e.g., ' text/xml' != 'text/xml'
2009-04-10 17:40:45 +00: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
8013a4b347
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-08 00:58:52 -04:00
Zach Copley
44006a35dd
Better debugging output flag
2009-04-08 04:46:00 +00:00
Evan Prodromou
154e8bb858
use mini logo at mini size, not stream logo
2009-04-08 00:32:28 -04:00
Evan Prodromou
b8bfc8beae
far fewer icons in the sidebar
2009-04-08 00:27:04 -04:00
Evan Prodromou
8f40a1a30c
Update README and common for new version
...
Update versions in README, add the new song title, and update the
version stamp in the common.php file.
2009-04-07 23:02:55 -04:00
Evan Prodromou
00dfdb3f3a
Merge branch 'master' of git://gitorious.org/laconica/brianjesse-clone into brianjesse-clone/master
2009-04-07 22:32:58 -04:00
Zach Copley
47d61ad211
Major improvements to Twitter bridge friend syncing
2009-04-07 18:29:10 -07:00
Robin Millette
1371a142b1
added filler/guide text to inbox and outbox.
2009-04-08 00:27:12 +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
Evan Prodromou
92d18134bf
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-07 17:14:10 -04:00
Sarven Capadisli
658462ce85
Markup and styles for search help and errors
2009-04-07 21:02:47 +00:00
Sarven Capadisli
ef2d22a84b
Rearranged the global navigation items for better usability. Reason a)
...
placement of Search at the edge of the viewport for quicker access and
b) placement of the links that are always available (whether user is logged in
or not) in the same location (i.e., Login/Logout, Help, Search)
2009-04-07 18:09:54 +00:00
Sarven Capadisli
7f5e2c5e57
Added Invite link to global navigation
2009-04-07 18:08:56 +00:00
Evan Prodromou
770788d98e
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-07 11:40:38 -04:00
Evan Prodromou
4cc6d0ea2c
make tags in list work
2009-04-07 11:40:13 -04: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
Sarven Capadisli
e21844c7e4
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-03 21:48:23 +00:00
Sarven Capadisli
e632f3be6f
Merge branch '0.7.x' into 0.8.x
2009-04-03 21:47:39 +00:00
Zach Copley
590cc0c9a4
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-03 13:24:01 -07:00
Zach Copley
ab2946047c
Only kill control and surrogates, leave UTF-8 formatting chars alone.
2009-04-03 13:19:33 -07:00
Evan Prodromou
95bb1c6a99
in context link for conversations
2009-04-03 16:16:39 -04:00
Evan Prodromou
68ae282198
Merge branch '0.7.x' into 0.8.x
2009-04-03 15:36:16 -04:00
Evan Prodromou
e2898db087
add finishaddopenid to list of sensitive pages to use with ssl
2009-04-03 12:51:43 -04:00
Evan Prodromou
d68ac2e1d3
Merge branch '0.7.x' into 0.8.x
2009-04-03 12:47:25 -04:00
Evan Prodromou
bd120bc315
reformat queuehandler.php
2009-04-03 12:45:54 -04:00
Evan Prodromou
6be15dfcac
Merge branch '0.8.x' of git://gitorious.org/laconica/fmarani-clone into fmarani/0.8.x
2009-04-02 06:23:50 -04:00
Sarven Capadisli
798984381f
Merge branch '0.7.x' into 0.8.x
2009-04-02 06:44:54 +00:00
Evan Prodromou
e28c4689ce
add sup with arguments
2009-04-01 18:29:10 -04:00
Evan Prodromou
c172cbafaa
Try to do intelligent redirect codes
...
After fixing the redirect code output, there are a lot of weirdnesses
with e.g. form handling. Try to add explicit redirect codes where
needed -- principly when handling a POST.
2009-04-01 15:30:59 -04:00
Evan Prodromou
3bec08c878
Merge branch '0.7.x' of git@gitorious.org:laconica/dev
...
Conflicts:
README
lib/router.php
2009-04-01 14:40:58 -04:00
CiaranG
e7381493ad
Return redirect code correctly as HTTP status, not a header. Fixes ticket #1371
2009-04-01 18:11:02 +01:00
Sarven Capadisli
783d292739
Selector to allow styles when a user is logged in.
2009-04-01 02:06:49 -04:00
Sarven Capadisli
b112b32640
Selector to allow styles when a user is logged in.
2009-04-01 01:03:00 +00:00
Evan Prodromou
1fbf9a042e
give the correct root url when SSL enabled
2009-03-31 10:09:11 -04:00
Evan Prodromou
e149f3d64b
Support SSL for some, all, or no pages
...
Support SSL URLs either for all pages; no pages; or for sensitive
pages accepting passwords, like login, registration, API, and others.
2009-03-30 17:12:02 -04:00
Evan Prodromou
47b89aa2c3
Changes to router setup to make notice search RSS feed work
...
Conflicts:
lib/router.php
2009-03-30 15:05:50 -04:00
Sarven Capadisli
27b45eeb48
Merge branch '0.7.x' into 0.8.x
2009-03-30 15:15:40 +00:00
Evan Prodromou
148310e5fc
welcome notice, default sub for new users
2009-03-30 11:14:43 -04:00
Evan Prodromou
7b02d9d2e1
Merge branch 'master' into 0.7.x
2009-03-30 11:11:33 -04:00
Evan Prodromou
a68836acb4
add full name title to notice list link
2009-03-30 10:38:26 -04:00
Evan Prodromou
d5ac986b80
add titles to group links in notices
2009-03-30 10:26:36 -04:00
Evan Prodromou
3af6680716
add a title to attention notice links
2009-03-30 10:17:10 -04:00
Evan Prodromou
fe426a3152
welcome notice, default sub for new users
2009-03-28 17:36:39 -04:00
Federico Marani
5e9ff6ae97
Testing JMS message selectors for notice tags-based routing
2009-03-28 17:55:20 +00:00
Federico Marani
4b3f022fc2
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
...
Conflicts:
lib/jabber.php
2009-03-28 13:52:01 +00:00
Evan Prodromou
d1f2e68133
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-03-27 19:29:58 -04:00
Evan Prodromou
07eae0ce4d
Support SSL for some, all, or no pages
...
Support SSL URLs either for all pages; no pages; or for sensitive
pages accepting passwords, like login, registration, API, and others.
2009-03-26 15:03:59 -04:00
Sarven Capadisli
ce325a06b1
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-03-25 18:29:09 +00:00
Sarven Capadisli
a13bfa5848
Ticket http://laconi.ca/trac/ticket/1274
...
Minimised form_notice markup by removing unordered lists. There is a minor CSS
rule reassignment done by changing the selectors. There is no visual
change in the final result.
2009-03-25 18:16:20 +00:00
Evan Prodromou
2becd5849d
Merge branch 'master' into 0.7.x
...
Conflicts:
lib/router.php
2009-03-25 12:56:52 -04:00
CiaranG
55e8a6ca1b
A different search pagination fix (see ticket #1333 ) that doesn't require fixing the upstream code, thus undoing the change made in d64be5108d
...
Merged.
2009-03-25 12:27:14 -04:00
CiaranG
2c8f67f6a9
A different search pagination fix (see ticket #1333 ) that doesn't require fixing the upstream code, thus undoing the change made in d64be5108d
2009-03-25 15:39:58 +00:00
Evan Prodromou
66a2f4c64b
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-03-24 10:40:41 -04:00
Evan Prodromou
51d8b5d568
Merge branch 'master' into 0.7.x
2009-03-24 10:40:16 -04:00
Evan Prodromou
a148569705
include text of notice in favourites notification
2009-03-24 10:29:30 -04:00
CiaranG
88269b288a
Fix to Korean language selection - see ticket #1351
2009-03-24 08:05:02 +00:00
Brian
214468d17e
added a few Laconica events
2009-03-23 21:48:04 -07:00
CiaranG
fc6b7e28d4
Fixed jabber code broken in 3ef4f251ac
2009-03-23 22:45:03 +00:00
Evan Prodromou
8c073a34ce
Merge branch '0.7.x' into 0.8.x
2009-03-23 15:55:07 -04:00
Evan Prodromou
a1e37b2bd2
show subscribe button and block form again
2009-03-23 15:44:39 -04:00
Evan Prodromou
14afe2d268
show subscribe button and block form again
2009-03-23 15:44:17 -04:00
Evan Prodromou
3ef4f251ac
One function for producing Atom entry for a Notice
...
Took the various places that we create an atom entry for a notice, and
jammed them together into one function of the notice class, and then
used that function. Also, added Atom threading extension and
categories for hashtags.
2009-03-22 16:58:38 -04:00
Evan Prodromou
149fa14bd4
not correctly checking results of XML-RPC request
2009-03-22 15:34:09 -04:00
Evan Prodromou
2e3f228b4b
variable name error
2009-03-22 15:24:09 -04:00
Evan Prodromou
e947d9fdd1
variable name error
2009-03-22 15:23:40 -04:00
CiaranG
c4072ef7c9
RSS 1.0 actions were reading the stream from the database twice. Inefficient, but more importantly made notice search RSS fail with a DB error due to double search on a DB_DataObject instance
2009-03-21 14:18:38 +00:00
CiaranG
8ba43f18cd
Changes to router setup to make notice search RSS feed work
2009-03-21 14:16:54 +00:00
CiaranG
94271293ce
Remove 'Register' from login group nav when site is closed or inviteonly. See ticket #1335
2009-03-19 21:07:31 +00:00
Evan Prodromou
739bb522fd
Merge branch 'master' into 0.7.x
2009-03-19 11:03:07 -04:00
Evan Prodromou
d1b2a9d708
Somewhat better behaviour with mixed caps in search
...
Deal somewhat better with mixed caps in people and notice search.
2009-03-19 11:01:58 -04:00
Evan Prodromou
5dc913f589
ping handler returns proper boolean response
...
The ping queue handler wasn't returning a true value -- filling up the
queue with ping requests. It now returns a true value.
2009-03-19 09:39:19 -04:00
Evan Prodromou
e7c57b4307
ping handler returns proper boolean response
...
The ping queue handler wasn't returning a true value -- filling up the
queue with ping requests. It now returns a true value.
2009-03-19 09:21:50 -04:00
Evan Prodromou
0e93b638b5
fix bug in profile list owner check
2009-03-18 16:35:03 -04:00
Evan Prodromou
f1041a3b4e
fix bug in profile list owner check
2009-03-18 16:34:41 -04:00
Federico Marani
420c361304
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
2009-03-16 22:43:51 +00:00
Meitar Moscovitz
91b0fb8028
Add apple-touch-icon.png
support; favicons for the iPhone OS.
2009-03-16 18:04:27 -04:00
Meitar Moscovitz
85d61475aa
Output code to explicitly reference favicons.
...
This makes favicons work when Laconica is not installed at a web
server's DOCUMENT_ROOT. I've also added the capability to override the
Laconica default favicon.ico file with a theme-specific one simply by
dropping a themed favicon.ico in the appropriate theme directory.
2009-03-16 17:42:24 -04:00
Brenda Wallace
18c8a55ba6
use common_database_tablename instead of repeating that if structure everywhere
2009-03-17 10:36:12 +13:00
Adrian Lang
221c61a499
Fix typo in the the newmessage route.
2009-03-14 02:37:53 -04:00
Adrian Lang
40073120b9
Fix typo in the the newmessage route.
2009-03-13 22:06:02 +01:00
Evan Prodromou
0b436ec997
update version number to 0.7.2.1
2009-03-12 12:45:03 -04:00