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
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
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
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
7d33478e86
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-08-12 10:50:46 -07:00
c29892c875
Return a 404 when a page is request that has no notices
2009-08-11 22:48:35 -04:00
355effe631
Return a 404 when a page is request that has no notices
2009-08-11 22:09:02 -04:00
7eda7295e4
oEmbed provider does not use the twitter api library classes any more
2009-08-11 21:15:42 -04:00
01dccefccc
reformat newnotice.php
2009-08-11 11:18:24 -04:00
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
77037b3cc3
UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo.
2009-08-10 16:34:56 -04:00
e9ed20a69d
Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x
2009-08-10 11:53:35 -04:00
ec88d2650e
Replace own OMB stack with libomb.
2009-08-10 14:48:50 +02:00
17dcf1c317
Merge branch 'twitter-oauth' into 0.8.x
...
Conflicts:
scripts/getvaliddaemons.php
2009-08-10 07:49:51 +00:00
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
fa8433308f
Moved some stuff around. More comments and phpcs compliance.
2009-08-10 06:05:43 +00:00
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
df12206421
Broke some stuff out into functions. Ran it through phpcs.
2009-08-08 18:13:19 +00:00
e3bb64cd6c
Merge branch '0.8.x' into twitter-oauth
2009-08-08 18:11:47 +00:00
fe3ce5b6c4
Fixed typo "thier". Ticket 1606
2009-08-08 17:45:53 +02:00
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
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
ee9bfa7158
UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo.
2009-08-07 12:21:36 +02:00
91cba7a76f
Merge commit 'jeff-themovie/0.8.x-rss-1.0-descriptions' into 0.8.x
2009-08-06 22:45:09 -04:00
1c3a1360a9
Merge commit 'jeff-themovie/0.8.x-subsystems-enabled' into 0.8.x
2009-08-06 22:38:06 -04:00
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
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
c261a645a1
Hide subscription controls for disabled services (IM, SMS)
2009-08-07 01:34:36 +08:00
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
adc5901d21
Make RSS 1.0 channel descriptions more consistent with RSS 2.0 and Atom descriptions
2009-08-06 23:36:24 +08:00
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
83ff1cecd3
Use NICKNAME_FMT everywhere consistently
2009-08-05 16:26:19 -04:00
5dc1291b59
move openid instructions to OpenIDPlugin
2009-08-04 13:27:22 -04:00
2ed46ce274
move XRDS code from public action to OpenIDPlugin
2009-08-04 13:04:31 -04:00
4586e15f45
fix comment to note that xrds file is for OMB not OpenID
2009-08-04 13:01:23 -04:00
3997682d26
incorrectly moved user xrds to OpenID plugin; fixing
2009-08-04 13:01:23 -04:00
93239adb55
remove unused openid lib from logout action
2009-08-04 13:01:23 -04:00
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
a321651a13
use 410 Gone for Twitter API
2009-08-04 06:05:04 -04:00
3ebf817e36
use 410 Gone for deleted notices
2009-08-04 06:05:04 -04:00
f94ee5597d
Moved some stuff to a base class
2009-08-04 00:46:18 +00:00
1f9d1772c0
Allow removal of Twitter account. Deleted dead code.
2009-08-04 00:02:07 +00:00
dccd4aa68d
Merge branch '0.8.x' into twitter-oauth
2009-08-03 22:47:57 +00:00
981fa1b33a
Make the TwitterQueuehandler post to Twitter using OAuth
2009-08-03 22:46:01 +00:00
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
20c536fdd4
Fixed PHP Notice "Undefined variable: cnt"
2009-08-02 19:52:27 +08:00
fe57e2e06b
Fixed PHP Notice "Undefined variable: suplink"
2009-08-02 19:47:36 +08:00
6f4b2f0ac2
Twitter OAuth server dance working
2009-08-01 08:20:44 +00:00
ec103b90e3
Implemented the "show" method of the laconica groups api
2009-07-30 22:15:24 -04:00
a79a860d81
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-07-28 10:02:39 -04:00
e804b2a500
trim the subject line of invite emails
...
Thanks semjaza
http://laconi.ca/trac/ticket/1746
2009-07-27 16:02:03 -04:00
7835393c25
change front page to link to max member groups
2009-07-27 15:07:39 -04:00
abae937947
Changed file back to 0644.
...
Blame: 0adaaa1b9d
2009-07-22 10:21:49 -05:00
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
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
f1fc392e2d
Fix OpenId cancelled / error message
...
Thanks jeff-themovie
2009-07-17 22:55:59 -04:00
3dbbefd5ad
Merge branch 'oembed-provider' into 0.8.x
2009-07-17 12:33:56 -04:00
9ed117dc3a
Move the oembed endpoint to /main/oembed
2009-07-17 12:33:12 -04:00
eb22f06ac6
conversation action is readonly
2009-07-15 16:57:39 -04:00
6308539c1d
Added oEmbed discovery for attachments and notices
2009-07-15 15:11:29 -04:00
e637e5a8a9
Support oembed for attachments and notices
2009-07-15 14:49:41 -04:00
0aeea42724
Added stub oembed api endpoint
2009-07-15 10:29:54 -04:00
e047ba52c7
Merge branch 'tags-timeline-api' into 0.8.x
2009-07-13 14:58:39 -04:00
91324890ae
Add timeline tags API (RSS 2.0 and Atom feeds)
2009-07-12 15:07:54 -04:00
7654d69022
Fix atom self reference in the groups api
2009-07-12 15:06:37 -04:00
7621e0e384
Fix link for atom feed in showgroup action
2009-07-10 20:13:12 -07:00
6b0468358b
Group timeline API method doesn't require auth
2009-07-10 18:15:18 -07:00
7308203065
Update showgroup action RSS 2.0 feed link
2009-07-10 18:11:54 -07:00
c13dd856c8
Fix alternate link for groups API feed
2009-07-10 18:08:10 -07:00
544a14d290
Move groups timeline API method into groups API action
2009-07-10 17:56:01 -07:00
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
4a1d7ad082
Merge branch 'candrews-review' into 0.8.x
2009-07-10 21:03:44 +00:00
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
bafa1ab1c5
Merge branch '0.7.x' into 0.8.x
...
Conflicts:
README
actions/twitapiusers.php
2009-07-10 10:03:57 -07:00
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
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
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
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
d846c5fc99
Merge commit 'br3nda/0.8.x-noticesfix' into 0.8.x
2009-07-07 20:53:28 +01:00
4fffe1874f
Fix redundant page display for group design settings
2009-07-06 16:44:35 -07:00
195ec6820b
fix bad function call
...
Conflicts:
actions/twitapiusers.php
2009-07-06 15:56:10 -07:00
a9c1e66570
Bringing users/show in line with Twitter as far as specifying user.
2009-07-06 15:51:17 -07:00
91684830e5
fix bad function call
2009-07-06 15:49:26 -07:00
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
5e067c2c81
Add special basic auth handling for friendships/show. Other fixups.
2009-07-06 13:21:16 -07:00
d40075ae9c
Support undocumented 'id' parameter in /statuses/show API method
2009-07-06 11:57:21 -07:00
e6c54a59e1
set/get viewdesigns flag and use it
2009-07-05 14:33:12 -04:00
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
a2a4cc35f6
Implement friendships/show API method
2009-07-03 15:42:12 -07:00
088fa6befc
null for both args in conversation
2009-07-03 10:48:15 -04:00
e2f8b8d65d
no limit on conversation stream
2009-07-03 10:40:23 -04:00
04c713e671
fixed limit for conversations
2009-07-03 10:37:39 -04:00
72d0ee4e25
move peoplesearchresults class to action/peoplesearch
2009-07-03 10:10:12 -04:00
f73d93fa7a
only show subscription controls to owner
2009-07-03 01:26:21 -04:00
acb4c78346
Route and stub for new friendships/show API method
2009-07-02 17:32:27 -07:00
bca3b3d36f
Send null as 2nd arg, not 3rd.
2009-07-02 15:09:48 -07:00
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
aea546c122
notice should show user design
2009-07-02 08:21:54 -04:00
b4de1d4636
favorites should show owner design
2009-07-02 08:21:41 -04:00
0e78e1cc52
Show HTML for thumbnails instead of redirecting. Remove dead code.
2009-07-01 16:24:22 -07:00
90557e9147
correctly return count of notices
2009-07-01 14:45:48 -04:00
0057f3da81
show all the notices, not just latest 20
2009-07-01 14:45:09 -04:00
3b6ff92495
don't redirect on local file for ajax action
2009-07-01 13:50:44 -04:00
fbb7757c4b
Cleaning up comments at top of favor.php.
2009-06-30 17:04:49 -07:00
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
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
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
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
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
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
c5ce56b878
calculate date once for SUP
2009-06-30 11:53:50 -04:00
4e6cd42757
conversation code changes
2009-06-30 11:50:16 -04:00
c01e8c0bd1
Fixed grammar in class comment blocks
2009-06-29 17:04:09 -07:00
4321e02c7b
Delete orphaned background imgs. Design settings code now passes
...
phpcs.
2009-06-29 16:57:36 -07:00
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
1268be4f82
Using role for admin indicator. Added margin-left.
2009-06-29 22:07:16 +00:00
135927e42a
Allow users and groups to reset their design to system default colors
2009-06-29 14:52:38 -07:00
5b8e40aaa9
admin indicators in groups
2009-06-29 10:29:11 -04:00
d03b8c4276
show section with admins in sidebar of group
2009-06-29 10:22:17 -04:00
70521d55a8
log IP for API auth errors
2009-06-27 07:37:58 -07:00
96ba25c34b
Added readonly flag to FileAction just in case
2009-06-26 18:31:24 -07:00
612a107e09
Merge branch '0.8.x' into small-fixes
2009-06-26 15:44:31 +08:00
71dc910a53
Merge branch '0.8.x' into notice-search-no-results
2009-06-26 15:42:37 +08:00
6328add622
Merge branch '0.8.x' into invite-enabled
2009-06-26 15:31:42 +08:00
899aad747a
Merge branch '0.8.x' into group-rss-empty
2009-06-26 15:30:24 +08:00
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
37796a8dc6
Make shorturls in notice content point to AttachmentAction urls
2009-06-25 15:42:17 -07:00
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
03d31911e1
FileAction redirections weren't being added (e.g.: /notice/$notice_id/file)
2009-06-25 13:51:29 -07:00
a7cdf32df5
max public page
2009-06-25 13:23:59 -07:00
638905c270
avoid getting duplicate errors on upload
2009-06-25 11:10:34 -07:00
4d56bc6a0a
streamline the file action
2009-06-25 11:08:32 -07:00
3ca9e85ce4
update conversations to use newer query format
2009-06-25 09:43:30 -07:00
bd9824c8d5
added missing conversation column to group by
2009-06-25 22:35:41 +12:00
e3c5d1664f
Take out noisy debugging statement
2009-06-24 16:10:28 -07:00
98f518b9af
fix bug in which design background could accidentally get removed
2009-06-24 00:00:36 -07:00
57903bf2ac
Make gateway notices available to the auth user in the API
2009-06-23 15:53:49 -07:00
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
31325f0995
Stop Twitter gateway notices from leaking via user faves pages
2009-06-23 13:51:23 -07:00
280f8faab4
Merge branch '0.8.x' into small-fixes
...
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
2009-06-24 01:25:55 +08:00
65f784120b
Merge branch '0.8.x' into notice-search-no-results
2009-06-24 01:18:35 +08:00
e261a97150
remove common_debug from newnotice
2009-06-23 07:48:33 -07:00
a21a9f26c5
append uploads to content rather than showing them double
2009-06-23 07:29:43 -07:00
e2becdb251
use a subclass for single notice items to show attachments
2009-06-23 07:25:18 -07:00
7bcaa858af
make file command configurable
2009-06-23 05:35:20 -07:00
d9bebfd651
Attachment upload server and path now configurable
2009-06-22 22:48:31 +00:00
aec6456c91
Update copyright dates in files modified in 2009
2009-06-20 16:12:55 -07:00
793a6a1155
change Controlez-Vous to Control Yourself
2009-06-20 16:00:04 -07:00
3f54840b51
Only show twitter msgs in your own inbox
2009-06-18 11:45:48 -07:00
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
Evan Prodromou
Jeffery To
Craig Andrews
Adrian Lang
Zach Copley
Sarven Capadisli
Eric Helgeson
Steve Winton
CiaranG
Dan Moore
Brenda Wallace