Commit Graph

4524 Commits

Author SHA1 Message Date
Zach Copley 969a558339 Change a few things around for CORS header output 2011-07-07 17:19:59 -07:00
Zach Copley cb183359e2 Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157 2011-07-07 15:58:28 -07:00
Evan Prodromou 12e0f89155 don't show see-all if less than hard max 2011-07-07 10:58:44 -04:00
Evan Prodromou 749804f8cb ListsNav is a MoreMenu 2011-07-07 10:42:31 -04:00
Evan Prodromou feb53619cf Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	js/util.min.js
2011-07-07 10:27:54 -04:00
Evan Prodromou 1598050f54 Show more menu items when you click More
I added the necessary JavaScript to show more menu items when you click More.
2011-07-07 10:26:07 -04:00
Evan Prodromou 1c917ac28f start making more menu work 2011-07-06 18:40:02 -04:00
Evan Prodromou 74f8c51358 correctly output richer nav IDs 2011-07-06 11:19:47 -04:00
Evan Prodromou eb430f9cb3 don't add empty classes to menu items 2011-07-06 11:18:53 -04:00
Evan Prodromou 663bc35390 GroupsNav uses new Menu class functionality 2011-07-06 11:10:26 -04:00
Evan Prodromou 0e07124a1e make Menu class more functional 2011-07-06 11:10:08 -04:00
Evan Prodromou 97d77a7c75 Revert "add a 'more' button for groups menu"
This reverts commit 3226f2bef6.
2011-07-06 10:17:22 -04:00
Zach Copley 038ee13e79 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-05 17:30:01 -07:00
Zach Copley 7150c54a3f Fix invite button for public sites 2011-07-05 17:27:11 -07:00
Evan Prodromou 3226f2bef6 add a 'more' button for groups menu 2011-07-05 19:20:44 -04:00
Evan Prodromou 7e9c17bd15 make the default scope depend on site/private 2011-07-01 21:50:04 -04:00
flyingmana 3c47d158f4 make cors header deactivatable 2011-06-29 22:39:33 +02:00
Evan Prodromou 13d479bc18 stop sending OMB by default 2011-06-27 13:02:32 -04:00
Evan Prodromou b25e957be5 correct const for ActivityStreamJSONDocument::CONTENT_TYPE 2011-06-23 11:39:08 -04:00
Evan Prodromou fadc4df039 use application/stream+json for Activity Streams 2011-06-23 11:24:37 -04:00
Evan Prodromou 83a8cac961 Merge branch '1.0.x' into testing 2011-06-22 17:21:20 -04:00
Evan Prodromou e5d8fd6857 Add Activity Streams feeds to export data 2011-06-22 17:09:04 -04:00
Evan Prodromou 0f53c07f56 Merge branch '1.0.x' into testing 2011-06-21 11:33:18 -04:00
Evan Prodromou 9f785f6734 Fix addressees when drop-down for a single user is used 2011-06-21 11:32:26 -04:00
Evan Prodromou f078c19f09 Merge branch '1.0.x' into testing 2011-06-20 12:23:16 -04:00
Evan Prodromou 01996b1a46 Merge remote-tracking branch 'evan/blogplugin' into newblogplugin 2011-06-20 09:34:32 -04:00
Evan Prodromou 8104b1f766 Merge branch '1.0.x' into testing 2011-06-20 09:13:42 -04:00
Evan Prodromou ab98458399 push regex pattern for UUID to that class 2011-06-20 01:11:08 -04:00
Siebrand Mazeland 26a92b2801 Hopefully fix TRANS message not getting picked up by xgettext. 2011-06-19 11:45:37 +02:00
Siebrand Mazeland c2ab4af804 Fix incorrect tag (missing colon). 2011-06-19 11:30:35 +02:00
Siebrand Mazeland 173d20e1f9 L10n updates. 2011-06-17 22:36:24 +02:00
Evan Prodromou e43a6241cb pass nickname into mail_send_sms_notice_address() 2011-06-14 11:33:52 -04:00
Zach Copley e1ac64f2cb Add current class to selected menu items 2011-06-09 19:29:19 -04:00
Zach Copley 36d619480a Rip out user, group and site design customization code
Squashed commit of the following:

commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:51:47 2011 -0400

    Remove design-related stuff from the API

commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:40:16 2011 -0400

    Mop up misc design related code

commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:21:00 2011 -0400

    Remove Design DB_DataObject class and references to it in schema

commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:15:54 2011 -0400

    Remove design-related actions and widgets

commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:10:57 2011 -0400

    Remove navigation / routing to design settings actions

commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:03:09 2011 -0400

    CurrentUserDesignAction -> Action

commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:54:22 2011 -0400

    * GroupDesignAction -> GroupAction (new base class for group actions)

commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:36:40 2011 -0400

    OwnerDesignAction -> Action
2011-06-09 16:20:19 -04:00
Evan Prodromou a10edb3183 Merge branch 'testing' into 1.0.x
Conflicts:
	plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
	plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
2011-06-07 16:04:49 -04:00
Zach Copley 895447f3dc Upgrade anti-framing, anti-clickjacking code 2011-06-06 06:08:17 +00:00
Siebrand Mazeland 3dcdf2ef03 Update translator documentation. 2011-06-05 11:12:34 +02:00
Evan Prodromou f4e17c1bdf Merge branch '1.0.x' into testing 2011-05-31 17:16:45 -04:00
Evan Prodromou 506958f2c8 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-31 17:01:11 -04:00
Evan Prodromou 60a1b0a15a Change 'listening to your notices' to 'following you' 2011-05-31 17:00:23 -04:00
Evan Prodromou ac55efeecf Don't show empty addressees in noticelistitem 2011-05-30 16:20:52 -04:00
Evan Prodromou 0dbdcf2936 Merge branch 'master' into 1.0.x 2011-05-30 11:18:34 -04:00
Evan Prodromou 19b965d991 Merge branch 'master' into testing 2011-05-30 11:18:22 -04:00
Evan Prodromou 9167ba8d2d ActivityImporter catches thrown exceptions by plugins and marks entry done 2011-05-30 09:57:49 -04:00
Evan Prodromou 97debbab68 use integer iterator for childNodes in ActivityUtils::getLinks() 2011-05-30 09:57:11 -04:00
Evan Prodromou d7a16929b9 Set the current user on API calls 2011-05-25 14:01:22 -04:00
Evan Prodromou a838891c0e set the current user in api actions 2011-05-25 13:04:35 -04:00
Evan Prodromou b34e267e53 Merge branch '1.0.x' into testing
Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
Evan Prodromou cb090ab48d increment alpha version revision 2011-05-23 12:37:29 -04:00
Siebrand Mazeland e48c26e156 Update translator documentation, i18n and L10n. 2011-05-20 16:57:05 +02:00