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
eb6a60ef88
updates to Status_network
2009-06-15 08:54:52 -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
09c765f5bb
Merge branch '0.8.x' into groupalias
2009-06-14 21:53:45 -07:00
23fd58b74c
fix perms for classes/statusnet.ini
2009-06-14 21:53:29 -07:00
a4055fc2f9
fixup perms for classes
2009-06-14 21:53:09 -07:00
2d63daa71c
Added Group_alias class
2009-06-14 21:52:31 -07: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
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
f32799699c
fix perms on Group_block classes
2009-06-14 12:07:12 -07:00
85b74d846d
create DB_DataObject classes for group block
2009-06-14 12:06:22 -07:00
e0bdaa787d
Merge branch '0.7.x' into 0.8.x
2009-06-14 11:27:22 -07:00
d0eb2058a5
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/showfavorites.php
lib/action.php
2009-06-14 00:23:48 +00:00
ce6285d0fc
push length check to Notice class
2009-06-12 09:47:57 -07:00
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
361a52a9c8
some changes based on code review with zach
2009-06-10 13:52:15 -07:00
4699fa7936
Now correctly identifiying notices with uploaded content.
2009-06-10 15:24:25 -04: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
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
27af3c67a2
Improve file upload and attachment interface.
2009-06-09 15:18:12 -04: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
f8dae2bbc9
Refactored some attachment code and fixed upload bug in interface.
2009-05-31 21:03:55 -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
9e16b7d89b
Use mysql_set_charset for connection instead of SET NAMES
...
PHP doesn't get the info about the charset of the connection if
you use SET NAMES. So, we use the appropriate PHP function instead.
2009-05-30 13:59:57 -04:00
76ee1fd5da
Removing inbox and memcached daemon handling
2009-05-30 04:40:47 -04:00
7656277313
remove debug code from replies
2009-05-30 03:02:26 -04:00
78968a31a7
check for since=0 in Notice::stream()
2009-05-30 00:49:14 -04:00
425f9d703c
Ticket #1567 - Change max_id to return notices <= ID instead of < ID
2009-05-29 16:54:24 -07:00
eb76a3bbb3
Ticket #1567 - API: Change before_id parameter to max_id
2009-05-29 16:32:55 -07: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
3d13a44b66
Upgraded foreign_id column to handle new 64-bit Facebook user IDs.
...
See: http://developers.facebook.com/news.php?blog=1&story=226
2009-05-27 17:59:49 -07:00
d068680e19
optionally use SET NAMES for utf8 to DB
2009-05-27 14:57:45 -04:00
b3bb8943f5
Merge branch '0.7.x' into utf8
2009-05-27 14:52:35 -04:00
ed1e1d9f44
Handles local aliases (redirection) for file uploads attached to notices.
2009-05-27 03:47:45 -04:00
d7e3bab0b8
fix require_once in Design.php
2009-05-23 23:34:05 -04:00
705abf31ee
add getDesign to User
2009-05-23 23:27:42 -04:00
91fc1e36bc
update User.php with new design-related fields
2009-05-23 23:26:29 -04:00
3f5252c168
add fields to support designs for users
2009-05-22 23:43:08 -04:00
748c744a02
add a method to Design to show custom CSS
2009-05-22 23:13:09 -04:00
95104f38f2
Merge branch '0.8.x' into userdesign
2009-05-22 21:11:54 -04:00
68d90bcab0
some class files had x bit set
2009-05-22 21:11:46 -04:00
21aad16b58
fix x bit on Design.php
2009-05-22 21:10:27 -04:00
c63622f05e
add design classes
2009-05-22 21:10:00 -04:00
d216e3bbbb
fix x bit on laconica.ini
2009-05-22 21:08:58 -04:00
59340b274a
laconica.ini change after automated createTables.php
2009-05-22 21:08:22 -04:00
9261e48ef0
Removed dead code.
2009-05-18 19:23:18 -04:00
Zach Copley
Evan Prodromou
Robin Millette
Sarven Capadisli