Sarven Capadisli
8d4738d956
Merge branch '0.7.x' into 0.8.x
2009-04-19 23:40:26 +00:00
Evan Prodromou
046e5b23bb
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-18 19:36:41 -07:00
Evan Prodromou
e9213043a8
add reply_to index to notice
2009-04-18 19:36:25 -07:00
Robin Millette
00777479d5
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-18 21:14:53 +00: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
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
Evan Prodromou
bd41896f4a
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-17 13:41:34 -07:00
Sarven Capadisli
81714c6c31
counter() after val() reset to avoid (weird) bug.
2009-04-17 20:14:06 +00:00
Evan Prodromou
e8382b1292
incorrect variable access
2009-04-17 13:03:33 -07:00
Sarven Capadisli
e43a5214b4
Merge branch '0.7.x' into 0.8.x
2009-04-17 19:52:39 +00:00
Evan Prodromou
231c61a7eb
store invite code in session so openidfinish can find it
2009-04-17 12:52:26 -07:00
Sarven Capadisli
b22f446df2
Clear notice char counter for direct messages as well.
2009-04-17 19:51:20 +00: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
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
Sarven Capadisli
864c4066a6
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-16 21:59:40 +00:00
Sarven Capadisli
c3a44d2ab9
form_notice textarea is cleared on successful direct message post.
...
Disabled notice posting with XHR on Inbox and Outbox pages. This will
be revisited in 0.8.x.
2009-04-16 21:57:42 +00:00
Zach Copley
4d0e4f733b
Make API dates more compatible with Twitter - ticket 1432
2009-04-16 14:40:57 -07:00
CiaranG
bac3ee95c9
Abort the xmpp-related daemons immediately if xmpp is disabled in the config, otherwise they chew up *lots* of CPU doing nothing
2009-04-16 21:07:59 +01:00
Robin Millette
ed05569716
Add an even (hook): StartPersonalGroupNav.
2009-04-16 17:58:52 +00:00
Robin Millette
a4238e97d7
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-16 17:34:40 +00:00
Robin Millette
362cac0a96
Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm.
2009-04-16 17:34:19 +00: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
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
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
