Commit Graph

1710 Commits

Author SHA1 Message Date
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
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
Robin Millette
7c772e1d63 Removed another bit of dead (commented out) code. 2009-06-14 15:48:46 -04:00
Sarven Capadisli
77c94c44a6 Removed hanging skin crapola 2009-06-14 05:57:59 +00: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
fc6154fe4d Add a method to check for registered event handlers 2009-06-12 16:56:43 -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
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
f4a1cd75ab Remove FIXME-marked Opera links until they actually work 2009-06-10 08:47:46 -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
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
Robin Millette
27af3c67a2 Improve file upload and attachment interface. 2009-06-09 15:18:12 -04:00
Sarven Capadisli
3aebd847e7 Added title and minor CSS cleanup to notice attach 2009-06-09 17:34:33 +00:00
Evan Prodromou
adfb79a9bb Merge branch '0.7.x' into 0.8.x
Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
2009-06-08 11:55:32 -07:00
Evan Prodromou
038cd8ac25 Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.7.x 2009-06-06 09:55:17 -07:00
Evan Prodromou
2c81d8db76 don't send smses to sender 2009-06-05 10:07:26 -07:00
Sarven Capadisli
b708b81065 Init notice_data-attach UI for form_notice 2009-06-05 00:00:04 -04:00
Dan Moore
6658e2a2ee Handle the ways Twitter accepts passing the user in the query string. 2009-06-04 17:57:03 -04:00
Robin Millette
fe38827a76 Remove js that crept back in, added another error string. 2009-06-01 17:40:53 -04:00
Robin Millette
0cbd72e092 Re-added some javascript to toggle upload field. 2009-06-01 15:52:52 -04:00
Robin Millette
4bd195b80f Fixed small bug for attachment layout (css/js). 2009-06-01 19:40:39 +00:00
Sarven Capadisli
95bcc5afa1 Updated markup for notice form attachment 2009-06-01 15:18:23 -04:00
Robin Millette
683b835c3e Attachments popups for supported files are now embedded with the object xhtml tag. 2009-06-01 14:02:59 -04:00
Robin Millette
f8dae2bbc9 Refactored some attachment code and fixed upload bug in interface. 2009-05-31 21:03:55 -04:00
Robin Millette
abe68f4318 Added attachments config descriptions to README. 2009-05-31 18:33:38 -04:00
Robin Millette
ebeb5f744c Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
Conflicts:

	js/util.js
	lib/attachmentlist.php
2009-05-31 17:12:04 -04:00
Robin Millette
3e0c291810 Added configurable options for attachments: supported mimetypes and quotas for uploads. 2009-05-31 16:42:29 -04:00
Evan Prodromou
76ee1fd5da Removing inbox and memcached daemon handling 2009-05-30 04:40:47 -04:00
Evan Prodromou
45c58c74d4 take debug code out of omb.php 2009-05-30 03:31:26 -04:00
Zach Copley
78f8b91a13 Ticket #1568 - API should return full user objects 2009-05-29 19:23:53 -07:00
Evan Prodromou
f66e996073 Update version number to 0.7.4
Updated the version number to 0.7.4, added the new song title, and
documented the changes since 0.7.3.
2009-05-29 16:28:39 -04:00
Sarven Capadisli
b8de793556 Changed ul to ol and added xoxo for notice lists. 2009-05-29 02:38:38 +00:00
Sarven Capadisli
a456ceb47c Merge branch '0.7.x' into 0.8.x 2009-05-29 00:10:23 +00:00
Evan Prodromou
3532cd0490 Only enqueue inbox-dependent transports after inboxes have been filled 2009-05-28 18:19:22 -04:00
Sarven Capadisli
60ac9bc6fd Bunch of UI fixes/improvements for attachments (hover, overlay, notice view,
clip)
2009-05-27 19:43:43 +00:00
Evan Prodromou
d068680e19 optionally use SET NAMES for utf8 to DB 2009-05-27 14:57:45 -04:00
Robin Millette
ed1e1d9f44 Handles local aliases (redirection) for file uploads attached to notices. 2009-05-27 03:47:45 -04:00