Brion Vibber
201cbb56b6
Don't spew warnings for URL shortener plugins that don't declare if they're free services.
2009-10-29 14:29:52 -04:00
Sarven Capadisli
968389fb45
Don't include site in gettext
2009-10-29 13:24:06 +01:00
Sarven Capadisli
f0abc0fe15
Updated bookmarklet. Created its own action
2009-10-29 13:18:51 +01:00
Evan Prodromou
2b5a5e02a4
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-28 22:58:58 -04:00
Zach Copley
03a1436a1c
Trap ClientExceptions from media upload process and hand them off to API error handler
2009-10-28 17:29:21 -07:00
Zach Copley
9ef05030fe
Merge branch 'api-media-upload' into 0.9.x
...
* api-media-upload:
Rearanged a couple things & removed debugging statements
Rework MailDaemon to use the MediaFile class for uploads
Implement media upload in the API
Extract media upload stuff into its own library class.
2009-10-28 17:18:33 -07:00
Zach Copley
e5a2f895a0
Rearanged a couple things & removed debugging statements
2009-10-28 17:13:06 -07:00
Evan Prodromou
b73d6d18ba
Merge branch '0.9.x' into location
2009-10-28 17:24:53 -04:00
Zach Copley
2d0aba49d9
Implement media upload in the API
2009-10-27 21:45:56 -07:00
Zach Copley
93a6e83d5d
Extract media upload stuff into its own library class.
2009-10-27 19:11:18 -07:00
Craig Andrews
7b30e3c00f
Shorten the notice text after command processing is done
2009-10-27 22:02:55 -04:00
Craig Andrews
0b4390e7f2
Make email domain checking optional, as some statusnet installations (such as those behind restrictive corporate firewalls, or on home systems on restrictive connections) cannot connect to any mail
...
systems, and this check will always fail.
2009-10-26 10:31:12 -04:00
Evan Prodromou
3c724ccd0d
Merge branch '0.9.x' into location
2009-10-24 19:59:46 -04:00
Evan Prodromou
967de94665
update location while saving new profile
2009-10-23 11:47:00 -04:00
Jeffery To
3f06bfc042
Actually commit the file this time
2009-10-22 12:46:56 +08:00
Zach Copley
78e5a5980a
Extract out Facebook app stuff into a plugin
2009-10-20 16:32:30 -07:00
Zach Copley
8a31970ff8
Twitter now puts out an error msg when the status param is empty.
...
Updated our API to match.
2009-10-20 15:09:18 -07:00
Zach Copley
09dfb08a39
Merge branch '0.9.x' into TwitterBridgePlugin
2009-10-20 06:06:10 +00:00
Evan Prodromou
035d4cf86e
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-19 15:36:26 -04:00
Zach Copley
0bbc05c1d5
Merge branch '0.9.x' into TwitterBridgePlugin
2009-10-16 23:42:02 +00:00
Brion Vibber
e48efd3222
Workaround for Facebook data store API behavior regression, fixes saving
...
of empty notice prefix text in facebook settings.
Filed bug upstream at http://bugs.developers.facebook.com/show_bug.cgi?id=7110
Per documentation, saving a pref value of "" or "0" will delete the pref key:
http://wiki.developers.facebook.com/index.php/Data.setUserPreference
which used to do what we want... Now Facebook throws back an error
"Parameter value is required" when we do this. Workaround appends a
space to empty string or "0" at save time, then trims the string when
we load it.
The input string was already trimmed at pref save time, so this won't
alter any user-visible behavior.
Thanks to ^demon in #mediawiki for pointing out the behavior regression
after testing the identi.ca Facebook app!
2009-10-16 14:48:56 -07:00
Brion Vibber
4855cb58da
Workaround for Facebook data store API behavior regression, fixes saving
...
of empty notice prefix text in facebook settings.
Filed bug upstream at http://bugs.developers.facebook.com/show_bug.cgi?id=7110
Per documentation, saving a pref value of "" or "0" will delete the pref key:
http://wiki.developers.facebook.com/index.php/Data.setUserPreference
which used to do what we want... Now Facebook throws back an error
"Parameter value is required" when we do this. Workaround appends a
space to empty string or "0" at save time, then trims the string when
we load it.
The input string was already trimmed at pref save time, so this won't
alter any user-visible behavior.
Thanks to ^demon in #mediawiki for pointing out the behavior regression
after testing the identi.ca Facebook app!
2009-10-16 14:46:53 -07:00
Evan Prodromou
90de6eae5a
add more events to profile list
2009-10-15 06:01:26 -04:00
Zach Copley
8be28f478d
Fix syntax errors
2009-10-13 14:48:19 -07:00
Evan Prodromou
4f5badda94
remove inboxes option
2009-10-13 17:38:27 -04:00
Evan Prodromou
181de862ef
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-10-13 17:21:41 -04:00
Zach Copley
39bcd514b4
Merge branch '0.9.x' into pluginize-twitter-bridge
...
* 0.9.x:
Include long-form attachment URL in notice if URL shortening is disabled.
Updated default theme to use the CSS Sprites method for common icons
Added a new plugin that requires a user to have a validated email address before being allowed to post notices
Don't trigger E_NOTICE when looking for commands in the notice input
2009-10-13 11:05:39 -07:00
Brion Vibber
659a04b556
Include long-form attachment URL in notice if URL shortening is disabled.
...
Previously, the attachment URL would simply be dropped when shortening returned false instead of a short URL... the attachment was present if you clicked through to notice details but didn't appear in the timeline, making it nigh-impossible to see the attachment.
2009-10-13 10:32:52 -07:00
Brion Vibber
2c5aeb11b1
Include long-form attachment URL in notice if URL shortening is disabled.
...
Previously, the attachment URL would simply be dropped when shortening returned false instead of a short URL... the attachment was present if you clicked through to notice details but didn't appear in the timeline, making it nigh-impossible to see the attachment.
2009-10-13 16:54:57 +00:00
Zach Copley
b4b992bca7
Merge branch '0.9.x' into pluginize-twitter-bridge
...
* 0.9.x: (247 commits)
Added in credits.
Use site's name for basic auth realm
Make apigroupcreate.php pass phpcs
Took out some unnecessary intializations
Implemented create group api
CamelCase all function names in the API code
These same params are used in most API actions; moved to base API class
Missed some of the references to the old TwitterApiAction - removed
Remove more redundant $formats
Remove dead code
Move all basic auth output and processing to base classes
$format is used by every API action. Set it in the base class.
Delete action/api.php and rename lib/twitterapi.php to lib/api.php
New actions for blocks via API
fix FBConnect so it doesn't muffle EndPrimaryNav
don't write session if it's unchanged
Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
Fixed facebook connect primary nav to obey sms/twitter/openid settings
Fixed facebook connect login nav to obey openid settings
Fixed facebook connect nav to obey sms/twitter disabled
...
2009-10-13 09:36:26 -07:00
Zach Copley
870b091693
Added in credits.
2009-10-12 16:36:00 -07:00
Zach Copley
da9d02b038
Make apigroupcreate.php pass phpcs
2009-10-12 14:46:22 -07:00
Zach Copley
7fcaffdf86
Took out some unnecessary intializations
2009-10-12 14:07:00 -07:00
Zach Copley
e071a8cbff
Moved group create API into its own action
...
Merge branch '0.9.x' into refactor-api
* 0.9.x:
Implemented create group api
fix FBConnect so it doesn't muffle EndPrimaryNav
don't write session if it's unchanged
Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
Fixed facebook connect primary nav to obey sms/twitter/openid settings
Fixed facebook connect login nav to obey openid settings
Fixed facebook connect nav to obey sms/twitter disabled
Fixed twitter defaulting to disabled
Revert "Open tags should have closing tags"
Don't show search suggestions for private sites
Fixed E_NOTICE when returnto isn't set
Fixed E_NOTICE when the "lite" parameter isn't included in the request
Fixed E_NOTICE - GroupList expects an owner object in the constructor, not an array of search terms
Returning false seems to fix IE from reclaiming window focus. I think
Aligning notice attach label from right instead of left
Fixed IE background image alignment for attach, favour and disfavour
Fixed nudge and direct message background image alignment
Using 'CSS sprites' for common icons for the identica theme. Default
Open tags should have closing tags
Conflicts:
actions/twitapigroups.php
actions/twitapistatuses.php
2009-10-12 12:31:14 -07:00
Craig Andrews
f719720e8a
Merge remote branch 'statusnet/0.8.x' into 0.9.x
...
Conflicts:
lib/common.php
2009-10-11 13:39:10 -04:00
Craig Andrews
96d32fb8d0
Implemented create group api
2009-10-11 13:13:15 -04:00
Zach Copley
061af8fa06
CamelCase all function names in the API code
2009-10-09 17:53:35 -07:00
Zach Copley
b08d16ef2b
These same params are used in most API actions; moved to base API class
2009-10-09 17:32:53 -07:00
Zach Copley
57dfad64be
Missed some of the references to the old TwitterApiAction - removed
2009-10-09 17:21:22 -07:00
Zach Copley
559918826a
Remove more redundant $formats
2009-10-09 17:11:40 -07:00
Zach Copley
743c844084
Move all basic auth output and processing to base classes
2009-10-09 16:57:22 -07:00
Zach Copley
f746993c2b
$format is used by every API action. Set it in the base class.
2009-10-09 14:42:01 -07:00
Zach Copley
bb08611def
Delete action/api.php and rename lib/twitterapi.php to lib/api.php
2009-10-09 14:22:18 -07:00
Zach Copley
09f4d1ef23
New actions for blocks via API
2009-10-09 13:35:54 -07:00
Evan Prodromou
76ac7c358a
add lots of events to customize the profile page
2009-10-09 16:14:20 -04:00
Evan Prodromou
44a59bbc2d
add some hooks for the profile page
2009-10-09 15:28:12 -04:00
Zach Copley
ada84698f2
New action for test/help API method
2009-10-08 15:59:00 -07:00
Zach Copley
62059fec83
New actions for statusnet config and version API methods
2009-10-08 15:45:45 -07:00
Zach Copley
08de0f1ebd
New individual actions for dealing with groups via API
2009-10-07 17:20:08 -07:00
Evan Prodromou
5702764e52
Rationalize logic in showProfile()
...
Pulled together some of the if() statements in showProfile() so they
weren't so redundant.
Also, reformatted the file. Lots of whitespace gar.
2009-10-07 05:55:54 -04:00
Evan Prodromou
8ade2e1c7d
don't reset in showProfile()
2009-10-07 05:43:18 -04:00
Jeffery To
9449a1e39c
Fixed E_NOTICE when the "lite" parameter isn't included in the request
2009-10-07 17:28:29 +08:00
Jeffery To
87f5c53dd0
Fixed E_NOTICE - GroupList expects an owner object in the constructor, not an array of search terms
2009-10-07 16:18:05 +08:00
Zach Copley
170b009865
New action for group timelines via API
2009-10-06 17:26:45 -07:00
Zach Copley
85af1c92ad
phpcs cleanup
2009-10-06 17:25:10 -07:00
Zach Copley
8d284ca82c
New action for tag timelines in the API
2009-10-06 15:39:13 -07:00
Zach Copley
475bdf6fba
New actions for the account methods we have implemented
2009-10-05 17:10:30 -07:00
Zach Copley
dd0d907231
New actions for favorites via the API
2009-10-05 13:50:01 -07:00
Zach Copley
62d1475df1
Add in a check for proper format
2009-10-05 13:25:34 -07:00
Zach Copley
4ed8055f86
New actions for managing subscriptions (friendships)
2009-10-05 10:03:12 -07:00
Zach Copley
daa8b47306
New actions for direct messaging through the API
2009-10-02 17:23:48 -07:00
Zach Copley
eaef9b689a
New action for /users/show
2009-10-02 10:31:13 -07:00
Zach Copley
1e0c36afb5
Renamed and moved stuff around to better match Twitter's API organization
2009-10-01 18:19:59 -07:00
Zach Copley
9a1dbee0fd
A new action for /statuses/destroy
2009-10-01 17:35:28 -07:00
Zach Copley
b3bbaecf47
Merge branch '0.9.x' into refactor-api
...
* 0.9.x:
change DB so OpenIDPlugin manages OpenID tables
Some bug fixes
check the schema
add some more methods to Schema
Added hook for Aside container
Revert "Outputting UTF-8 charset in document header irrespective of mimetype."
FOAF for Groups.
use schema tool to create a table
statusize schema-related modules
test script for schema code
make table def method of schema code work
start a module for schema management
2009-10-01 16:17:43 -07:00
Zach Copley
b0ddb971e6
New action for /statuses/update
2009-10-01 16:15:52 -07:00
Zach Copley
c5f33cc6c2
Fix: last modified header wasn't showing
2009-09-30 17:11:22 -07:00
Zach Copley
8b8e0c95af
Add route for /statuses/show
2009-09-30 17:08:52 -07:00
Zach Copley
a3901e0e24
New action for /statuses/show
2009-09-30 17:06:46 -07:00
Zach Copley
524c2794c9
Declare some more variables; instance variable for format
2009-09-30 17:02:04 -07:00
Toby Inkster
c5be2962ad
FOAF for Groups.
2009-09-30 13:59:18 -04:00
Zach Copley
5bab0288af
Merge branch '0.9.x' into refactor-api
...
* 0.9.x: (39 commits)
Timeout a little incase the notice item from XHR response is
Relocated the button for pop up window for notice stream
Script no longer needed for Realtime plugin
Better check to see if the XML prolog should be outputted for XML
Outputting UTF-8 charset in document header irrespective of mimetype.
Switched Doctype to XHTML 1.0 Strict (which best reflects the current
Twitter API returns server errors in preferred format
move HTTP error code strings to class variables
remove string-checks from code using Notice::saveNew()
change string return from Notice::saveNew to exceptions
stop overwriting created timestamp on group edit
Forgot to add home_timeline to the list of methods that only require
Forgot to add home_timeline to the list of methods that only require
moderator can delete another user's notice
show delete button when user has deleteOthersNotice right
let hooks override standard user rights
user rights
Merge DeleteAction class into DeletenoticeAction
Fix some bugs in the URL linkification, and fixed the unit test.
Fix URL linkification test cases for addition of 'title' attribution with long URL in f3c8fccc
...
2009-09-30 10:32:05 -07:00
Zach Copley
34ba2d03e9
Fix header comment
2009-09-30 10:30:06 -07:00
Zach Copley
1e7939cc48
Left opening double quotes off Etag
2009-09-30 10:27:54 -07:00
Zach Copley
e307adfbfc
New actions for /statuses/friends and /statuses/followers + social graph methods
2009-09-30 10:22:26 -07:00
Evan Prodromou
fe7848e8b8
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
actions/twitapistatuses.php
2009-09-29 18:03:10 -04:00
Evan Prodromou
5309910b9b
Twitter API returns server errors in preferred format
2009-09-29 17:57:31 -04:00
Evan Prodromou
4298f28eae
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-09-29 17:26:09 -04:00
Evan Prodromou
89ac81c344
remove string-checks from code using Notice::saveNew()
2009-09-29 17:25:52 -04:00
Evan Prodromou
155ba6c103
stop overwriting created timestamp on group edit
2009-09-29 09:12:44 -04:00
Zach Copley
4e6c730207
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 20:23:35 -07:00
Zach Copley
6b7a007ef2
Forgot to add home_timeline to the list of methods that only require
...
bareauth.
2009-09-27 20:21:16 -07:00
Evan Prodromou
ee9856c452
moderator can delete another user's notice
2009-09-27 21:14:49 -04:00
Evan Prodromou
a8d1b7e9c2
Merge DeleteAction class into DeletenoticeAction
...
The DeleteAction class checked for notice information, and only had
one subclass: DeletenoticeAction. I couldn't figure out any other
class that would subclass it, so I combined the two into a single class.
2009-09-27 21:10:17 -04:00
Zach Copley
f3820cc85d
Fix nickname in feed title
2009-09-27 17:27:42 -07:00
Zach Copley
44dd8f833d
Broke mentions API method out into its own action
2009-09-27 17:17:57 -07:00
Zach Copley
99d2999b5c
Broke out public_timeline and user_timeline into their own actions
2009-09-27 16:57:06 -07:00
Zach Copley
37bdc060c5
phpcs on apifriendstimeline.php, apiauth.php and apibareauth.php
2009-09-27 15:33:46 -07:00
Zach Copley
dfa955bfda
- Output entity tag
...
- More comments for function blocks
2009-09-27 14:11:12 -07:00
Zach Copley
ccc7caf932
Merge branch 'refactor-api' of git@gitorious.org:~zcopley/statusnet/zcopleys-clone into refactor-api
2009-09-25 16:59:51 -07:00
Zach Copley
de5ff19713
Moved basic auth stuff into its own classes
2009-09-25 16:58:35 -07:00
Zach Copley
150cf8c045
Merge branch '0.9.x' into refactor-api
...
* 0.9.x: (88 commits)
Left a couple debugging statements in (removed)
Output If-Modified-Since header for all RSS 1.0 feeds (again)
Revert "move scripts to just before </body>, add event for scripts that need to be in <head>"
Implemented join and leave groups api methods
implemented etag and last modified
Fixed broken Piwik plugin - was not using the supplied site code
move scripts to just before </body>, add event for scripts that need to be in <head>
some UI fixes
Using timeline string instead of title for WindowName because IE doesn't
Added JavaScript to initialize the poped Window
Some layout and rendering adjustment for Realtime plugin
Created addPop() for Realtime plugin and added param to include iconurl
move some stuff around for realtime
hack around address hack in util.js
Add some more realtime feeds
Do realtime popup with PHP instead of Javascript
JavaScript fixes for IE
Revert "Added realtime streams for all and showstream timelines"
Revert "Fixed indenting"
Revert "Made it slighly more compact with less jQuery selection"
...
2009-09-24 18:18:26 -07:00
Zach Copley
ed9ba9d945
Reorganize, make bare auth work, output If-Modified-Since header
2009-09-24 18:13:46 -07:00
Zach Copley
b617c608ea
Left a couple debugging statements in (removed)
2009-09-24 15:28:25 -07:00
Zach Copley
e566219299
Output If-Modified-Since header for all RSS 1.0 feeds (again)
2009-09-24 15:10:55 -07:00
Craig Andrews
49bce941a9
Merge remote branch 'statusnet/0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.php
lib/noticeform.php
2009-09-24 17:15:54 -04:00
Craig Andrews
3d30ad83f8
Implemented join and leave groups api methods
2009-09-24 16:52:32 -04:00
Zach Copley
49b701f9ec
Started refactoring API into individual actions
2009-09-23 13:45:51 -07:00
Zach Copley
8aad3154a7
Make statuses/home_timeline return the same thing as statuses/friends_timeline to support apps trying to use the new retweet API method.
2009-09-19 18:41:28 -07:00
Zach Copley
74296fa12c
Make statuses/home_timeline return the same thing as statuses/friends_timeline to support apps trying to use the new retweet API method.
2009-09-19 18:34:07 -07:00
Adrian Lang
e0ff80f1c7
Add missing parenthesis.
2009-09-19 21:40:48 +02:00
Adrian Lang
8548e1185d
Fix merges.
2009-09-19 21:38:52 +02:00
Craig Andrews
0d72456a84
Merge remote branch 'cvollick/userTagPagination' into 0.8.x
2009-09-17 14:38:08 -04:00
Zach Copley
0190785b73
Merge branch '0.9.x' into pluginize-twitter-bridge
...
* 0.9.x: (57 commits)
Updated csarven emails to csarven@status.net and removed dupes
statusize new HTTP classes
dedupe evans
change all evans to evan@status.net
add post to curlclient
fix user-agent for curlclient
add get to curl client
add cURL client with HEAD method
add user agent and correct version check to httpclient
statusize OpenID plugin
add http client config value
update httpclient class
move httputil to httpclient
Start a common library for HTTP client stuff
check correct define (not backwards compatible)
Fixed broken list items in installer output
Got rid of a bunch of ugly warnings
Add Jiminy to notice sources
Make it impossible to delete self-subscriptions via the API
Fix bad merge d7ae0ed4fd
...
2009-09-16 12:40:22 -07:00
Sarven Capadisli
83b0916457
Updated csarven emails to csarven@status.net and removed dupes
2009-09-16 11:14:26 +02:00
Christopher Vollick
c4ef2346b8
Pagination of user/tag was navigating to wrong page.
...
Fixes bug #1736 .
2009-09-16 05:07:33 -04:00
Evan Prodromou
1618d515e6
dedupe evans
2009-09-15 22:30:52 -04:00
Evan Prodromou
6f531745ca
change all evans to evan@status.net
2009-09-15 22:28:59 -04:00
Zach Copley
4081ed79b0
Make it impossible to delete self-subscriptions via the API
2009-09-15 13:01:12 -07:00
Zach Copley
80ba0603c6
Make it impossible to delete self-subscriptions via the API
2009-09-15 12:59:32 -07:00
Brenda Wallace
fcff85bb36
code style cleanup
2009-09-14 19:19:44 +12:00
Brenda Wallace
84da24aba4
cleaned up code style
2009-09-14 19:19:31 +12:00
Craig Andrews
940ea07d4a
Response for request token doesn't contain omb_version
...
Fixes http://status.net/trac/ticket/681
Sorry it took a year to accept this patch, dho :'-(
2009-09-13 00:01:23 -04:00
Craig Andrews
29d937d04e
Check if the avatar exists before trying to delete it.
...
Fixes http://status.net/trac/ticket/1868
2009-09-12 17:11:55 -04:00
Craig Andrews
57feeb566a
Add a parameter named 'inreplyto' to the 'notice/new' page, so urls can inclue 'inreplyto' id's. Also add 'inreplyto' to the urls sent in emails.
2009-09-11 22:37:37 -04:00
Craig Andrews
d7ae0ed4fd
Merge remote branch 'laconica/0.8.x' into 0.9.x
...
Conflicts:
lib/omb.php
2009-09-09 22:52:38 -04:00
Zach Copley
9d87313eae
Merge branch '0.9.x' into pluginize-twitter-bridge
...
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
2009-09-08 16:02:57 -07:00
Craig Andrews
6020d85191
Don't "hightlight" search terms (by surrounding them in <strong>$term</strong>) when the term appears in an HTML attribute
...
Fixes http://status.net/trac/ticket/1852
2009-09-07 22:36:01 -04:00
Sarven Capadisli
94f9ce26e7
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-09-03 19:47:00 +00:00
Sarven Capadisli
277b464054
Created autofocus method to give focus to an element (primarily a form
...
control) on page onload.
Updated some of the pages to use autofocus.
2009-09-03 19:42:50 +00:00
Craig Andrews
ebcbd3820e
Fix spelling
2009-09-03 15:30:19 -04:00
mEDI
0d7d4dfe5d
add basic auth support for cgi servers on the api (trac #1832 )
2009-09-03 15:29:13 -04:00
Craig Andrews
beae3db413
Pluginize the URL shorteners
2009-09-03 14:58:50 -04:00
Craig Andrews
5db43f4655
Merge remote branch 'brion/fixlinks' into 0.9.x
2009-09-02 16:48:33 -04:00
Craig Andrews
a535ccdc4e
Merge remote branch 'laconica/0.8.x' into 0.9.x
...
Conflicts:
lib/common.php
lib/twitter.php
2009-09-02 16:42:15 -04:00
Zach Copley
8b040eba40
Fixed bug in which you cannot turn off importing friends timelines flag
2009-09-02 00:24:30 +00:00
Brion Vibber
e929bdc2ba
fix some double-escaped %s leading to broken links right smack on the main page
2009-09-01 19:43:56 -03:00
Carlos Perilla
aa7bda4677
Fixes foaf notices, use Profile for information that's missing in Remote_profile
2009-09-01 17:52:03 -04:00
Craig Andrews
70fc32c5b9
added my email address next to my name at the top of the files
2009-08-27 22:56:54 -04:00
Craig Andrews
6ff00c9404
Implement the is_member and membership group api's
2009-08-27 22:55:32 -04:00
Evan Prodromou
5d09b6b3f0
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
df86aa7214
define LACONICA and accept LACONICA for backwards compatibility
2009-08-26 10:41:36 -04:00
Evan Prodromou
3567b9d708
global search and replace for laconica -> statusnet
2009-08-25 18:53:24 -04:00
Evan Prodromou
865b716f09
change LACONICA to STATUSNET
2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b
change controlyourself.ca to status.net
2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c
change laconi.ca to status.net
2009-08-25 18:16:46 -04:00
Evan Prodromou
4737563b95
a distributed -> the distributed
2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1
change Laconica and Control Yourself to StatusNet in PHP files
2009-08-25 18:12:20 -04:00
Evan Prodromou
c87e1de017
Rename Laconica to StatusNet
2009-08-25 17:56:10 -04:00
Zach Copley
9b9d80cd97
Pluginized Twitter settings stuff
2009-08-25 14:52:25 -07:00
Evan Prodromou
ff87732053
Merge branch '0.8.x' into testing
...
Conflicts:
actions/twitterauthorization.php
lib/oauthclient.php
lib/twitter.php
lib/twitterapi.php
lib/twitteroauthclient.php
scripts/twitterstatusfetcher.php
2009-08-24 16:55:49 -04:00
Zach Copley
ee006dbb0e
Moved some stuff to a base class
2009-08-24 11:53:21 -04:00
Zach Copley
590f21c6a9
Allow removal of Twitter account. Deleted dead code.
2009-08-24 11:53:09 -04:00
Zach Copley
500f0c7072
Make the TwitterQueuehandler post to Twitter using OAuth
2009-08-24 11:52:28 -04:00
Zach Copley
e9edaab358
Twitter OAuth server dance working
2009-08-24 11:52:15 -04:00
Evan Prodromou
c9f9b011c8
use array for events
2009-08-21 16:58:02 -04:00
Evan Prodromou
9aa39c7573
add hooks to allow loading custom help documentation
2009-08-21 16:54:35 -04:00
Evan Prodromou
59beff6b46
Revert "Added configuration option to only allow OpenID logins."
...
This reverts commit 14b46e2183
.
This functionality will need to be rewritten to work with the new
OpenIDPlugin.
Conflicts:
index.php
lib/logingroupnav.php
2009-08-21 16:45:42 -04:00
Evan Prodromou
bacef32aac
Revert "Added a configuration option to disable OpenID."
...
This reverts commit 7dc3a90d12
.
Conflicts:
actions/login.php
actions/register.php
lib/accountsettingsaction.php
lib/common.php
lib/logingroupnav.php
2009-08-21 16:38:39 -04:00
Evan Prodromou
9f356b55c6
Merge branch '0.9.x' into openidplugin
...
Conflicts:
actions/login.php
actions/register.php
2009-08-21 16:27:43 -04:00
Evan Prodromou
b2664e1ae2
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
2009-08-21 15:42:11 -04:00
Evan Prodromou
c78772b274
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
...
Conflicts:
actions/postnotice.php
2009-08-21 08:29:51 -04:00
Evan Prodromou
cb2184ed44
api update correctly checks max length of notices
2009-08-21 08:27:21 -04:00
Evan Prodromou
3565383f77
postnotice for OMB correctly checks max notice size
2009-08-21 08:14:37 -04:00
Evan Prodromou
3eeb9deffb
Web UI for notices correctly shows and checks max content length
2009-08-21 08:13:17 -04:00
Evan Prodromou
2b30d7fffb
register checks Profile bio length correctly
2009-08-21 08:03:40 -04:00
Evan Prodromou
d51d83434d
check and show max bio length in profilesettings
2009-08-21 07:48:30 -04:00
Evan Prodromou
2b2541e4b4
API for direct messages correctly checks length
2009-08-21 07:32:08 -04:00
Evan Prodromou
de5382d4ca
message input form correctly shows and check max length
2009-08-21 07:23:27 -04:00
Evan Prodromou
cd688acceb
allow configurable length for user group description
2009-08-21 06:33:22 -04:00
Adrian Lang
70235d7f05
Update libomb, fix some omb handling stuff, improve error handling.
2009-08-21 12:13:24 +02:00
Marcel van der Boom
418a5a95ab
Change the notice type defines all into class constants and adapt all files.
2009-08-20 13:11:22 -04:00
Christopher Vollick
b4c3453923
Resolve Group Aliases in showgroup.php
...
For Example, let's say 'alias' was an alias for the group 'group'.
Previously, if you went to '/group/group' it'd work, but '/group/alias' it'd say "No Such Group".
This was untrue.
Now it checks aliases when it can't find a group with a given name.
If it finds one it redirects you to the original group.
2009-08-19 09:37:27 -04:00
Craig Andrews
136a69a387
Merge commit 'jeff-themovie/0.8.x-openid-enabled' into 0.8.x
2009-08-16 19:50:37 -04:00
brion
46c77b83b1
Fix bug bug 1563 "opensearch content type incorrectly set"
...
http://laconi.ca/trac/ticket/1563
OpenSearch description info is now sent with correct Content-Type: application/opensearchdescription+xml instead of text/html.
2009-08-16 19:46:44 -04:00
Evan Prodromou
b936a5166d
Revert "Revert "Return a 404 when a page is request that has no notices""
...
This reverts commit 1b204fde39
.
2009-08-16 10:37:15 -04:00
Evan Prodromou
e0815de960
Revert "Revert "Return a 404 when a page is request that has no notices""
...
This reverts commit 6c597eabec
.
2009-08-16 10:37:04 -04:00
Evan Prodromou
6c597eabec
Revert "Return a 404 when a page is request that has no notices"
...
An empty list still exists; we should not return a 404 for empty lists.
This reverts commit 355effe631
.
2009-08-14 13:05:57 -07:00
Evan Prodromou
1b204fde39
Revert "Return a 404 when a page is request that has no notices"
...
An empty list still exists; we shouldn't return a 404.
This reverts commit c29892c875
.
2009-08-14 13:05:29 -07:00
Jeffery To
7dc3a90d12
Added a configuration option to disable OpenID.
...
If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.
If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
2009-08-13 22:18:06 +08:00
Evan Prodromou
7d33478e86
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-08-12 10:50:46 -07:00
Craig Andrews
c29892c875
Return a 404 when a page is request that has no notices
2009-08-11 22:48:35 -04:00
Craig Andrews
355effe631
Return a 404 when a page is request that has no notices
2009-08-11 22:09:02 -04:00
Craig Andrews
7eda7295e4
oEmbed provider does not use the twitter api library classes any more
2009-08-11 21:15:42 -04:00
Evan Prodromou
01dccefccc
reformat newnotice.php
2009-08-11 11:18:24 -04:00
Jeffery To
a459313e10
Updated Jcrop to 0.9.8 (avatar cropping wasn't working in IE7 with 0.9.5)
2009-08-11 20:29:45 +08:00
Adrian Lang
77037b3cc3
UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo.
2009-08-10 16:34:56 -04:00
Craig Andrews
e9ed20a69d
Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x
2009-08-10 11:53:35 -04:00
Adrian Lang
ec88d2650e
Replace own OMB stack with libomb.
2009-08-10 14:48:50 +02:00
Zach Copley
17dcf1c317
Merge branch 'twitter-oauth' into 0.8.x
...
Conflicts:
scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00:00
Zach Copley
27548c6903
I forgot that we don't do database upgrades for point releases. So I've
...
changed Twitter OAuth to store token and token secret in the same field
in foreign_link (credentials). This should be changed in 0.9.
2009-08-10 07:00:59 +00:00
Zach Copley
fa8433308f
Moved some stuff around. More comments and phpcs compliance.
2009-08-10 06:05:43 +00:00
Jeffery To
14b46e2183
Added configuration option to only allow OpenID logins.
...
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
page instead.
The user will still need to set a password to access the API and RSS
feeds.
2009-08-10 13:57:39 +08:00
Zach Copley
df12206421
Broke some stuff out into functions. Ran it through phpcs.
2009-08-08 18:13:19 +00:00
Zach Copley
e3bb64cd6c
Merge branch '0.8.x' into twitter-oauth
2009-08-08 18:11:47 +00:00
Sarven Capadisli
fe3ce5b6c4
Fixed typo "thier". Ticket 1606
2009-08-08 17:45:53 +02:00
Craig Andrews
a7a87913be
Redirect instead of showing an error when the user visits a non-local notice's url
...
Use consistent logic in display non-local notice links
Fixes http://laconi.ca/trac/ticket/1788
2009-08-07 18:26:12 -04:00
Craig Andrews
11086c7823
Implemented the list_all and list groups API methods as defined at http://laconi.ca/trac/wiki/ProposedGroupsAPI
...
Made the Autocomplete plugin also autocomplete groups
2009-08-07 18:00:04 -04:00
Adrian Lang
ee9bfa7158
UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo.
2009-08-07 12:21:36 +02:00
Craig Andrews
91cba7a76f
Merge commit 'jeff-themovie/0.8.x-rss-1.0-descriptions' into 0.8.x
2009-08-06 22:45:09 -04:00
Craig Andrews
1c3a1360a9
Merge commit 'jeff-themovie/0.8.x-subsystems-enabled' into 0.8.x
2009-08-06 22:38:06 -04:00
Craig Andrews
26b608d914
Support the 'lite' parameter to statuses/friends and statuses/followers twitter api methods.
...
http://laconi.ca/trac/ticket/1786
2009-08-06 15:14:27 -04:00
Jeffery To
5f293f0e2f
Added configuration option to disable post-by-email.
...
This hides the relevant settings from the email settings page and
prevents maildaemon.php from processing email if the option is
disabled.
2009-08-07 01:55:31 +08:00
Jeffery To
c261a645a1
Hide subscription controls for disabled services (IM, SMS)
2009-08-07 01:34:36 +08:00
Jeffery To
93f585446e
Added configuration options to enable/disable SMS and Twitter integration.
...
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
2009-08-07 01:18:17 +08:00
Jeffery To
adc5901d21
Make RSS 1.0 channel descriptions more consistent with RSS 2.0 and Atom descriptions
2009-08-06 23:36:24 +08:00
Craig Andrews
304db1d30b
Use script() and cssLink() methods everywhere instead of manually writing out javascript and css each time
2009-08-05 19:45:12 -04:00
Craig Andrews
83ff1cecd3
Use NICKNAME_FMT everywhere consistently
2009-08-05 16:26:19 -04:00
Evan Prodromou
5dc1291b59
move openid instructions to OpenIDPlugin
2009-08-04 13:27:22 -04:00
Evan Prodromou
2ed46ce274
move XRDS code from public action to OpenIDPlugin
2009-08-04 13:04:31 -04:00
Evan Prodromou
4586e15f45
fix comment to note that xrds file is for OMB not OpenID
2009-08-04 13:01:23 -04:00
Evan Prodromou
3997682d26
incorrectly moved user xrds to OpenID plugin; fixing
2009-08-04 13:01:23 -04:00
Evan Prodromou
93239adb55
remove unused openid lib from logout action
2009-08-04 13:01:23 -04:00
Evan Prodromou
2b79b4d21f
Move OpenID-related files to OpenID plugin directory
...
As a first step to pluginizing our OpenID support, I've moved the
important OpenID-related files to a dedicated plugin directory. Many
of these classes are still referred to by libraries that are still in
core.
2009-08-04 13:01:23 -04:00
Evan Prodromou
a321651a13
use 410 Gone for Twitter API
2009-08-04 06:05:04 -04:00
Evan Prodromou
3ebf817e36
use 410 Gone for deleted notices
2009-08-04 06:05:04 -04:00
Zach Copley
f94ee5597d
Moved some stuff to a base class
2009-08-04 00:46:18 +00:00
Zach Copley
1f9d1772c0
Allow removal of Twitter account. Deleted dead code.
2009-08-04 00:02:07 +00:00
Zach Copley
dccd4aa68d
Merge branch '0.8.x' into twitter-oauth
2009-08-03 22:47:57 +00:00
Zach Copley
981fa1b33a
Make the TwitterQueuehandler post to Twitter using OAuth
2009-08-03 22:46:01 +00:00
Craig Andrews
92ef468fcc
Use the same favorite notification function in the API as everywhere else
...
http://laconi.ca/trac/ticket/873
2009-08-03 11:47:58 -04:00
Jeffery To
20c536fdd4
Fixed PHP Notice "Undefined variable: cnt"
2009-08-02 19:52:27 +08:00
Jeffery To
fe57e2e06b
Fixed PHP Notice "Undefined variable: suplink"
2009-08-02 19:47:36 +08:00
Zach Copley
6f4b2f0ac2
Twitter OAuth server dance working
2009-08-01 08:20:44 +00:00
Craig Andrews
ec103b90e3
Implemented the "show" method of the laconica groups api
2009-07-30 22:15:24 -04:00
Evan Prodromou
a79a860d81
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-07-28 10:02:39 -04:00
Craig Andrews
e804b2a500
trim the subject line of invite emails
...
Thanks semjaza
http://laconi.ca/trac/ticket/1746
2009-07-27 16:02:03 -04:00
Evan Prodromou
7835393c25
change front page to link to max member groups
2009-07-27 15:07:39 -04:00
Eric Helgeson
abae937947
Changed file back to 0644.
...
Blame: 0adaaa1b9d
2009-07-22 10:21:49 -05:00
Steve Winton
0adaaa1b9d
Added hidden input to showRecoverForm() so form can be submitted without error in IE by pressing <return>
2009-07-21 16:40:51 -04:00
Craig Andrews
c74943e598
I can't believe I forgot to commit this as part of 9ed117d... wow. Epic fail. Epic.
2009-07-17 23:16:29 -04:00
Craig Andrews
f1fc392e2d
Fix OpenId cancelled / error message
...
Thanks jeff-themovie
2009-07-17 22:55:59 -04:00
Craig Andrews
3dbbefd5ad
Merge branch 'oembed-provider' into 0.8.x
2009-07-17 12:33:56 -04:00
Craig Andrews
9ed117dc3a
Move the oembed endpoint to /main/oembed
2009-07-17 12:33:12 -04:00
Evan Prodromou
eb22f06ac6
conversation action is readonly
2009-07-15 16:57:39 -04:00
Craig Andrews
6308539c1d
Added oEmbed discovery for attachments and notices
2009-07-15 15:11:29 -04:00
Craig Andrews
e637e5a8a9
Support oembed for attachments and notices
2009-07-15 14:49:41 -04:00
Craig Andrews
0aeea42724
Added stub oembed api endpoint
2009-07-15 10:29:54 -04:00
Craig Andrews
e047ba52c7
Merge branch 'tags-timeline-api' into 0.8.x
2009-07-13 14:58:39 -04:00
Craig Andrews
91324890ae
Add timeline tags API (RSS 2.0 and Atom feeds)
2009-07-12 15:07:54 -04:00
Craig Andrews
7654d69022
Fix atom self reference in the groups api
2009-07-12 15:06:37 -04:00
Zach Copley
7621e0e384
Fix link for atom feed in showgroup action
2009-07-10 20:13:12 -07:00
Zach Copley
6b0468358b
Group timeline API method doesn't require auth
2009-07-10 18:15:18 -07:00
Zach Copley
7308203065
Update showgroup action RSS 2.0 feed link
2009-07-10 18:11:54 -07:00
Zach Copley
c13dd856c8
Fix alternate link for groups API feed
2009-07-10 18:08:10 -07:00
Zach Copley
544a14d290
Move groups timeline API method into groups API action
2009-07-10 17:56:01 -07:00
Zach Copley
5b3d4f7121
Merge branch 'candrews-review' into 0.8.x
...
* candrews-review:
added group status api, located at /api/statuses/group_timeline/ID.rss
2009-07-10 16:11:31 -07:00
Zach Copley
4a1d7ad082
Merge branch 'candrews-review' into 0.8.x
2009-07-10 21:03:44 +00:00
Craig Andrews
08d50655f3
added group status api, located at /api/statuses/group_timeline/ID.rss
...
http://laconi.ca/trac/ticket/1702
2009-07-10 17:00:27 -04:00
Evan Prodromou
bafa1ab1c5
Merge branch '0.7.x' into 0.8.x
...
Conflicts:
README
actions/twitapiusers.php
2009-07-10 10:03:57 -07:00
Craig Andrews
8250006fbf
When a notice is posted with an attachment, the facebook stream update has media displayed inline, or as links.
...
http://laconi.ca/trac/ticket/1685
2009-07-09 18:42:19 -04:00
Zach Copley
c981f5bcec
Merge branch 'candrews-review' into 0.8.x
...
* candrews-review:
maildaemon makes mail attachments into notice attachments
File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web
2009-07-09 11:22:07 -07:00
Zach Copley
802b909518
user/show API method needs to fall back to basic auth so that
...
verify_credentials works correctly.
2009-07-07 14:21:44 -07:00
Craig Andrews
5f72423523
File classes does not use the $FILES array directly, as users of this class aren't necessarily from the web
2009-07-07 15:55:10 -04:00
CiaranG
d846c5fc99
Merge commit 'br3nda/0.8.x-noticesfix' into 0.8.x
2009-07-07 20:53:28 +01:00
Zach Copley
4fffe1874f
Fix redundant page display for group design settings
2009-07-06 16:44:35 -07:00
Zach Copley
195ec6820b
fix bad function call
...
Conflicts:
actions/twitapiusers.php
2009-07-06 15:56:10 -07:00
Dan Moore
a9c1e66570
Bringing users/show in line with Twitter as far as specifying user.
2009-07-06 15:51:17 -07:00
Zach Copley
91684830e5
fix bad function call
2009-07-06 15:49:26 -07:00
Zach Copley
701a237e8c
Merge branch 'mgrdcm-review' into 0.7.x
...
* mgrdcm-review:
Bringing users/show in line with Twitter as far as specifying user.
2009-07-06 15:48:14 -07:00
Zach Copley
5e067c2c81
Add special basic auth handling for friendships/show. Other fixups.
2009-07-06 13:21:16 -07:00
Zach Copley
d40075ae9c
Support undocumented 'id' parameter in /statuses/show API method
2009-07-06 11:57:21 -07:00
Evan Prodromou
e6c54a59e1
set/get viewdesigns flag and use it
2009-07-05 14:33:12 -04:00
Zach Copley
e3c70cc30c
Merge branch 'friendships_show' into 0.8.x
...
* friendships_show:
Implement friendships/show API method
Route and stub for new friendships/show API method
2009-07-03 15:43:14 -07:00
Zach Copley
a2a4cc35f6
Implement friendships/show API method
2009-07-03 15:42:12 -07:00
Evan Prodromou
088fa6befc
null for both args in conversation
2009-07-03 10:48:15 -04:00
Evan Prodromou
e2f8b8d65d
no limit on conversation stream
2009-07-03 10:40:23 -04:00
Evan Prodromou
04c713e671
fixed limit for conversations
2009-07-03 10:37:39 -04:00
Evan Prodromou
72d0ee4e25
move peoplesearchresults class to action/peoplesearch
2009-07-03 10:10:12 -04:00
Evan Prodromou
f73d93fa7a
only show subscription controls to owner
2009-07-03 01:26:21 -04:00
Zach Copley
acb4c78346
Route and stub for new friendships/show API method
2009-07-02 17:32:27 -07:00
Zach Copley
bca3b3d36f
Send null as 2nd arg, not 3rd.
2009-07-02 15:09:48 -07:00
Evan Prodromou
d04ab14a5a
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-07-02 08:22:09 -04:00
Evan Prodromou
aea546c122
notice should show user design
2009-07-02 08:21:54 -04:00
Evan Prodromou
b4de1d4636
favorites should show owner design
2009-07-02 08:21:41 -04:00
Zach Copley
0e78e1cc52
Show HTML for thumbnails instead of redirecting. Remove dead code.
2009-07-01 16:24:22 -07:00
Evan Prodromou
90557e9147
correctly return count of notices
2009-07-01 14:45:48 -04:00
Evan Prodromou
0057f3da81
show all the notices, not just latest 20
2009-07-01 14:45:09 -04:00
Evan Prodromou
3b6ff92495
don't redirect on local file for ajax action
2009-07-01 13:50:44 -04:00
Dan Moore
fbb7757c4b
Cleaning up comments at top of favor.php.
2009-06-30 17:04:49 -07:00
Zach Copley
ed21af0d1d
Merge branch 'mgrdcm-review' into 0.7.x
...
* mgrdcm-review:
Cleaning up comments at top of favor.php.
2009-06-30 17:02:51 -07:00
Zach Copley
ccbc5c447d
Merge commit 'jeff-themovie/small-fixes' into 0.8.x
...
* commit 'jeff-themovie/small-fixes':
Fix missing max_id in API search calls
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
Fix "Trying to get property of non-object" errors when accessing the people search results page
Fix "Undefined variable: cnt"
Fix "Trying to get property of non-object" errors in groupeditform.php
Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Zach Copley
b10dba2798
Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
...
* commit 'jeff-themovie/invite-enabled':
Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Zach Copley
190d45cd05
Merge commit 'jeff-themovie/notice-search-no-results' into 0.8.x
...
* commit 'jeff-themovie/notice-search-no-results':
Fixes the notice search RSS feeds / API results for searches that return no matches.
2009-06-30 15:38:14 -07:00
Zach Copley
c2c631d19d
Merge commit 'jeff-themovie/group-rss-empty' into 0.8.x
...
* commit 'jeff-themovie/group-rss-empty':
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-30 15:12:50 -07:00
Zach Copley
907b5f7b40
Merge commit 'erichelgeson/no-posts-verbage' into 0.8.x
...
* commit 'erichelgeson/no-posts-verbage':
Needed the else. Tested logged in/out ; site closed/inviteonly/both
Verbage of a closed invite only site, it shouldnt ask you to register.
2009-06-30 14:57:19 -07:00
Evan Prodromou
c5ce56b878
calculate date once for SUP
2009-06-30 11:53:50 -04:00
Evan Prodromou
4e6cd42757
conversation code changes
2009-06-30 11:50:16 -04:00
Zach Copley
c01e8c0bd1
Fixed grammar in class comment blocks
2009-06-29 17:04:09 -07:00
Zach Copley
4321e02c7b
Delete orphaned background imgs. Design settings code now passes
...
phpcs.
2009-06-29 16:57:36 -07:00
Zach Copley
d19ffc73c2
Merge branch '0.8.x' into design_reset
...
* 0.8.x:
Using max-width:480px for settings_design_background-image image
Using role for admin indicator. Added margin-left.
2009-06-29 15:38:17 -07:00
Sarven Capadisli
1268be4f82
Using role for admin indicator. Added margin-left.
2009-06-29 22:07:16 +00:00
Zach Copley
135927e42a
Allow users and groups to reset their design to system default colors
2009-06-29 14:52:38 -07:00
Evan Prodromou
5b8e40aaa9
admin indicators in groups
2009-06-29 10:29:11 -04:00
Evan Prodromou
d03b8c4276
show section with admins in sidebar of group
2009-06-29 10:22:17 -04:00
Evan Prodromou
70521d55a8
log IP for API auth errors
2009-06-27 07:37:58 -07:00
Zach Copley
96ba25c34b
Added readonly flag to FileAction just in case
2009-06-26 18:31:24 -07:00
Jeffery To
612a107e09
Merge branch '0.8.x' into small-fixes
2009-06-26 15:44:31 +08:00
Jeffery To
71dc910a53
Merge branch '0.8.x' into notice-search-no-results
2009-06-26 15:42:37 +08:00
Jeffery To
6328add622
Merge branch '0.8.x' into invite-enabled
2009-06-26 15:31:42 +08:00
Jeffery To
899aad747a
Merge branch '0.8.x' into group-rss-empty
2009-06-26 15:30:24 +08:00
Zach Copley
b47a1b3b57
Merge branch '0.8.x' into attachment-fixup
...
* 0.8.x:
Added functionality to remove the notice data attachment
max public page
2009-06-25 15:44:17 -07:00
Zach Copley
37796a8dc6
Make shorturls in notice content point to AttachmentAction urls
2009-06-25 15:42:17 -07:00
Evan Prodromou
b53b6b8769
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-25 14:02:41 -07:00
Zach Copley
03d31911e1
FileAction redirections weren't being added (e.g.: /notice/$notice_id/file)
2009-06-25 13:51:29 -07:00
Evan Prodromou
a7cdf32df5
max public page
2009-06-25 13:23:59 -07:00
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