Commit Graph

3865 Commits

Author SHA1 Message Date
Sarven Capadisli
c9c5ec0e4b Merge branch '0.7.x' into 0.8.x 2009-04-10 17:39:56 +00:00
Evan Prodromou
fba0249932 add cliqset 2009-04-10 11:36:46 -04:00
Evan Prodromou
a0a6a627e7 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-10 10:48:13 -04:00
Evan Prodromou
08c08d02aa Added maisha to notice_source 2009-04-10 10:47:53 -04:00
Tobias Diekershoff
4277a6818c Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x 2009-04-10 14:25:25 +02:00
Meitar Moscovitz
6cdc2ff444 Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS. 2009-04-09 13:52:39 -04:00
CiaranG
6afda46402 Corrected error in README relating to ['newuser']['welcome'] 2009-04-09 18:29:31 +01: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
Sarven Capadisli
070cd3533c Fixes the issue mentioned in commit 7fc90d5. Changed the margin value
that's specific to the Inbox/Outbox page only.
2009-04-08 20:54:37 +00:00
Sarven Capadisli
420c94e7d3 Using encodeURIComponent for document.title 2009-04-08 20:36:50 +00:00
Sarven Capadisli
255841cbb7 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-08 20:01:00 +00:00
Sarven Capadisli
1ac66b3996 Using 800px width and using document.title if no text is selected. 2009-04-08 19:59:59 +00:00
Meitar Moscovitz
7fc90d5c5c Remove extranneous bottom margins on label; fix Safari layout bug.
This margin causes a layout bug in Safari whereby the Inbox and Outbox
pages have a notice form textarea that's too wide, causing it to slide
beneath the "Send" button on those pages. Removing this margin seems to
be completely innocuous in my tests, which covered Safari, Firefox,
Opera, and Internet Explorer 7. Can less be more? :)
2009-04-08 15:26:27 -04:00
Sarven Capadisli
3d536300aa Minor update for 800px width viewport 2009-04-08 18:52:05 +00: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
f21077ce55 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-08 00:15:14 -04:00
Robin Millette
60245f6a27 bookmarklet now uses non-fancy URLs to make sure it works in all cases. 2009-04-08 04:10:58 +00:00
Evan Prodromou
579332aa24 don't use count() to check for empty page 2009-04-07 23:57:45 -04:00
Evan Prodromou
c21335384e Merge branch '0.7.x' 2009-04-07 23:06:23 -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
5666f0e0bd add bookmarklet to main help 2009-04-07 22:50:15 -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
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
Evan Prodromou
5385692ff3 Merge branch 'master' of root@laconi.ca:/var/www/laconi.ca/software/laconica 2009-04-07 22:23:30 -04:00
Zach Copley
a8a870303e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-07 18:30:41 -07:00
Zach Copley
47d61ad211 Major improvements to Twitter bridge friend syncing 2009-04-07 18:29:10 -07: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
1371a142b1 added filler/guide text to inbox and outbox. 2009-04-08 00:27:12 +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
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
Evan Prodromou
5953d56fe2 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-07 17:12:53 -04:00
Sarven Capadisli
05b04b7970 Changed text "noone" to "no one". 2009-04-07 21:12:11 +00:00
Evan Prodromou
60861760fc Host multiple sites with the same codebase
This is the beginning of the code for status.net and related status
farms. It will read basic information about a site from a shared,
central database and use the data stored there to switch on the
hostname.
2009-04-07 17:10:54 -04:00