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
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
