Commit Graph

3929 Commits

Author SHA1 Message Date
Sarven Capadisli
5c753e20cc Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-19 23:42:53 +00:00
Sarven Capadisli
340cd553ec otalk theme (preliminary) 2009-04-19 23:40:37 +00:00
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
1cb5490943 incorrect variable access 2009-04-17 13:57:50 -07:00
Evan Prodromou
0e6da4f1be store invite code in session so openidfinish can find it 2009-04-17 13:57:34 -07:00
Robin Millette
8edd7001f4 Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm. 2009-04-17 13:57:15 -07: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
Evan Prodromou
2772b0f7ce script to report stats from a cron job 2009-04-16 10:17:58 -07:00
Evan Prodromou
b233e7b3f0 document snapshot options 2009-04-16 10:16:22 -07: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
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