Evan Prodromou
638905c270
avoid getting duplicate errors on upload
2009-06-25 11:10:34 -07:00
Evan Prodromou
4d56bc6a0a
streamline the file action
2009-06-25 11:08:32 -07:00
Evan Prodromou
3ca9e85ce4
update conversations to use newer query format
2009-06-25 09:43:30 -07:00
Brenda Wallace
bd9824c8d5
added missing conversation column to group by
2009-06-25 22:35:41 +12:00
Zach Copley
e3c5d1664f
Take out noisy debugging statement
2009-06-24 16:10:28 -07:00
Zach Copley
98f518b9af
fix bug in which design background could accidentally get removed
2009-06-24 00:00:36 -07:00
Zach Copley
57903bf2ac
Make gateway notices available to the auth user in the API
2009-06-23 15:53:49 -07:00
Zach Copley
f04a54ed2f
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
...
* '0.8.x' of git@gitorious.org:laconica/dev: (61 commits)
Using default theme design values (it was previously set to identica
Updated default colour theme and IE6 colours for transparent values
chmod +x delete_status_network.sh
rm -Rf, not rmdir
script to delete a status network
chmod allsites.php
script to show all sites on a network
use different name for connection and database
use /etc/laconica/setup.cfg instead of local file
other base directories
On XHR notice post, calls NoticeAttachment to trigger thumbnail and
oembed and thumbnail don't need sequences
add innodb by default to status networks
pwgen not pwdgen
make pwgen command configurable
a little sql script to drop full-text index and use innodb for profile and notice
remove common_debug from newnotice
append uploads to content rather than showing them double
use a subclass for single notice items to show attachments
make file command configurable
...
2009-06-23 14:29:46 -07:00
Zach Copley
31325f0995
Stop Twitter gateway notices from leaking via user faves pages
2009-06-23 13:51:23 -07:00
Jeffery To
280f8faab4
Merge branch '0.8.x' into small-fixes
...
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
2009-06-24 01:25:55 +08:00
Jeffery To
65f784120b
Merge branch '0.8.x' into notice-search-no-results
2009-06-24 01:18:35 +08:00
Evan Prodromou
e261a97150
remove common_debug from newnotice
2009-06-23 07:48:33 -07:00
Evan Prodromou
a21a9f26c5
append uploads to content rather than showing them double
2009-06-23 07:29:43 -07:00
Evan Prodromou
e2becdb251
use a subclass for single notice items to show attachments
2009-06-23 07:25:18 -07:00
Evan Prodromou
7bcaa858af
make file command configurable
2009-06-23 05:35:20 -07:00
Zach Copley
d9bebfd651
Attachment upload server and path now configurable
2009-06-22 22:48:31 +00:00
Evan Prodromou
aec6456c91
Update copyright dates in files modified in 2009
2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155
change Controlez-Vous to Control Yourself
2009-06-20 16:00:04 -07:00
Evan Prodromou
3f54840b51
Only show twitter msgs in your own inbox
2009-06-18 11:45:48 -07:00
Evan Prodromou
3a0c6d6c6d
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-18 07:45:06 -07:00
Zach Copley
3f032bc36e
Left out some new user and group theming file in the previous commit
2009-06-18 02:16:39 -07:00
Zach Copley
57274d21ba
Group theming.
2009-06-18 02:01:06 -07:00
Evan Prodromou
ba3a484a65
order notices in a conversation
2009-06-18 00:12:53 -07:00
Zach Copley
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
Zach Copley
06240450ef
Have user favorites page show user's design
2009-06-17 18:05:12 -07:00
Evan Prodromou
420e8994f8
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into taggedprofile
2009-06-17 15:05:24 -07:00
Evan Prodromou
07f5797f2f
Make the personal tag streams actually work
2009-06-17 15:04:57 -07:00
Zach Copley
164588ef0f
Merge branch '0.8.x' into userdesign
2009-06-17 21:40:52 +00:00
Zach Copley
8992e8fa7a
Ticket 1612 - make destory (and create) favorites work via API
2009-06-17 14:34:04 -07:00
Evan Prodromou
2fbd141361
correct arguments for ProfileList
2009-06-17 08:21:53 -07:00
Zach Copley
ac3cccefb5
Default to image being on, no tile after upload
2009-06-17 03:02:43 -07:00
Zach Copley
2866d00517
Fix sidebar color bug default design
2009-06-17 02:58:35 -07:00
Zach Copley
76cbeff33c
Update background image settings to use bitflags
2009-06-17 02:35:51 -07:00
Sarven Capadisli
4c640aace9
Updated markup yes/no form actions to be consistent with the rest of the site
2009-06-17 08:14:01 +00:00
Sarven Capadisli
7148ea86df
Dynamically tile background image and turn background image on or off
...
in user design
2009-06-17 06:23:57 +00:00
Zach Copley
a0618b0e33
Show a background img in settings form
2009-06-16 22:57:28 -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
Sarven Capadisli
bea2fa1506
Added form option to tile background image and to turn it on and off
2009-06-17 04:09:30 +00: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
Robin Millette
54697e5298
Removed more dead code.
2009-06-16 19:38:27 -04:00
Eric Helgeson
4450f3352c
Needed the else. Tested logged in/out ; site closed/inviteonly/both
2009-06-16 17:18:48 -05:00
Zach Copley
6d5d0b3472
Update wasn't ever getting called
2009-06-16 00:56:32 -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
Sarven Capadisli
2c7f0534ca
Typo/lowercased WebColor to webcolor in required_once
2009-06-16 04:03:08 +00:00
Zach Copley
94fec28610
User design setting save
2009-06-15 20:29:30 -07:00
Zach Copley
20d9350877
User design setting save now
2009-06-15 20:21:33 -07:00
Evan Prodromou
fbed704f3b
don't show create-a-group link if not logged in
2009-06-15 16:22:08 -07:00
Zach Copley
12cd87cd7b
Missing call to getProfile() caused verify_credentials to fail.
2009-06-15 22:50:14 +00:00
Zach Copley
807d84d448
Small fix to correct the order of defined color prefs
2009-06-15 12:57:08 -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
528ceec3fe
makeadmin action
2009-06-15 05:44:36 -07:00
Evan Prodromou
2b8a767770
make admins of groups
2009-06-15 00:59:15 -07:00
Evan Prodromou
dda4493af7
show aliases when showing a group
2009-06-14 23:51:38 -07:00
Evan Prodromou
4dad3191f6
Merge branch 'groupalias' into 0.8.x
2009-06-14 23:48:24 -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
2f3c4f8812
add correct li for css magic for block stuff
2009-06-14 22:16:24 -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
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
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
Zach Copley
946d016df2
Reworked output for design settings page
2009-06-14 02:03:50 -07:00
Jeffery To
43680ed0c2
Fixes two PHP Warnings ("Invalid argument supplied for foreach() in /var/www/mmmu/lib/rssaction.php") when accessing the RSS feed of a group that has no notices.
2009-06-14 17:03:22 +08:00
Jeffery To
f7d488d4b2
Fixes the notice search RSS feeds / API results for searches that return no matches.
...
If a user does a notice search that should return no matching notices, the RSS feed / API results for that search currently returns all notices instead of no notices. This fixes it so that an empty list is returned instead.
2009-06-14 16:39:31 +08:00
Jeffery To
6d308f6ffe
Adds $config['invite']['enabled'] to enable/disable invites.
...
The invite function may not applicable for private and/or closed installs. This adds a configuration option to enable/disable invites (defaulting to enabled), hides the "Invite" nav item when necessary, and adds a check to actions/invite.php.
Note that I haven't tried the Facebook application so I didn't add any checks to actions/facebookinvite.php.
2009-06-14 16:17:22 +08:00
Jeffery To
bb3361467c
Merge branch '0.8.x' into small-fixes
2009-06-14 15:45:58 +08: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
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
79fa050125
Remove useless method
2009-06-12 17:05:31 -07:00
Eric Helgeson
acff6d4bfd
Verbage of a closed invite only site, it shouldnt ask you to register.
2009-06-12 16:43:40 -05: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
Jeffery To
53f31a247e
Fix missing max_id in API search calls
2009-06-12 20:03:18 +08:00
Jeffery To
1b76df4b6a
Fix "Undefined variable: cnt"
2009-06-12 19:49:33 +08:00
Jeffery To
3a59199040
Fix "Undefined property: DisfavorAction::$id"
2009-06-12 19:38:04 +08:00
Zach Copley
8064397588
Ticket #1611 and a bunch of code cleanup
2009-06-12 01:31:22 -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
4df1ea49ec
Merge branch '0.8.x' into userdesign
...
Conflicts:
actions/designsettings.php
2009-06-09 21:51:24 -07: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
Dan Moore
40e05a3e86
Bringing users/show in line with Twitter as far as specifying user.
2009-06-05 12:53:17 -04:00
Dan Moore
0b6994516c
Cleaning up comments at top of favor.php.
2009-06-05 01:01:25 -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
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
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
4ec1c33307
correct last-modified date for shownotice.php
2009-05-30 21:45:11 -04:00
Sarven Capadisli
36fe5a85b2
Using lowercase for form action 'post'
2009-05-30 19:47:05 +00:00
Sarven Capadisli
08b98a3d4d
Typo in label @for
2009-05-30 19:45:34 +00:00
Zach Copley
791f5defaf
Ticket #1572 - Implement Twitter's account/rate_limit_status API method
...
We don't have a rate limit (yet) but some clients check this method.
This dummy implementation always says the auth user has 100 requests
left.
2009-05-29 20:23:32 -07:00
Zach Copley
78f8b91a13
Ticket #1568 - API should return full user objects
2009-05-29 19:23:53 -07: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
b8de793556
Changed ul to ol and added xoxo for notice lists.
2009-05-29 02:38:38 +00:00
Zach Copley
8e8853a714
Warning log msg when http basic auth fails
2009-05-28 16:54:37 -07:00
Zach Copley
5e53a97a41
Warning log msg when http basic auth fails
2009-05-28 16:18:58 -07:00
Evan Prodromou
b3628b7844
start using design object
2009-05-27 14:49:20 -04:00
Robin Millette
ed1e1d9f44
Handles local aliases (redirection) for file uploads attached to notices.
2009-05-27 03:47:45 -04:00
Robin Millette
37423b12d7
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
2009-05-26 23:46:37 -04:00
Evan Prodromou
648d967226
Merge branch '0.8.x' into userdesign
...
Conflicts:
lib/attachmentlist.php
lib/noticelist.php
2009-05-26 23:24:01 -04:00
Robin Millette
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
Zach Copley
1034bd67b0
Fixed warning on Facebook app settings page
2009-05-26 23:59:12 +00:00
Zach Copley
69a656af22
Some adjustments to allow the Facebook app work with Laconica 0.8
2009-05-26 23:21:10 +00:00
Zach Copley
0664be924f
Removed silly "dented:" status prefix from Facebook App
2009-05-26 21:36:45 +00:00
Zach Copley
0a4ce0ef99
Ticket #1196 - Fixed: Warning on invite tab in Facebook App
2009-05-26 21:36:31 +00:00
Zach Copley
b2c28faf52
Removed silly "dented:" status prefix from Facebook App
2009-05-26 21:14:42 +00:00
Zach Copley
5f2cf2553c
Ticket #1196 - Fixed: Warning on invite tab in Facebook App
2009-05-26 02:23:19 +00:00
Sarven Capadisli
4edb1c6e0c
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-05-25 17:31:48 -04:00
Sarven Capadisli
3877324fd8
Updated JS to show/hide attachment thumbnails with timers. Minor
...
markup changes.
2009-05-25 17:30:57 -04:00
Robin Millette
a598dcccba
Really removing the old files, thanks git!
2009-05-25 19:58:31 +00:00
Sarven Capadisli
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
Sarven Capadisli
01dad57298
Markup cleanup for attachments
2009-05-25 15:53:19 -04:00
Robin Millette
64d0767654
Removed more cruft from old attachment/attachements pages
2009-05-25 19:42:03 +00:00
Robin Millette
0b96ca3d59
Oups, forget the attachment_thumbnail.php action file
2009-05-25 13:13:38 -04:00
Robin Millette
b5ac6e31f2
Rearranged attachment info to only appear on each applicable notice page and thru an ajax popup.
2009-05-24 04:43:34 -04:00
Evan Prodromou
6335c9cf59
make invite use the current user's design
2009-05-23 23:42:19 -04:00
Evan Prodromou
9c2f04afc6
make some of the actions show the user's design
2009-05-23 23:35:04 -04:00
Evan Prodromou
3a44885b7f
reformat designsettings.php
2009-05-22 20:50:08 -04:00
Evan Prodromou
f25990cf8e
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-21 12:40:52 -04:00
Evan Prodromou
966f1c6169
Merge branch 'conversationtree' into 0.8.x
2009-05-21 11:43:28 -04:00
Evan Prodromou
62711ae2ba
show conversation as a hierarchical list
2009-05-21 11:43:09 -04:00
Sarven Capadisli
56a8a255ff
Changed No/Yes and Reset/Save locations. They are now a little more
...
usable by first offering the option to undo and than do.
2009-05-21 00:12:48 +00:00
Sarven Capadisli
b561962b59
Color picker reset: Resetting form values will also dynamically update
...
the page colors back to their original.
2009-05-20 23:11:35 +00:00
Sarven Capadisli
0c442e459e
Added reset button
...
Rearranged swatch layout
Added background image upload input file
2009-05-19 17:05:30 +00:00
Robin Millette
f5606b6aa3
Added RSS for personal tags
2009-05-18 18:18:08 -04:00
Robin Millette
57860b4d8a
Merge branch '0.8.x' of git@gitorious.org:~evan/laconica/dev into 0.8.x
2009-05-18 17:20:11 -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
Sarven Capadisli
806200379d
Dynamic color updates to page elements when user picks a color.
...
Using JSON to create swatches in HTML output.
2009-05-18 20:10:46 +00: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
Zach Copley
811cef1008
Merge branch '0.8.x' into fbconnect
2009-05-15 23:17:57 +00:00
Zach Copley
41f6c9d8cf
Added event handlers to logout action
2009-05-15 21:41:41 +00: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
Evan Prodromou
4ac7a4054e
conversation tree interface
2009-05-15 13:55:49 -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
Sarven Capadisli
9a566c51cd
Merge branch '0.7.x' into 0.8.x
2009-05-10 23:13:22 +00:00
Zach Copley
11e0db8c2c
Twitter friends sync now does 25 users at a time and uses last_friendsync field to prioritize
2009-05-07 18:22:14 -07:00
Zach Copley
fbf23ae0ee
Only show import friends timeline option if bidirectional bridge enabled
2009-05-07 14:41:53 -07:00
Sarven Capadisli
c8fd3c5765
Merge branch '0.7.x' into 0.8.x
2009-05-01 17:03:51 +00:00
Evan Prodromou
19a2194704
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-05-01 07:13:19 -04:00
Ori Avtalion
c5e72e248f
Several whitespace fixes
2009-05-01 07:12:13 -04:00
Ori Avtalion
9cac6413a3
Add s to user favorite notices
2009-05-01 07:11:28 -04: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
CiaranG
b79fef3074
Fixed remote subscription, broken in fc6cedd222
2009-04-29 23:43:42 +01:00
Zach Copley
8295402fb3
Added 'mentions' the the list of API methods requiring bare auth
2009-04-29 13:16:52 -07:00
Zach Copley
e85cddba45
Ticket #1428 - Changed replies API method to "mentions".
2009-04-28 23:31:00 -07:00
Zach Copley
54795f2c41
Merge branch 'twitter-import' into 0.8.x
2009-04-24 14:29:56 -07:00
Zach Copley
06746f3fac
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-23 02:19:12 +00:00
Zach Copley
c4941e9043
Added ajax responses
2009-04-23 02:17:59 +00:00
Robin Millette
fe3241183e
fix join a group link from user homepage when he hasn't posted anything yet
2009-04-23 01:03:17 +00:00
Adrian Lang
0dd90461cd
Merge branch '0.7.x' of git://gitorious.org/laconica/mgrdcm-twitapibools into review/master
2009-04-20 13:09:05 +02:00
Robin Millette
39c0e3a9ef
fix 0.7.x 0.8.x merge conflict in register.php
2009-04-18 21:14:31 +00:00
Dan Moore
48846c3805
Fixing spaces/tabs.
2009-04-18 15:54:23 -04:00
Dan Moore
b764c3be78
This should change the JSON representation of the booleans 'following' and 'notifications', but unlike the previous change, I was unable to test this.
2009-04-18 15:42:44 -04:00
Dan Moore
90fb7be99a
Bringing the presentation of boolean variables (favorited, truncated, profile_background_tile) and the result from friendships/exist in JSON results from the Twitter Compatible API in line with what the real Twitter API does.
...
Currently, laconica returns text strings enclosed in quotes instead of bare Javascript booleans. This change fixes that.
See http://laconi.ca/trac/ticket/1326 for one open issue related to this.
2009-04-18 15:33:36 -04:00
Robin Millette
eec323b5b7
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-18 19:08:48 +00:00
Robin Millette
4b54a418f3
trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds
2009-04-18 19:08:33 +00:00
Evan Prodromou
e8382b1292
incorrect variable access
2009-04-17 13:03:33 -07:00
Evan Prodromou
231c61a7eb
store invite code in session so openidfinish can find it
2009-04-17 12:52:26 -07:00
Robin Millette
e5094c3359
fix merge conflict 0.7.x 0.8.x in util.php and register.php.
2009-04-17 17:04:05 +00:00
Sarven Capadisli
34d904b180
Ticket 1404. Showing the link to the members list page.
2009-04-17 01:11:38 +00:00
Zach Copley
6848e93cd5
Merge branch '0.8.x' into twitter-import
2009-04-16 15:00:58 -07:00
Robin Millette
362cac0a96
Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm.
2009-04-16 17:34:19 +00:00
Evan Prodromou
55d7bb4701
Merge branch '0.7.x' into 0.8.x
2009-04-15 11:35:43 -04:00
Evan Prodromou
5ff8d8d447
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
...
Conflicts:
actions/public.php
2009-04-15 10:25:26 -04:00
Adrian Lang
8439477201
Add escaping of /.
2009-04-15 13:29:52 +02:00
Fil
e8fc34e75c
Use preg_quote to fix http://laconi.ca/trac/ticket/1342
2009-04-15 10:35:15 +02:00
Adrian Lang
99f4367d03
Merge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong call of common_local_url.
...
These changes add opera-readable prev/next relations.
2009-04-15 09:38:19 +02:00
Adrian Lang
fc6cedd222
Make OMB work if the configured domain name does not exclusively contain lower case letters.
...
If the configured domain is mixed-case OAuth throws invalidsignature errors. The current URL is part of the signated parts; since the consumer does not pass the current URL, the service has to get it itself and add it to the other OAuth params for signature rebuilding. OAuth.php uses $_SERVER for this, however, the domain is lcased in $_SERVER. Hence we pass the complete current URL as generated by common_local_url to OAuthRequest.
2009-04-15 09:18:43 +02:00
Sarven Capadisli
3cc94cc0bc
Merge branch '0.7.x' into 0.8.x
2009-04-14 23:35:06 +00:00
Sarven Capadisli
64e4b8a20f
Updated remaining files and styles for style separation for themes
2009-04-14 23:32:09 +00:00
Robin Millette
533a463879
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-14 23:03:31 +00:00
Robin Millette
2039466495
trac#1223 Show most popular notices per tag in the tag page sidebar.
2009-04-14 23:03:19 +00:00
Evan Prodromou
41b247ac1a
Merge branch '0.7.x' into 0.8.x
2009-04-14 14:29:51 -04:00
Zach Copley
ad5dd9030b
Add option to Twitter settings for importing Friends Timeline
2009-04-13 19:19:26 -07:00
Evan Prodromou
4c9be4d566
typo in api.php
2009-04-13 15:52:15 -04:00
Evan Prodromou
3a0c59052a
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-13 15:51:12 -04:00
Evan Prodromou
e9e75fc9d5
isReadOnly() now takes arguments
...
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
Sarven Capadisli
ed3d68435f
Using farbtastic jQuery plugin to select design colours.
2009-04-13 05:39:23 +00:00
Sarven Capadisli
4a8c23fe32
Updated path for jCrop
2009-04-13 03:49:37 +00:00
Sarven Capadisli
2341f99224
Merge branch '0.7.x' into 0.8.x
2009-04-12 21:50:57 +00:00
Sarven Capadisli
7a00dc749d
Updated styles for the Authrization subscription form inputs
2009-04-12 21:50:14 +00:00
Sarven Capadisli
6cfa587385
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-12 21:41:20 +00:00
Sarven Capadisli
e9e7671d5f
Updated markup for entity_profile on Authorize subscription page.
2009-04-12 21:40:29 +00:00
Sarven Capadisli
a9461356b8
Created Design page for users to customize the way their profile pages
...
look by changing the background image and picking a colour palette for
text.
2009-04-12 20:30:14 +00:00
Evan Prodromou
f934cf2ac0
Update XML generation and list of actions in public XRDS
...
Updated the XML generation calls and list of actions in the public
XRDS document.
2009-04-12 15:34:38 -04:00
Evan Prodromou
925ac16e1f
tag stream is read-only
2009-04-10 22:47:40 -04:00
Sarven Capadisli
c9c5ec0e4b
Merge branch '0.7.x' into 0.8.x
2009-04-10 17:39:56 +00:00
Meitar Moscovitz
6cdc2ff444
Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS.
2009-04-09 13:52:39 -04:00
Sarven Capadisli
dcee7f2f62
Merge branch '0.7.x' into 0.8.x
2009-04-08 22:58:21 +00:00
Sarven Capadisli
03a4a4bebf
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-08 22:55:34 +00:00
Sarven Capadisli
e5657ca4bb
Merge branch '0.7.x' into 0.8.x
2009-04-08 22:55:13 +00:00
CiaranG
85873b1f2b
Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master
2009-04-08 22:11:58 +01:00
Evan Prodromou
579332aa24
don't use count() to check for empty page
2009-04-07 23:57:45 -04:00
Evan Prodromou
58dfad5757
Merge branch 'adrianlang-827' of git://gitorious.org/laconica/adrianlang-clone into 0.7.x
2009-04-07 22:29:48 -04:00
Robin Millette
afebef50e4
showemptListMessage -> showEmptyListMessage method name cleanup.
2009-04-08 01:20:50 +00:00
Robin Millette
5c87616778
added filler/guide text to user groups list.
2009-04-08 01:19:23 +00:00
Robin Millette
ddb59f72db
text bugfix to guide text in subscription list.
2009-04-08 01:13:37 +00:00
Robin Millette
3fb6c8218a
added filler/guide text to subscribers list.
2009-04-08 01:12:43 +00:00
Robin Millette
68ed6be71f
added filler/guide text to subscription list.
2009-04-08 01:05:17 +00:00
Robin Millette
b20815e8e2
added missing word to user favorites guide.
2009-04-08 00:16:53 +00:00
Robin Millette
cc50031658
added filler/guide text to user favorites.
2009-04-08 00:15:05 +00:00
Sarven Capadisli
a839daad2e
HTML br is not needed. Using 'clear' in CSS instead.
2009-04-07 23:45:22 +00:00
Robin Millette
79b1e3a488
added filler/guide text to user replies timeline.
2009-04-07 23:25:12 +00:00
Robin Millette
d704b3fa8e
added filler/guide text to user timeline.
2009-04-07 23:14:02 +00:00
Robin Millette
c79bad0601
fixed filler/guide text on personal timeline to take memcached into account.
2009-04-07 22:16:09 +00:00
Evan Prodromou
50b32227d1
Add subscribers, subscriptions, groups to personal page
...
We show stats, subscriptions info on the personal page in the sidebar.
Pushed code from showstream.php into a common parent class for
personal and profile.
2009-04-07 17:47:08 -04:00
Evan Prodromou
4e3e4fcfff
Merge branch '0.7.x' into 0.8.x
2009-04-07 17:14:23 -04:00
Sarven Capadisli
05b04b7970
Changed text "noone" to "no one".
2009-04-07 21:12:11 +00:00
Sarven Capadisli
a6e950b7a1
Renamed 'blankfiller' to 'guide'.
2009-04-07 21:09:27 +00:00
Robin Millette
640ae10935
added filler text to personal timeline.
2009-04-07 16:11:03 +00:00
Robin Millette
17fb51f747
added filler text to notice and group search, suggesting other search options.
2009-04-07 03:26:33 +00:00
Robin Millette
9ad8307b7e
external search now depends on site.server.
2009-04-06 05:04:11 +00:00
Robin Millette
84d2aa7df4
refactored search suggestions and added forgotten sprintf.
2009-04-06 01:14:59 +00:00
Robin Millette
1ee24a2aaf
added filler text to people search, suggesting other search options.
2009-04-05 23:11:40 +00:00
Sarven Capadisli
e21844c7e4
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-03 21:48:23 +00:00
Sarven Capadisli
e632f3be6f
Merge branch '0.7.x' into 0.8.x
2009-04-03 21:47:39 +00:00
Robin Millette
8f969f8f98
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-03 20:37:35 +00:00
Robin Millette
439d521c86
Tiny change to the public tag cloud dealing with empty page.
2009-04-03 20:37:29 +00:00
Robin Millette
9698247722
Added filler text to popular page for when it's empty, encouraging user to add favorites and/or register.
2009-04-03 20:35:18 +00:00
Robin Millette
e1fec6db2f
Simplified code for empty public timeline.
2009-04-03 20:34:27 +00:00
Evan Prodromou
fa3ca0548f
fix output of conversation
2009-04-03 16:12:33 -04:00
Evan Prodromou
68ae282198
Merge branch '0.7.x' into 0.8.x
2009-04-03 15:36:16 -04:00
Evan Prodromou
81c72956a6
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-03 15:31:07 -04:00
Robin Millette
4d4e6ead9c
added filler text to public tagcloud for when it's empty, encouraging user to post and/or register.
2009-04-03 19:16:35 +00:00
Evan Prodromou
5eacffcb3a
try to reduce memory usage in FOAF output
2009-04-03 14:18:29 -04:00
Evan Prodromou
5f79653acb
redirect FOAF file on non-canonical nickname
2009-04-03 14:00:52 -04:00
Evan Prodromou
d68ac2e1d3
Merge branch '0.7.x' into 0.8.x
2009-04-03 12:47:25 -04:00
Evan Prodromou
26194cd1d6
i18n for legend in remote sub form
2009-04-02 06:10:32 -04:00
Sarven Capadisli
798984381f
Merge branch '0.7.x' into 0.8.x
2009-04-02 06:44:54 +00:00
Evan Prodromou
e28c4689ce
add sup with arguments
2009-04-01 18:29:10 -04:00
Evan Prodromou
c172cbafaa
Try to do intelligent redirect codes
...
After fixing the redirect code output, there are a lot of weirdnesses
with e.g. form handling. Try to add explicit redirect codes where
needed -- principly when handling a POST.
2009-04-01 15:30:59 -04:00
Robin Millette
3861e348a4
added filler text to public timeline for when it's empty, encouraging user to post and/or register.
2009-03-30 21:07:48 +00:00
Sarven Capadisli
27b45eeb48
Merge branch '0.7.x' into 0.8.x
2009-03-30 15:15:40 +00:00
Evan Prodromou
7b02d9d2e1
Merge branch 'master' into 0.7.x
2009-03-30 11:11:33 -04:00
Evan Prodromou
650a86d79a
add fullname to title and h1 for groups
2009-03-30 10:28:44 -04:00
Evan Prodromou
ce212c3903
full name in title and h1 of the personal profile
2009-03-30 09:58:49 -04:00
Evan Prodromou
73fbf65800
full name in title and h1 of the personal profile
2009-03-30 09:58:28 -04:00
Evan Prodromou
2becd5849d
Merge branch 'master' into 0.7.x
...
Conflicts:
lib/router.php
2009-03-25 12:56:52 -04:00
Evan Prodromou
1116526f08
fixed pagination variable problem
2009-03-25 12:32:46 -04:00
Evan Prodromou
8c073a34ce
Merge branch '0.7.x' into 0.8.x
2009-03-23 15:55:07 -04:00
Sarven Capadisli
fadae96a74
Password recover and change form markup updated.
2009-03-22 20:21:32 +00:00
CiaranG
a9a71297f4
Use correct page information for notice search. See ticket #1333
2009-03-20 22:02:35 +00:00