Zach Copley
cd1361fe96
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-17 14:36:33 -07:00
Zach Copley
8992e8fa7a
Ticket 1612 - make destory (and create) favorites work via API
2009-06-17 14:34:04 -07:00
Zach Copley
7e25a7f3aa
Output XML and JSON error msgs for API calls
2009-06-17 14:32:36 -07:00
Robin Millette
b58dc5e961
Added config option to enable or disable file uploads with notices.
2009-06-17 16:55:01 -04:00
Robin Millette
28d02ec8cd
Make oohembed endpoint configurable.
2009-06-17 16:44:33 -04:00
Zach Copley
af4b18b1e2
Uppercase hex color values
2009-06-17 03:05:48 -07:00
Zach Copley
76cbeff33c
Update background image settings to use bitflags
2009-06-17 02:35:51 -07:00
Zach Copley
d1ae3176b6
Enable tiling of background imgs for Designs
2009-06-16 22:18:25 -07:00
Zach Copley
bc1f877f6e
Design settings now save and displays backgrounds
2009-06-16 19:17:37 -07:00
Zach Copley
c3c30aa0ea
Check to make sure a design exists before trying to display it
2009-06-15 23:18:54 -07:00
Zach Copley
ef99f83963
Output custom stylesheets on design sub-Actions
2009-06-15 22:13:35 -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
Zach Copley
e7e3709ae0
Throw an WebColorException if wrong # of hex chars
2009-06-15 21:21:33 -07:00
Zach Copley
20d9350877
User design setting save now
2009-06-15 20:21:33 -07:00
Evan Prodromou
fd290fc3f9
allow a configured base for cache keys
2009-06-15 16:09:40 -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
c077ad0775
Configurable avatar directory
...
Avatar directory and path are configurable.
2009-06-15 10:45:50 -07:00
Evan Prodromou
2b8a767770
make admins of groups
2009-06-15 00:59:15 -07:00
Evan Prodromou
4dad3191f6
Merge branch 'groupalias' into 0.8.x
2009-06-14 23:48:24 -07:00
Evan Prodromou
1b6b00a6d0
Link and distribute notices tagged for a group alias
...
Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
2009-06-14 23:43:47 -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
c0f3204a10
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 22:09:59 -07:00
Evan Prodromou
7097804eeb
typo in profileminilist class
2009-06-14 22:09:17 -07:00
Evan Prodromou
bef643352d
return count from show
2009-06-14 22:09:04 -07:00
Evan Prodromou
ee8dd62038
try to get the right class for profileminilist
2009-06-14 22:07:27 -07:00
Sarven Capadisli
8dd5871d4f
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-06-15 03:26:32 +00:00
Sarven Capadisli
0bc9b2e730
Cross-browser notice_attach
2009-06-15 03:21:15 +00: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
daf2e7ef47
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 14:54:20 -07:00
Evan Prodromou
b6ef8e735b
base class SubscriptionList for some actions
2009-06-14 14:53:42 -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
Robin Millette
7c772e1d63
Removed another bit of dead (commented out) code.
2009-06-14 15:48:46 -04:00
Zach Copley
946d016df2
Reworked output for design settings page
2009-06-14 02:03:50 -07: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
Sarven Capadisli
77c94c44a6
Removed hanging skin crapola
2009-06-14 05:57:59 +00: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
89d0583b91
Fixes Ticket #1607 - empty 'page-notice' definition lists were
...
being output in a bunch of places.
2009-06-12 17:06:42 -07:00
Zach Copley
fc6154fe4d
Add a method to check for registered event handlers
2009-06-12 16:56:43 -07:00
Sarven Capadisli
8524990512
http://laconi.ca/trac/ticket/1367
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:18:58 +00:00
Sarven Capadisli
4532babb6f
http://laconi.ca/trac/ticket/1370
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:15:30 +00:00
Sarven Capadisli
392c8d4a96
http://laconi.ca/trac/ticket/863
...
Thanks to Toby Inkster for the patch.
2009-06-12 16:13:45 +00:00
Sarven Capadisli
1627fe8f33
http://laconi.ca/trac/ticket/1368 Site is the space that Container
...
sits in.
Thanks to Toby Inkster for the patch.
2009-06-12 15:42:53 +00:00
Sarven Capadisli
e2476307ba
Updated Creative Commons namespace to current.
...
Thanks to Toby Inkster for the patch.
2009-06-12 15:41:45 +00:00
Jeffery To
53f31a247e
Fix missing max_id in API search calls
2009-06-12 20:03:18 +08:00
Jeffery To
e2b20bd1e6
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
2009-06-12 19:58:30 +08:00
Jeffery To
cfea2b0c4e
Fix "Trying to get property of non-object" errors when accessing the people search results page
2009-06-12 19:55:41 +08:00
Jeffery To
216ada5cc4
Fix "Trying to get property of non-object" errors in groupeditform.php
2009-06-12 19:48:26 +08:00
Zach Copley
8064397588
Ticket #1611 and a bunch of code cleanup
2009-06-12 01:31:22 -07:00
Robin Millette
ba6beaa310
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-10 14:18:41 -04:00
Robin Millette
e120cb1a53
Uploaded content now displays in overlay (and removed var_dump crap)
2009-06-10 14:17:46 -04:00
Evan Prodromou
5469e46ef5
merge error in util.php
2009-06-10 09:14:48 -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
ed627bb4bd
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-09 21:48:56 -07:00
Robin Millette
207750e757
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-09 15:19:19 -04:00
Robin Millette
27af3c67a2
Improve file upload and attachment interface.
2009-06-09 15:18:12 -04:00
Sarven Capadisli
3aebd847e7
Added title and minor CSS cleanup to notice attach
2009-06-09 17:34:33 +00: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
Evan Prodromou
2c81d8db76
don't send smses to sender
2009-06-05 10:07:26 -07:00
Sarven Capadisli
b708b81065
Init notice_data-attach UI for form_notice
2009-06-05 00:00:04 -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
0cbd72e092
Re-added some javascript to toggle upload field.
2009-06-01 15:52:52 -04:00
Robin Millette
4bd195b80f
Fixed small bug for attachment layout (css/js).
2009-06-01 19:40:39 +00:00
Sarven Capadisli
95bcc5afa1
Updated markup for notice form attachment
2009-06-01 15:18:23 -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
abe68f4318
Added attachments config descriptions to README.
2009-05-31 18:33:38 -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
76ee1fd5da
Removing inbox and memcached daemon handling
2009-05-30 04:40:47 -04:00
Evan Prodromou
45c58c74d4
take debug code out of omb.php
2009-05-30 03:31:26 -04:00
Zach Copley
78f8b91a13
Ticket #1568 - API should return full user objects
2009-05-29 19:23:53 -07:00
Evan Prodromou
f66e996073
Update version number to 0.7.4
...
Updated the version number to 0.7.4, added the new song title, and
documented the changes since 0.7.3.
2009-05-29 16:28:39 -04:00
Sarven Capadisli
b8de793556
Changed ul to ol and added xoxo for notice lists.
2009-05-29 02:38:38 +00:00
Sarven Capadisli
a456ceb47c
Merge branch '0.7.x' into 0.8.x
2009-05-29 00:10:23 +00:00
Evan Prodromou
3532cd0490
Only enqueue inbox-dependent transports after inboxes have been filled
2009-05-28 18:19:22 -04:00
Sarven Capadisli
60ac9bc6fd
Bunch of UI fixes/improvements for attachments (hover, overlay, notice view,
...
clip)
2009-05-27 19:43:43 +00:00
Evan Prodromou
d068680e19
optionally use SET NAMES for utf8 to DB
2009-05-27 14:57:45 -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
2b81dcb253
Better err handling when trying to get Facebook client
2009-05-27 00:01:39 +00:00
Zach Copley
a497114a55
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-26 23:22:29 +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
Evan Prodromou
0b53a820c2
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-26 17:28:12 -04:00
Evan Prodromou
da035331d8
fixes during checking of snapshot
2009-05-26 17:26:31 -04:00
Sarven Capadisli
c93031c2aa
Reusing base stylesheet (instead of hoping for FB to import it) in FB
...
app.
2009-05-26 03:34:00 +00:00
Evan Prodromou
76aa85fe5e
Merge branch '0.8.x' into stats
...
Conflicts:
README
2009-05-25 22:47:23 -04:00
Sarven Capadisli
0e8358bd23
Updated stylesheet paths for facebook app
2009-05-26 02:34:36 +00: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
594454ced3
Single anchor to include thumbnail and title for attachment
2009-05-25 15:38:50 -04:00
Robin Millette
84edf12791
Display thumbnail on hover over links in notices when appropriate.
2009-05-25 11:13:13 -04:00
Robin Millette
5f3acc2527
Removed big clip and replaced with smaller inline one next to each URL (in a notice) that's actually an attachment. Overlay (popup) on click.
2009-05-24 21:13:42 -04:00
Robin Millette
bd70caace8
Only show number of attachments if > 1
2009-05-24 18:06:19 -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
d60c399d82
remove old, unused PersonalAction and StreamAction
2009-05-23 23:40:27 -04:00
Evan Prodromou
91e088d341
make some actions CurrentUserDesignActions
2009-05-23 23:40:11 -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
63ad980767
current user design action
2009-05-23 23:11:36 -04:00
Evan Prodromou
eaac0f8e58
add an action base class for actions that show the owner's design
2009-05-23 23:09:33 -04:00
Evan Prodromou
4ec5ea510c
fix return value documentation for getDesign
2009-05-23 23:09:01 -04:00
Evan Prodromou
d92a018cd2
get a design for each page
2009-05-23 22:44:01 -04:00
Sarven Capadisli
9f23807af4
Removed inline styles from notice list items
2009-05-22 02:47:34 +00:00
Evan Prodromou
966f1c6169
Merge branch 'conversationtree' into 0.8.x
2009-05-21 11:43:28 -04:00
Evan Prodromou
b58edbcc4e
Merge branch '0.7.x' into conversationtree
2009-05-19 17:28:19 -04:00
Evan Prodromou
8cc8f9fd0c
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
...
Conflicts:
config.php.sample
2009-05-19 14:42:19 -04:00
Sarven Capadisli
8d68c5238d
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-05-18 23:28:48 +00:00
Sarven Capadisli
8b5bcae58f
Merge branch '0.7.x' into 0.8.x
...
Conflicts:
EVENTS.txt
2009-05-18 23:28:08 +00:00
Robin Millette
9261e48ef0
Removed dead code.
2009-05-18 19:23:18 -04:00
Robin Millette
f5606b6aa3
Added RSS for personal tags
2009-05-18 18:18:08 -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
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
Evan Prodromou
53d6a8ba61
Merge branch 'master' into 0.7.x
2009-05-17 12:16:02 -04:00
Zach Copley
811cef1008
Merge branch '0.8.x' into fbconnect
2009-05-15 23:17:57 +00:00
Zach Copley
a0320f03f5
Better err handling when trying to get Facebook client
2009-05-15 21:44:58 +00:00
Evan Prodromou
9d13890a85
add a hook for the page notice
2009-05-15 17:11:28 -04: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
14662354dc
add hooks for subgroupnav showing
2009-05-15 14:22:49 -04:00
Evan Prodromou
c6816c163e
reformat action.php
2009-05-15 14:18:04 -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
Evan Prodromou
99f8501d32
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
...
Conflicts:
config.php.sample
2009-05-11 17:53:23 -04:00
Robin Millette
d010d811ba
db stuff for URLs: redirections, oembed, etc.
2009-05-11 13:45:00 -04:00
Zach Copley
bc190595d1
Added TwitterStatusFetcher into daemon startup and shutdown subsystem
2009-05-07 02:07:31 -07: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
Zach Copley
e85cddba45
Ticket #1428 - Changed replies API method to "mentions".
2009-04-28 23:31:00 -07:00
Robin Millette
d71fbe9d96
fixed subscriptions dropdown action
2009-04-24 20:28:39 +00:00
Robin Millette
f2f4e8c586
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-24 20:01:25 +00:00
Robin Millette
c008c0d4a5
fixed trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds.
2009-04-24 20:01:03 +00:00
Evan Prodromou
1c0d82de3b
8-char limit on transports
2009-04-23 10:09:08 +00:00
Evan Prodromou
7c383dc1d4
alert to what transport we're checking for
2009-04-23 10:08:26 +00:00
Evan Prodromou
ece70bf326
incorrect config setting for inboxes
2009-04-23 09:35:10 +00:00
Evan Prodromou
85c7b8df71
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-23 05:24:13 -04:00
Evan Prodromou
aee45ea91d
Add an inbox queue handler
...
Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.
2009-04-23 05:08:48 -04:00
Evan Prodromou
640628de2d
A queuehandler for blowing caches offline
...
We add a queuehandler for blowing the memcached caches off-line. This
should speed up the processing of new notices.
2009-04-23 05:03:19 -04:00
Evan Prodromou
77c5aecaf5
Merge branch 'dev/0.8.x' into 0.8.x
2009-04-23 03:22:37 -04:00
CiaranG
ec5e06a542
Suppress errors when checking for the existence of files that might be restricted by open_basedir - should resolve issue #1310
2009-04-21 23:36:15 +01: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
Adrian Lang
558fa2743e
Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion.
2009-04-20 12:15:12 +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
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
4b54a418f3
trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds
2009-04-18 19:08:33 +00:00
Tobias Diekershoff
7196410bb0
shortening links in notices from XMPP
...
This patch enables shortening of links, that where send from XMPP.
The problem was, that in util.php common_current_user() is not
finding the user account from which is posted, so the service to
shorten is not known, so no shortening at all...
This patch cleans up the xmppdaemon a little bit and hard codes ur1.ca
as shortening service _if_ the user is not set. Ugly but working.
2009-04-18 19:00:20 +02:00
Robin Millette
cb645558a5
Fixed file that was removed by mistake.
2009-04-17 17:35:51 +00:00
Robin Millette
2873940265
Fixed file that was removed by mistake.
2009-04-17 17:31:22 +00:00
Robin Millette
2e06d5a2cb
file was removed by mistake.
2009-04-17 17:24:41 +00:00
Robin Millette
c024ee935a
file was removed by mistake.
2009-04-17 17:23:12 +00: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
Robin Millette
2eb1eb8683
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-17 16:47:18 +00:00
Robin Millette
21873b806d
cosmetic fixes.
2009-04-17 16:46:49 +00:00
Zach Copley
4d0e4f733b
Make API dates more compatible with Twitter - ticket 1432
2009-04-16 14:40:57 -07:00
Robin Millette
ed05569716
Add an even (hook): StartPersonalGroupNav.
2009-04-16 17:58:52 +00:00
Evan Prodromou
d76bb2fd11
Revert "allow snapshots to be disabled easily"
...
This reverts commit 0838143d58
.
Already handled with the 'never' option.
2009-04-16 13:05:35 -04:00
Evan Prodromou
ca5753255f
Merge branch '0.8.x' into stats
2009-04-16 12:58:07 -04:00
Evan Prodromou
546ab05dba
update version string for dev version
2009-04-16 12:57:57 -04:00
Evan Prodromou
0838143d58
allow snapshots to be disabled easily
2009-04-16 12:53:17 -04:00
Evan Prodromou
6a247acb45
Do some phpcs reformatting for snapshot
2009-04-16 12:50:29 -04:00
Evan Prodromou
415abdfdef
config options for snapshots
2009-04-16 12:50:13 -04:00
Evan Prodromou
5128448c77
code complete on snapshot.php
2009-04-16 12:41:30 -04:00
Evan Prodromou
c4040303ce
initial snapshot stuff
2009-04-16 10:18:16 -04:00
Evan Prodromou
55d7bb4701
Merge branch '0.7.x' into 0.8.x
2009-04-15 11:35:43 -04:00
Evan Prodromou
573d4cf0fb
Merge branch 'nobase' into 0.7.x
2009-04-15 11:31:57 -04:00
Evan Prodromou
ff7d711810
add user id to statistics
2009-04-15 10:27:41 -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
Evan Prodromou
8da76e0810
add user id to statistics
2009-04-15 10:05:16 -04: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
Sarven Capadisli
3cc94cc0bc
Merge branch '0.7.x' into 0.8.x
2009-04-14 23:35:06 +00:00
Sarven Capadisli
7095c93f66
Simpler separation of themes. New themes can either make use of the
...
default styles or make their own.
2009-04-14 23:13:02 +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
Zach Copley
cd9a247980
Fix bad dates in API's JSON search results
2009-04-14 16:02:26 -04:00
Evan Prodromou
b142c26010
Make stuff work with no base
2009-04-14 16:02:09 -04:00
Evan Prodromou
0073a75dff
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-14 16:01:22 -04:00
Sarven Capadisli
0b3bd63a30
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-14 19:14:39 +00:00
Sarven Capadisli
4c29cda000
Merge branch '0.7.x' into 0.8.x
2009-04-14 19:14:32 +00:00
Evan Prodromou
41b247ac1a
Merge branch '0.7.x' into 0.8.x
2009-04-14 14:29:51 -04:00
Zach Copley
01695dc346
Fix bad dates in API's JSON search results
2009-04-13 15:03:34 -07:00
Evan Prodromou
1bae34e24f
typo in lib action
2009-04-13 15:55:53 -04:00
Evan Prodromou
7f81597a81
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:55:25 -04:00
Evan Prodromou
4684d34713
typo in lib action
2009-04-13 15:54:16 -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
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
Sarven Capadisli
030477b02a
Separation of themes (i.e., layout, typography) and skins (i.e., background
...
images, colours).
A theme can have multiple skins.
Majority of the changes in this commit are due to restructuring the
path/files for themes and skins.
Both theme and skin will be set to 'default' if not set in
config.php.
This commit also allows each instance of this software to create
its own theme without having to override any style from the default
distribution.
Added Cloudy theme.
2009-04-12 02:08:55 +00:00
Sarven Capadisli
3b9f235e42
Trimming the accept header parts for better content type comparison.
...
e.g., ' text/xml' != 'text/xml'
2009-04-10 17:40:45 +00: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
8013a4b347
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-08 00:58:52 -04:00