Commit Graph

9622 Commits

Author SHA1 Message Date
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
Evan Prodromou
1116526f08 fixed pagination variable problem 2009-03-25 12:32:46 -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
d92926f892 Fix to Net_URL_Mapper to make search pagination work. See Ticket #1333 2009-03-25 12:24:22 -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
Brian
03eb81d3b7 how to configure templating 2009-03-24 12:45:26 -07:00
Brian
c8343e75fc tpl/index.php 0.1 2009-03-24 12:42:42 -07:00
Brian
af887119ac TemplatePlugin.php 0.1 2009-03-24 12:41:03 -07: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
24ce3928e3 fix sql error in notice source script 2009-03-23 16:37:13 -04: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
3070a9597c Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-22 17:06:19 -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
Sarven Capadisli
fadae96a74 Password recover and change form markup updated. 2009-03-22 20:21:32 +00: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
Evan Prodromou
92da8a59cb add Mobidentica 2009-03-22 10:51:00 -04:00
CiaranG
d64be5108d Fix to Net_URL_Mapper to make search pagination work. See Ticket #1333 2009-03-21 14:24:19 +00: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
a9a71297f4 Use correct page information for notice search. See ticket #1333 2009-03-20 22:02:35 +00:00
CiaranG
b4c273113c A couple more 'Join Now' messages that need disabling when the site is closed or invite only 2009-03-19 21:55:03 +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
CiaranG
0e1186dfd0 Get rid of 'Join now...' message if site is closed or invite only. See ticket #1335 2009-03-19 18:08:49 +00:00
Evan Prodromou
8f64c247fd redirect to original URL or URI for remote notices 2009-03-19 11:38:25 -04:00
Evan Prodromou
3d8a8aa03c redirect to original URL or URI for remote notices 2009-03-19 11:36:24 -04: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
Brenda Wallace
c2e529c72b quoted the users table 2009-03-17 10:27:29 +13:00
Tobias Diekershoff
25e9e2b83f Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x 2009-03-15 07:56:00 +01:00
Evan Prodromou
227514d525 Merge branch 'master' into 0.7.x 2009-03-14 23:26:20 -04:00
Evan Prodromou
3eff673a0f Add Adium to notice sources 2009-03-14 23:25:43 -04:00