Evan Prodromou
bd26a80d45
Merge branch '0.8.x' into groupblock
...
Conflicts:
lib/router.php
2009-06-14 15:59:35 -07:00
Evan Prodromou
c2ba727d61
Merge branch '0.7.x' into 0.8.x
2009-06-14 15:58:19 -07:00
Evan Prodromou
203a5aba67
Some UI improvements for blocking and unblocking
...
Add unblock to the router table, so unblocking will work at all.
Block form and unblock form return to subscribers list, not
subscriptions list, by default.
showstream action sends its parameters to block and unblock forms to
better return to the right page.
2009-06-14 15:54:22 -07:00
Evan Prodromou
1c87532912
The rest of the things necessary to make group block work
...
Link to the group block form. Hide join button if the current user is
blocked.
2009-06-14 15:47:39 -07:00
Evan Prodromou
d3a0c524cc
Make group block work
2009-06-14 15:40:42 -07:00
Evan Prodromou
b6dee88e5d
add UI for blocking a user from a group
2009-06-14 15:08:00 -07:00
Evan Prodromou
10b7e8ff69
Merge branch '0.8.x' into groupblock
2009-06-14 14:55:08 -07:00
Evan Prodromou
daf2e7ef47
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 14:54:20 -07:00
Evan Prodromou
b6ef8e735b
base class SubscriptionList for some actions
2009-06-14 14:53:42 -07:00
Evan Prodromou
c2dae24701
Break profilelist into a recipe
...
Expanded the ProfileList class so it worked more like a recipe. This
helps to get rid of a lot of special cases and simplifies the code. It
also makes it possible to do things like group block.
2009-06-14 14:52:26 -07:00
Evan Prodromou
9addfeacfd
better handling of PEAR errors
2009-06-14 14:01:11 -07:00
Robin Millette
21e89d6f72
Commented all .sql fields for file/url related tables.
2009-06-14 16:06:52 -04:00
Robin Millette
7c772e1d63
Removed another bit of dead (commented out) code.
2009-06-14 15:48:46 -04:00
Evan Prodromou
f32799699c
fix perms on Group_block classes
2009-06-14 12:07:12 -07:00
Evan Prodromou
85b74d846d
create DB_DataObject classes for group block
2009-06-14 12:06:22 -07:00
Evan Prodromou
754b610ac4
added group_block table to database
2009-06-14 12:04:45 -07:00
Evan Prodromou
7f76c36f24
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 11:27:48 -07:00
Evan Prodromou
e0bdaa787d
Merge branch '0.7.x' into 0.8.x
2009-06-14 11:27:22 -07:00
Zach Copley
946d016df2
Reworked output for design settings page
2009-06-14 02:03:50 -07:00
Sarven Capadisli
77c94c44a6
Removed hanging skin crapola
2009-06-14 05:57:59 +00:00
Zach Copley
d0eb2058a5
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/showfavorites.php
lib/action.php
2009-06-14 00:23:48 +00:00
Sarven Capadisli
dbbb3a4fb5
Dynamic notice item insertion for conversation page.
2009-06-13 00:53:23 -04:00
Zach Copley
c594d99167
Child notices should have thier own ID on their LIs, not the parent's
2009-06-12 19:02:13 -07:00
Zach Copley
89d0583b91
Fixes Ticket #1607 - empty 'page-notice' definition lists were
...
being output in a bunch of places.
2009-06-12 17:06:42 -07:00
Zach Copley
79fa050125
Remove useless method
2009-06-12 17:05:31 -07:00
Zach Copley
fc6154fe4d
Add a method to check for registered event handlers
2009-06-12 16:56:43 -07:00
Sarven Capadisli
4c61f98cd0
Takes care of http://laconi.ca/trac/ticket/1372 and a minor part of
...
http://laconi.ca/trac/ticket/1367
One of the bugs was to replace foaf:knows with the weaker
sioc:follows. This is done, but foaf:knows is also retained when the
subscription is bidirectional.
Primary topic of the file is an Agent rather than a Person.
rdfs:comment replaced by bio:olb which is a fairly popular RDF
property for one-line biographies
rdf:about attribute to the <OnlineAccount> elements in a manner
consistent with the RSS 1.0 feed.
Changed the OnlineAccount's homepage property to an accountProfilePage
property. Will be added to FOAF spec soon (already widely used).
Added a <weblog> property from the Agent to their profile page.
Thanks to Toby Inkster for the patch.
http://buzzword.org.uk/2009/laconica-0.7.3-foafsioc.patch
2009-06-12 17:24:18 +00:00
Evan Prodromou
1c41afbd36
check results of add in maildaemon.php
2009-06-12 09:48:12 -07:00
Evan Prodromou
ce6285d0fc
push length check to Notice class
2009-06-12 09:47:57 -07:00
Sarven Capadisli
8524990512
http://laconi.ca/trac/ticket/1367
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:18:58 +00:00
Sarven Capadisli
4532babb6f
http://laconi.ca/trac/ticket/1370
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:15:30 +00:00
Sarven Capadisli
392c8d4a96
http://laconi.ca/trac/ticket/863
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:13:45 +00:00
Sarven Capadisli
1627fe8f33
http://laconi.ca/trac/ticket/1368 Site is the space that Container
...
sits in.
Thanks to Toby Inkster for the patch.
2009-06-12 15:42:53 +00:00
Sarven Capadisli
e2476307ba
Updated Creative Commons namespace to current.
...
Thanks to Toby Inkster for the patch.
2009-06-12 15:41:45 +00:00
Zach Copley
8064397588
Ticket #1611 and a bunch of code cleanup
2009-06-12 01:31:22 -07:00
Sarven Capadisli
eddc2af158
Files no longer needed
2009-06-11 02:10:38 +00:00
Evan Prodromou
b4e649fe90
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-10 13:52:32 -07:00
Evan Prodromou
361a52a9c8
some changes based on code review with zach
2009-06-10 13:52:15 -07:00
Robin Millette
4699fa7936
Now correctly identifiying notices with uploaded content.
2009-06-10 15:24:25 -04:00
Robin Millette
ba6beaa310
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-10 14:18:41 -04:00
Robin Millette
e120cb1a53
Uploaded content now displays in overlay (and removed var_dump crap)
2009-06-10 14:17:46 -04:00
Evan Prodromou
5469e46ef5
merge error in util.php
2009-06-10 09:14:48 -07:00
Evan Prodromou
c0853e3040
Merge branch '0.7.x' into 0.8.x
2009-06-10 09:09:57 -07:00
Evan Prodromou
1a077b0a7f
Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.7.x
2009-06-10 09:08:41 -07:00
Evan Prodromou
f4a1cd75ab
Remove FIXME-marked Opera links until they actually work
2009-06-10 08:47:46 -07:00
Evan Prodromou
a887d4fe8b
Merge branch 'userdesign' of evan@dev.controlyourself.ca:/var/www/evan into userdesign
2009-06-09 21:52:02 -07:00
Evan Prodromou
4df1ea49ec
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/designsettings.php
2009-06-09 21:51:24 -07:00
Evan Prodromou
ed627bb4bd
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-09 21:48:56 -07:00
Evan Prodromou
4110838cb4
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into dev/0.8.x
2009-06-10 04:46:20 +00:00
Robin Millette
207750e757
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-09 15:19:19 -04:00
