6c7bdf9df6
Merge branch 'userdesign' into 0.8.x
...
* userdesign: (56 commits)
Fix for background image repetition for various page heights
Removed height:100% for better background image repetition
A little more specific selector for notice reply
Have user favorites page show user's design
Placed a check to make sure there is a reply button in a notice before
Make MailboxAction read only
Remove stale reference to deprecated personal.php
Uppercase hex color values
Default to image being on, no tile after upload
Fix sidebar color bug default design
Update background image settings to use bitflags
It was accidently removed
Dynamically tile background image and turn background image on or off
Show a background img in settings form
IE7/8 CSS update for user design
Enable tiling of background imgs for Designs
Added background image tile flag to Design
Init styles for tile and image use on/off for user design settings
Added form option to tile background image and to turn it on and off
Add background dir
...
2009-06-17 18:49:25 -07:00
b0591cd982
Make MailboxAction read only
2009-06-17 17:29:57 -07:00
4fc4c0a74b
Remove stale reference to deprecated personal.php
2009-06-17 17:13:59 -07:00
2187ec7056
hide group name and aliases in group tag cloud section
2009-06-17 15:20:44 -07:00
164588ef0f
Merge branch '0.8.x' into userdesign
2009-06-17 21:40:52 +00:00
cd1361fe96
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-17 14:36:33 -07:00
8992e8fa7a
Ticket 1612 - make destory (and create) favorites work via API
2009-06-17 14:34:04 -07:00
7e25a7f3aa
Output XML and JSON error msgs for API calls
2009-06-17 14:32:36 -07:00
b58dc5e961
Added config option to enable or disable file uploads with notices.
2009-06-17 16:55:01 -04:00
28d02ec8cd
Make oohembed endpoint configurable.
2009-06-17 16:44:33 -04:00
af4b18b1e2
Uppercase hex color values
2009-06-17 03:05:48 -07:00
76cbeff33c
Update background image settings to use bitflags
2009-06-17 02:35:51 -07:00
d1ae3176b6
Enable tiling of background imgs for Designs
2009-06-16 22:18:25 -07:00
bc1f877f6e
Design settings now save and displays backgrounds
2009-06-16 19:17:37 -07:00
c3c30aa0ea
Check to make sure a design exists before trying to display it
2009-06-15 23:18:54 -07:00
ef99f83963
Output custom stylesheets on design sub-Actions
2009-06-15 22:13:35 -07:00
44343986c3
Merge branch '0.8.x' into userdesign
...
* 0.8.x:
a little better query handling in redirect code
a little better query handling in redirect code
forgot some functions aren't available at status time
redirect on non-canonical server name
don't show create-a-group link if not logged in
allow a configured base for cache keys
Missing call to getProfile() caused verify_credentials to fail.
change mods for setup script
Script to set up new status networks
strncmp -> strcasecmp
Return network from network setup function
Configurable avatar directory
2009-06-15 21:24:22 -07:00
e7e3709ae0
Throw an WebColorException if wrong # of hex chars
2009-06-15 21:21:33 -07:00
20d9350877
User design setting save now
2009-06-15 20:21:33 -07:00
fd290fc3f9
allow a configured base for cache keys
2009-06-15 16:09:40 -07:00
92f095f589
Merge branch '0.8.x' into userdesign
...
* 0.8.x: (32 commits)
updates to Status_network
makeadmin action
make admins of groups
show aliases when showing a group
Link and distribute notices tagged for a group alias
Code for adding and saving group aliases
Styles for group block
add correct li for css magic for block stuff
typo in profileminilist class
return count from show
try to get the right class for profileminilist
fix perms for classes/statusnet.ini
fixup perms for classes
Added Group_alias class
add a table for group aliases
Cross-browser notice_attach
Allow users to be unblocked from a group
Some UI improvements for blocking and unblocking
The rest of the things necessary to make group block work
Make group block work
...
Conflicts:
db/laconica.sql
lib/common.php
2009-06-15 11:50:08 -07:00
c077ad0775
Configurable avatar directory
...
Avatar directory and path are configurable.
2009-06-15 10:45:50 -07:00
2b8a767770
make admins of groups
2009-06-15 00:59:15 -07:00
4dad3191f6
Merge branch 'groupalias' into 0.8.x
2009-06-14 23:48:24 -07:00
1b6b00a6d0
Link and distribute notices tagged for a group alias
...
Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
2009-06-14 23:43:47 -07:00
ecbd7718d5
Code for adding and saving group aliases
...
Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three.
2009-06-14 23:37:24 -07:00
c0f3204a10
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 22:09:59 -07:00
7097804eeb
typo in profileminilist class
2009-06-14 22:09:17 -07:00
bef643352d
return count from show
2009-06-14 22:09:04 -07:00
ee8dd62038
try to get the right class for profileminilist
2009-06-14 22:07:27 -07:00
8dd5871d4f
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-06-15 03:26:32 +00:00
0bc9b2e730
Cross-browser notice_attach
2009-06-15 03:21:15 +00:00
f8da15bf41
Allow users to be unblocked from a group
...
List users who are blocked from joining a group. Add a form to let
them be unblocked. Add an action that removes the block. Includes
changes to group and groupblock classes.
2009-06-14 16:17:44 -07:00
bd26a80d45
Merge branch '0.8.x' into groupblock
...
Conflicts:
lib/router.php
2009-06-14 15:59:35 -07:00
c2ba727d61
Merge branch '0.7.x' into 0.8.x
2009-06-14 15:58:19 -07:00
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
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
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
b6ef8e735b
base class SubscriptionList for some actions
2009-06-14 14:53:42 -07:00
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
7c772e1d63
Removed another bit of dead (commented out) code.
2009-06-14 15:48:46 -04:00
946d016df2
Reworked output for design settings page
2009-06-14 02:03:50 -07:00
77c94c44a6
Removed hanging skin crapola
2009-06-14 05:57:59 +00:00
d0eb2058a5
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/showfavorites.php
lib/action.php
2009-06-14 00:23:48 +00:00
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
fc6154fe4d
Add a method to check for registered event handlers
2009-06-12 16:56:43 -07:00
8524990512
http://laconi.ca/trac/ticket/1367
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:18:58 +00:00
4532babb6f
http://laconi.ca/trac/ticket/1370
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:15:30 +00:00
392c8d4a96
http://laconi.ca/trac/ticket/863
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:13:45 +00:00
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
e2476307ba
Updated Creative Commons namespace to current.
...
Thanks to Toby Inkster for the patch.
2009-06-12 15:41:45 +00:00
8064397588
Ticket #1611 and a bunch of code cleanup
2009-06-12 01:31:22 -07:00
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
e120cb1a53
Uploaded content now displays in overlay (and removed var_dump crap)
2009-06-10 14:17:46 -04:00
5469e46ef5
merge error in util.php
2009-06-10 09:14:48 -07:00
c0853e3040
Merge branch '0.7.x' into 0.8.x
2009-06-10 09:09:57 -07:00
f4a1cd75ab
Remove FIXME-marked Opera links until they actually work
2009-06-10 08:47:46 -07:00
4df1ea49ec
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/designsettings.php
2009-06-09 21:51:24 -07:00
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
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
27af3c67a2
Improve file upload and attachment interface.
2009-06-09 15:18:12 -04:00
3aebd847e7
Added title and minor CSS cleanup to notice attach
2009-06-09 17:34:33 +00:00
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
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
2c81d8db76
don't send smses to sender
2009-06-05 10:07:26 -07:00
b708b81065
Init notice_data-attach UI for form_notice
2009-06-05 00:00:04 -04:00
6658e2a2ee
Handle the ways Twitter accepts passing the user in the query string.
2009-06-04 17:57:03 -04:00
fe38827a76
Remove js that crept back in, added another error string.
2009-06-01 17:40:53 -04:00
0cbd72e092
Re-added some javascript to toggle upload field.
2009-06-01 15:52:52 -04:00
4bd195b80f
Fixed small bug for attachment layout (css/js).
2009-06-01 19:40:39 +00:00
95bcc5afa1
Updated markup for notice form attachment
2009-06-01 15:18:23 -04:00
683b835c3e
Attachments popups for supported files are now embedded with the object xhtml tag.
2009-06-01 14:02:59 -04:00
f8dae2bbc9
Refactored some attachment code and fixed upload bug in interface.
2009-05-31 21:03:55 -04:00
abe68f4318
Added attachments config descriptions to README.
2009-05-31 18:33:38 -04:00
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
3e0c291810
Added configurable options for attachments: supported mimetypes and quotas for uploads.
2009-05-31 16:42:29 -04:00
76ee1fd5da
Removing inbox and memcached daemon handling
2009-05-30 04:40:47 -04:00
45c58c74d4
take debug code out of omb.php
2009-05-30 03:31:26 -04:00
78f8b91a13
Ticket #1568 - API should return full user objects
2009-05-29 19:23:53 -07:00
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
b8de793556
Changed ul to ol and added xoxo for notice lists.
2009-05-29 02:38:38 +00:00
a456ceb47c
Merge branch '0.7.x' into 0.8.x
2009-05-29 00:10:23 +00:00
3532cd0490
Only enqueue inbox-dependent transports after inboxes have been filled
2009-05-28 18:19:22 -04:00
60ac9bc6fd
Bunch of UI fixes/improvements for attachments (hover, overlay, notice view,
...
clip)
2009-05-27 19:43:43 +00:00
d068680e19
optionally use SET NAMES for utf8 to DB
2009-05-27 14:57:45 -04:00
ed1e1d9f44
Handles local aliases (redirection) for file uploads attached to notices.
2009-05-27 03:47:45 -04:00
37423b12d7
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
2009-05-26 23:46:37 -04:00
648d967226
Merge branch '0.8.x' into userdesign
...
Conflicts:
lib/attachmentlist.php
lib/noticelist.php
2009-05-26 23:24:01 -04:00
af700ea277
Let's you upload a file with a notice and have it shown with other attachments.
2009-05-26 21:20:04 -04:00
2b81dcb253
Better err handling when trying to get Facebook client
2009-05-27 00:01:39 +00:00
a497114a55
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-26 23:22:29 +00:00
69a656af22
Some adjustments to allow the Facebook app work with Laconica 0.8
2009-05-26 23:21:10 +00:00
0b53a820c2
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-26 17:28:12 -04:00
da035331d8
fixes during checking of snapshot
2009-05-26 17:26:31 -04:00
c93031c2aa
Reusing base stylesheet (instead of hoping for FB to import it) in FB
...
app.
2009-05-26 03:34:00 +00:00
76aa85fe5e
Merge branch '0.8.x' into stats
...
Conflicts:
README
2009-05-25 22:47:23 -04:00
0e8358bd23
Updated stylesheet paths for facebook app
2009-05-26 02:34:36 +00:00
a598dcccba
Really removing the old files, thanks git!
2009-05-25 19:58:31 +00:00
959dce823f
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-05-25 15:53:49 -04:00
01dad57298
Markup cleanup for attachments
2009-05-25 15:53:19 -04:00
Zach Copley
Evan Prodromou
Zach Copley
Robin Millette
Sarven Capadisli
Dan Moore
Robin Millette
Sarven Capadisli