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
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
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
Zach Copley
Craig Andrews
CiaranG
Dan Moore
Evan Prodromou
Sarven Capadisli
Jeffery To