Robin Millette
fd6de17a4a
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-17 16:22:47 -04:00
Robin Millette
1505e3a4c3
Fixed recent attachment bug that required URLs to be posted twice to be taken into account.
2009-06-17 16:21:50 -04:00
Evan Prodromou
8384e7c7f6
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-17 08:18:33 -07:00
Zach Copley
76cbeff33c
Update background image settings to use bitflags
2009-06-17 02:35:51 -07:00
Zach Copley
3d6e30d205
Merge branch '0.8.x' into userdesign
...
* 0.8.x:
Moved url handling to its proper place, from newnotice to Notice.php
Removed more dead code.
Brought back borders for content, navigation, aside_primary but
Minor margin value change
More contrast for tabs
UI updates:
2009-06-16 22:24:11 -07:00
Zach Copley
d1ae3176b6
Enable tiling of background imgs for Designs
2009-06-16 22:18:25 -07:00
Evan Prodromou
312fd85532
names for Notice_inbox source values
2009-06-16 21:37:19 -07:00
Evan Prodromou
90b2b3f9d1
names for Notice is_local states
2009-06-16 21:37:04 -07:00
Zach Copley
7b7f119428
Added background image tile flag to Design
2009-06-16 21:36:15 -07:00
Robin Millette
befbfc9c73
Moved url handling to its proper place, from newnotice to Notice.php
2009-06-16 23:10:17 -04:00
Zach Copley
bc1f877f6e
Design settings now save and displays backgrounds
2009-06-16 19:17:37 -07:00
Zach Copley
ab10db9bd1
Merge branch '0.8.x' into userdesign
...
* 0.8.x:
Revert "Using neutral colour for notice hover"
Using neutral colour for notice hover
forgot to disinherit Memcached_DataObject in Status_network
Add some basic memcached handling to status_network
2009-06-16 00:59:57 -07:00
Zach Copley
37cafad2e0
Another minor tweak to showCSS() CSS output
2009-06-15 22:43:06 -07:00
Zach Copley
f3199c1369
Some fixups to the CSS output of showCSS()
2009-06-15 22:39:53 -07:00
Zach Copley
4652f316cf
Design class now uses WebColor class for outputting hex colors
2009-06-15 22:27:59 -07:00
Zach Copley
ef99f83963
Output custom stylesheets on design sub-Actions
2009-06-15 22:13:35 -07:00
Evan Prodromou
39117bf88c
forgot to disinherit Memcached_DataObject in Status_network
2009-06-15 21:55:56 -07:00
Evan Prodromou
0a886868fb
Add some basic memcached handling to status_network
...
Status_network can't be a subclass of Memcached_DataObject -- the
latter is too entrenched in Laconica's memc handling functions, which
aren't loaded when Status_network is running! But the importance of
caching these values can't be overstated. So, a considerably
slimmed-down version of the Memcached_DataObject code is transcribed
into Status_network.
2009-06-15 21:33:56 -07:00
Zach Copley
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
Evan Prodromou
8c24a3bc92
a little better query handling in redirect code
2009-06-15 16:55:01 -07:00
Evan Prodromou
f809663245
a little better query handling in redirect code
2009-06-15 16:51:49 -07:00
Evan Prodromou
2f82a3d44c
forgot some functions aren't available at status time
2009-06-15 16:43:39 -07:00
Evan Prodromou
587b7a8b2a
redirect on non-canonical server name
2009-06-15 16:40:53 -07:00
Evan Prodromou
6532f0dff6
strncmp -> strcasecmp
2009-06-15 14:29:25 -07:00
Evan Prodromou
d6ff702d7f
Return network from network setup function
...
Return the network from the network setup function. Also, special-case
for when we get a server name the same as the wildcard.
2009-06-15 13:34:52 -07:00
Zach Copley
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
Evan Prodromou
c077ad0775
Configurable avatar directory
...
Avatar directory and path are configurable.
2009-06-15 10:45:50 -07:00
Evan Prodromou
eb6a60ef88
updates to Status_network
2009-06-15 08:54:52 -07:00
Evan Prodromou
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
Evan Prodromou
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
Evan Prodromou
09c765f5bb
Merge branch '0.8.x' into groupalias
2009-06-14 21:53:45 -07:00
Evan Prodromou
23fd58b74c
fix perms for classes/statusnet.ini
2009-06-14 21:53:29 -07:00
Evan Prodromou
a4055fc2f9
fixup perms for classes
2009-06-14 21:53:09 -07:00
Evan Prodromou
2d63daa71c
Added Group_alias class
2009-06-14 21:52:31 -07:00
Evan Prodromou
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
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
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
e0bdaa787d
Merge branch '0.7.x' into 0.8.x
2009-06-14 11:27:22 -07: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
Evan Prodromou
ce6285d0fc
push length check to Notice class
2009-06-12 09:47:57 -07: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
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
Robin Millette
27af3c67a2
Improve file upload and attachment interface.
2009-06-09 15:18:12 -04: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
Robin Millette
f8dae2bbc9
Refactored some attachment code and fixed upload bug in interface.
2009-05-31 21:03:55 -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
Evan Prodromou
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
Evan Prodromou
76ee1fd5da
Removing inbox and memcached daemon handling
2009-05-30 04:40:47 -04:00
Evan Prodromou
7656277313
remove debug code from replies
2009-05-30 03:02:26 -04:00
Evan Prodromou
78968a31a7
check for since=0 in Notice::stream()
2009-05-30 00:49:14 -04:00
Zach Copley
425f9d703c
Ticket #1567 - Change max_id to return notices <= ID instead of < ID
2009-05-29 16:54:24 -07:00
Zach Copley
eb76a3bbb3
Ticket #1567 - API: Change before_id parameter to max_id
2009-05-29 16:32:55 -07: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
Zach Copley
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
Evan Prodromou
d068680e19
optionally use SET NAMES for utf8 to DB
2009-05-27 14:57:45 -04:00
Evan Prodromou
b3bb8943f5
Merge branch '0.7.x' into utf8
2009-05-27 14:52:35 -04:00
Robin Millette
ed1e1d9f44
Handles local aliases (redirection) for file uploads attached to notices.
2009-05-27 03:47:45 -04:00
Evan Prodromou
d7e3bab0b8
fix require_once in Design.php
2009-05-23 23:34:05 -04:00
Evan Prodromou
705abf31ee
add getDesign to User
2009-05-23 23:27:42 -04:00
Evan Prodromou
91fc1e36bc
update User.php with new design-related fields
2009-05-23 23:26:29 -04:00
Evan Prodromou
3f5252c168
add fields to support designs for users
2009-05-22 23:43:08 -04:00
Evan Prodromou
748c744a02
add a method to Design to show custom CSS
2009-05-22 23:13:09 -04:00
Evan Prodromou
95104f38f2
Merge branch '0.8.x' into userdesign
2009-05-22 21:11:54 -04:00
Evan Prodromou
68d90bcab0
some class files had x bit set
2009-05-22 21:11:46 -04:00
Evan Prodromou
21aad16b58
fix x bit on Design.php
2009-05-22 21:10:27 -04:00
Evan Prodromou
c63622f05e
add design classes
2009-05-22 21:10:00 -04:00
Evan Prodromou
d216e3bbbb
fix x bit on laconica.ini
2009-05-22 21:08:58 -04:00
Evan Prodromou
59340b274a
laconica.ini change after automated createTables.php
2009-05-22 21:08:22 -04:00
Robin Millette
9261e48ef0
Removed dead code.
2009-05-18 19:23:18 -04:00
Robin Millette
0271859c24
Added personal tag page: http://example.com/MY_NICK/tag/A_TAG
2009-05-18 17:18:57 -04:00
Robin Millette
5897dfa4c3
Refactored new sections code to proper classes and added notice link to links in notice sections.
2009-05-17 22:06:08 -04:00
Robin Millette
fecb8c706d
Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments.
2009-05-15 15:04:58 -04:00
Robin Millette
3b7ee5a5f9
rewrote short url stuff to handle new file/url classes (redirections, oembed, mimetypes, etc.)
2009-05-13 14:27:32 -04:00
Robin Millette
d010d811ba
db stuff for URLs: redirections, oembed, etc.
2009-05-11 13:45:00 -04:00
Zach Copley
3e7b1e69e3
Added dirty dates to Foreign_link
2009-05-07 15:55:04 -07:00
Sarven Capadisli
aaeed091d2
Merge branch '0.7.x' into 0.8.x
2009-05-05 22:54:46 +00:00
Evan Prodromou
5314d9b2cf
make faves work with ids
2009-05-01 12:01:28 -07:00
Evan Prodromou
021b520a11
Make user group stream use IDs
2009-05-01 11:38:50 -07:00
Evan Prodromou
3328ec545c
make profile notice getting use ids
2009-05-01 11:27:57 -07:00
Sarven Capadisli
d30df07908
Merge branch '0.7.x' into 0.8.x
...
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
2009-05-01 00:16:25 +00:00
Evan Prodromou
aee641ee1e
make replies use new query format
2009-04-29 20:45:33 -04:00
Evan Prodromou
1e8ea1eb46
Make the tag stream use ID mechanism
2009-04-29 16:09:03 -04:00
Evan Prodromou
a4d959b8a2
Public stream uses IDs method
...
Public stream now uses IDs method
2009-04-29 12:05:31 -04:00
Evan Prodromou
10ef8a2f71
Move algorithm for caching to Notice class
...
Moved the algorithm for notice stream caching to the Notice class.
2009-04-29 11:27:45 -04:00
Zach Copley
f798d1ea43
Added dirty dates to Foreign_link
2009-04-28 17:08:20 -07:00
Evan Prodromou
fe53e780be
Remove some debug comments in query-by-id
2009-04-28 13:31:56 -04:00
Evan Prodromou
c7105c2af1
Change to avoid a join in notice inbox
...
The join in notice_inbox is causing temp-table sorting on identi.ca,
so I'm trying a finer-tuned approach.
2009-04-28 13:07:05 -04:00
Evan Prodromou
ce5b98ca01
Merge branch '0.7.x' into querybyid
2009-04-27 16:55:07 -04:00
Evan Prodromou
698228acb9
Revert "Revert "run 'set names' after each connection to deal with UTF8 correctly""
...
This reverts commit 86770ccde7
.
2009-04-26 13:16:59 -04:00
Evan Prodromou
86770ccde7
Revert "run 'set names' after each connection to deal with UTF8 correctly"
...
This reverts commit 84072aa5cf
.
This commit caused grievous harm to old notices on identi.ca.
Reverting until we figure out how to convert the old notices.
2009-04-26 12:28:20 -04:00
Evan Prodromou
068f6801cc
Revert "run 'set names' after each connection to deal with UTF8 correctly"
...
This reverts commit 84072aa5cf
.
This commit caused grievous harm to old notices on identi.ca.
Reverting until we figure out how to convert the old notices.
2009-04-26 12:27:32 -04:00
Evan Prodromou
a7089de228
run 'set names' after each connection to deal with UTF8 correctly
2009-04-26 12:14:04 -04:00
Evan Prodromou
84072aa5cf
run 'set names' after each connection to deal with UTF8 correctly
2009-04-26 12:13:49 -04:00