Commit Graph

4995 Commits

Author SHA1 Message Date
Evan Prodromou a053d96bf2 Better list-unwrapping in MoreMenu 2011-08-23 00:32:46 -04:00
Evan Prodromou 5e61ec5e01 avoid producing notices for last element in MoreMenu 2011-08-22 23:53:34 -04:00
Evan Prodromou 0022bb8110 fix calls to staticGet() to avoid problems with default args 2011-08-22 18:06:06 -04:00
Evan Prodromou 7c6399a51a Remove now-unused statusnet.ini 2011-08-22 18:03:05 -04:00
Evan Prodromou 2f1751568a pre-fill repeats of notices 2011-08-22 12:39:37 -04:00
Evan Prodromou d3399e93e8 use listGet() for ConversationNoticeStream 2011-08-22 12:25:04 -04:00
Evan Prodromou 0a17e7cf9f Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
Conflicts:
	classes/Memcached_DataObject.php
2011-08-22 11:25:13 -04:00
Siebrand Mazeland 5d557a2656 Add translator documentation.
Whitespace updates.
2011-08-19 18:13:25 +02:00
Siebrand Mazeland b1ff67a55e Add translator documentation.
L10n updates.
Whitespace updates.
2011-08-19 18:11:31 +02:00
Zach Copley 76c48a7099 Fix syntax err 2011-08-18 18:17:38 -07:00
Evan Prodromou ff656a8b3a Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-08-18 17:27:55 -07:00
Siebrand Mazeland edd8045375 Message tweaks and elaborations as well as translator documentation tweaks. Based on comments by OsamaK. 2011-08-18 15:11:10 +02:00
Evan Prodromou 827b13a2a4 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-08-16 15:59:06 -04:00
Siebrand Mazeland 0a420fd7d0 More list... 2011-08-15 16:06:35 +02:00
Siebrand Mazeland 6f386b2f8b Update translator documentation. 2011-08-15 15:50:36 +02:00
Evan Prodromou 632ed129eb Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-08-08 12:01:48 -04:00
Evan Prodromou e09310ffb7 Cache the repeat_of query for noticelists 2011-08-08 10:51:13 -04:00
Evan Prodromou 0c762dde42 pre-fill all notices in conversations on the page 2011-08-08 10:39:45 -04:00
Evan Prodromou 8b32ac85d8 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-05 10:42:42 -04:00
Evan Prodromou 0502e1d737 Properly structure X-XSS-Protection header 2011-08-05 10:42:18 -04:00
Evan Prodromou 7ce2b3c756 change 140-char limit to unlimited by default 2011-08-03 12:50:12 -04:00
Evan Prodromou 16042387a0 pre-fill the addressees of notices in a list 2011-08-03 00:59:09 -04:00
Evan Prodromou ba6235a446 Get faves in Notice and pre-fill 2011-08-03 00:04:18 -04:00
Evan Prodromou dfbdd481fa Pre-fill Notice attachments 2011-08-02 23:12:21 -04:00
Evan Prodromou 9cab0958f5 use Notice::attachments() to get attachments for a notice 2011-08-02 18:22:06 -04:00
Evan Prodromou d918ee95f4 pre-fetch groups for notices 2011-08-02 18:13:56 -04:00
Evan Prodromou dc690459f5 1.0.0beta2 2011-08-02 15:12:27 -04:00
Evan Prodromou 513c54fa89 Merge branch 'master' into 1.0.x
Conflicts:
	lib/common.php
2011-08-02 15:04:14 -04:00
Evan Prodromou 6ce8134471 New release because I'm stupid 2011-08-02 14:40:23 -04:00
Evan Prodromou edb3f704b9 correctly include UTF-8 alphanum chars in tags 2011-08-02 14:03:12 -04:00
Evan Prodromou 10ce44c297 cleanse tags of non-tag characters when canonicalizing 2011-08-02 13:49:00 -04:00
Evan Prodromou f6a7335ccd Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-02 13:13:10 -04:00
Evan Prodromou 58d798b607 Change NoticeList::prefill() to a static function 2011-08-02 12:01:41 -04:00
Evan Prodromou 06e2422517 pre-fill avatars for Profiles in a notice list 2011-08-02 11:54:27 -04:00
Evan Prodromou 5a132dbef0 correct pagination for noticelist 2011-08-02 11:22:37 -04:00
Zach Copley b925eeecde Fix errors thrown by code trying to broadcast profiles via OMB when the OMB plugin isn't installed 2011-08-02 01:15:30 -07:00
Evan Prodromou b9cabd45de Move prefill call to noticelist class 2011-08-01 16:43:44 -04:00
Evan Prodromou 874f1db389 Pre-fill profiles in notice streams 2011-08-01 14:51:59 -04:00
Evan Prodromou e0238e7c17 Update version number 2011-08-01 11:15:49 -04:00
Brion Vibber fcc4bbde19 Fix a glitch on AtomPub posting for micro-apps -- hook wasn't returning the new notice back to the calling code. 2011-07-26 12:19:33 -07:00
Evan Prodromou 0ec3047e0c Move AtomPubClient to its own module 2011-07-25 23:15:32 -04:00
Evan Prodromou f726df9748 check explicitly for ActivityObject in microappplugin 2011-07-20 11:39:51 -04:00
Evan Prodromou 0ad7411343 Make process*() functions return existing or new notice 2011-07-20 11:33:28 -04:00
Evan Prodromou 383f14c781 Try to get only immediate children (again) 2011-07-19 16:38:58 -04:00
Evan Prodromou c86f0ffa2f Avoid slurping objects recursively in activity parsing 2011-07-19 16:18:29 -04:00
Evan Prodromou 22b565a937 special case for parsing embedded activities in SHARE verb 2011-07-19 16:02:28 -04:00
Evan Prodromou 4a6f576478 'type' => 'objectType' for embedded activities 2011-07-18 17:42:28 -04:00
Evan Prodromou d277f343ca Encode repeats as share activities 2011-07-18 17:06:03 -04:00
Evan Prodromou e274ec4900 Merge branch 'testing' into 1.0.x 2011-07-18 10:45:32 -04:00
Evan Prodromou 98064e6336 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-15 17:46:19 -04:00
Zach Copley 6f0bd73e6c Squashed commit of the following:
Move OMB to a plugin

commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 11:16:54 2011 -0700

    Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2

    * 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Fix paths
      Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
      Some odds and ends
      Remove omb stuff from queuemanager defaults
      Add check to make sure we're not untagging an OMB profile to OMB plugin
      Move some more subscription stuff and peopletag checks to OMB plugin
      Move some OMB-specific unsubscribe stuff to OMB plugin
      Finish removing libomb from core extlibs
      Fix more conflicts
      Fix queuing/queuehandling
      Move some stuff around; fix references
      Fix conflicts
      Move OMB-specific files to OMB plugin
      Move some stuff around; fix references
      Add OMB plugin README and rm references to OMB in mail StatusNet README
      Update paths
      Fix define
      Basic plugin finished
      Move OMB-specific files to OMB plugin
      Remove OMB stuff from router

commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router

commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router
2011-07-15 12:13:57 -07:00
Evan Prodromou c579bcae7b conversation API 2011-07-15 12:49:52 -04:00
Evan Prodromou dc7099aa5a ArrayWrapper::fetchAll() shortcut 2011-07-14 14:40:57 -04:00
Evan Prodromou 18fe1ac524 Revert "Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()""
This reverts commit b1c12648f0.
2011-07-14 13:15:28 -04:00
Evan Prodromou b1c12648f0 Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()"
This reverts commit 9ab0a6f760.
2011-07-14 13:07:34 -04:00
Evan Prodromou 1280a9345f use Notice::fetchAll() in ConversationNoticeStream 2011-07-14 12:54:07 -04:00
Evan Prodromou 9ab0a6f760 use Notice::multiGet() for NoticeStream::getStreamByIds() 2011-07-14 12:03:33 -04:00
Shashi Gowda efb7d28d83 Fix problems in joinAdd with xampp
Xampp ships with a different version of DB_DataObject PEAR package that
cannot do joins using objects correctly. This patch fixes the problem
2011-07-09 06:26:46 +05:30
Evan Prodromou 41c2102d0b Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-08 10:18:16 -04:00
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 f6e929d61c beta1 2011-07-07 13:12:34 -04: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
Ian Denhardt 31b29fde50 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
Conflicts:
	plugins/OStatus/actions/ostatusinit.php
2011-05-23 21:50:48 -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
Evan Prodromou 5a86900a34 minor alpha version for i18n build errors 2011-05-20 06:09:37 -07:00
Evan Prodromou c2f735a84e rev to alpha3 2011-05-20 06:03:36 -07:00
Samantha Doherty fbc5de3268 Add missing li tags in settings and admin menus. 2011-05-18 12:13:34 -04:00
Samantha Doherty 4549d36862 Change addressees arrow from hardcoded to CSS. 2011-05-18 09:49:01 -04:00
Samantha Doherty 37cf7c0e8c Style for invite forms and width fix for Onboard popup. 2011-05-11 17:07:08 -04:00
Zach Copley 8597856b56 Fancier invitation form for whitelisted domains
Squashed commit of the following:

commit 1c0766e8f9d9e962ec553e2fb35bd2f944ffb4b0
Author: Zach Copley <zach@status.net>
Date:   Mon May 9 17:00:51 2011 -0700

    Make the invites from the fancier invite form save

commit 9ea45b7cf38eda8dad1d82e87b3400413a532079
Author: Zach Copley <zach@status.net>
Date:   Fri May 6 16:14:40 2011 -0700

    .js to let the user add (and remove) additional invitees from their domain

commit b2a02339bd11d02c7cba24629dde359e22de32b6
Author: Zach Copley <zach@status.net>
Date:   Thu May 5 15:44:49 2011 -0700

    Load special whitelist invite .js when loading the invite page

commit 132fed7550b40cd1d46ee506fd83974a116bce32
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:35:49 2011 -0700

    Remove settings class from whitelist inviter form

commit a38437351b505594aead5da86af9a5ed089666b6
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:21:18 2011 -0700

    Make a fancier form for whitelist domain invites

commit 710d4f41edf412871a9c1fbf33af317226485325
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:34:09 2011 -0700

    Add some more events to the invitation page

commit 2449e4e0c1bf11568968cfc3ea2d8e69db2d875e
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:12:36 2011 -0700

    Refactor invite action a bit
2011-05-09 17:07:36 -07:00
Siebrand Mazeland 3b3bf74176 Harcode three newlines that lead to issues with translations (as fixed in Commit:5e7e5dd93cd3d73e2f2c93225cf8688844138380 by Evan). 2011-05-05 12:36:56 +02:00
Evan Prodromou c97048d01b merge 0.9.x into 1.0.x 2011-05-04 14:59:39 -07:00
Evan Prodromou c46406b209 low-level hook for loading templates 2011-05-04 11:28:49 -07:00
Evan Prodromou 6b1732d9a2 remove object nav for search 2011-05-04 10:43:47 -07:00
Evan Prodromou 90eb09624c let users login with email address 2011-05-02 15:17:08 -07:00
Evan Prodromou 02c5d68bed Merge branch 'emailsitesetup' into 1.0.x 2011-04-28 12:44:21 -07:00
Evan Prodromou fad0c875ca Don't redefine 'STATUSNET' in installer 2011-04-28 12:38:07 -07:00
Siebrand Mazeland 7c3818c00e Update translator documentation. 2011-04-27 14:30:58 +02:00
Evan Prodromou d09df28040 utility functions for setting config options in memory 2011-04-26 16:50:42 -04:00
Siebrand Mazeland a2e4a1803c Harmonize message for 'User has no profile.' and update translator documentation. 2011-04-25 22:44:19 +02:00
Siebrand Mazeland 413d9e2fd0 Whitespace updates. 2011-04-24 18:50:55 +02:00
Siebrand Mazeland 8afda686d2 @evan Please check. Doesn't look correct/complete. 2011-04-24 18:50:03 +02:00
Evan Prodromou f79d59a081 Merge branch '1.0.x' into testing 2011-04-21 16:16:07 -04:00
Evan Prodromou 5fd08b798f show thumbnails even for links that arent enclosures 2011-04-21 16:13:32 -04:00
Evan Prodromou 963d052653 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-21 15:23:22 -04:00
Siebrand Mazeland 5e97047f8f Update translator documentation.
i18n fixes.
Whitespace updates.
2011-04-21 20:26:58 +02:00
Siebrand Mazeland 98cc1da7b5 Update indentation. 2011-04-21 20:19:51 +02:00
Evan Prodromou 63009f1e1b Merge branch '1.0.x' into testing 2011-04-21 13:37:15 -04:00
Evan Prodromou 36d56232c6 a little better notice hiding 2011-04-21 13:37:05 -04:00
Evan Prodromou 9fcda5b2da show the full name for likes 2011-04-21 12:00:10 -04:00
Evan Prodromou 34e26b53d5 show list of people who like something in threadednoticelist 2011-04-21 11:58:24 -04:00
Evan Prodromou 5899a3f5ee fail gracefully when no IDs for tag cloud 2011-04-20 19:07:07 -04:00
Evan Prodromou 0c0aabeda5 show tag cloud in public stream 2011-04-20 17:17:36 -04:00
Evan Prodromou 4fa7f147b0 Make tag-per-group optional, default false 2011-04-20 16:19:07 -04:00
Evan Prodromou e686199616 accidentally stored wrong personaltagcloudsection 2011-04-20 16:12:49 -04:00
Evan Prodromou 776c2c99ea inbox tag cloud section 2011-04-20 16:11:42 -04:00
Evan Prodromou 3904ab9983 only 10 tags per section 2011-04-20 16:11:04 -04:00
Evan Prodromou cacf627ce3 remove hidden <h2> in notice list 2011-04-20 13:41:50 -04:00
Evan Prodromou 1e2bd48c30 correctly output notice data for nli in microapp 2011-04-19 17:55:57 -04:00
Evan Prodromou 7c31462f86 Let showNotice() go unimplemented
Default implementation of showNotice().
2011-04-19 16:00:31 -04:00
Evan Prodromou efabb002e4 use an adapter pattern to customize notice list item output 2011-04-19 15:43:06 -04:00
Evan Prodromou 1619578818 fix bad variable, show frame length 2011-04-18 19:33:00 -04:00
Evan Prodromou 3fd6b9d474 capture some info if serialization fails on stomp frame 2011-04-18 17:55:38 -04:00
Evan Prodromou 2757bd8428 Revert "put some debugging code into the home and public timelines"
This reverts commit aa7b6447a1.
2011-04-18 16:43:54 -04:00
Evan Prodromou aa7b6447a1 put some debugging code into the home and public timelines 2011-04-18 16:20:51 -04:00
Evan Prodromou b81ddc70df correct category on inboxnoticestream 2011-04-18 16:19:15 -04:00
Evan Prodromou d3215adfa1 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-18 12:54:23 -04:00
Evan Prodromou 9e7b880df7 Revert "disable showing tags; it throws a notice for me"
This reverts commit 7d6efbf29e.
2011-04-18 10:08:26 -04:00
Evan Prodromou 7d6efbf29e disable showing tags; it throws a notice for me 2011-04-18 10:03:38 -04:00
Evan Prodromou 28d0d9caad loop through args in common_markup_to_html 2011-04-18 09:51:26 -04:00
Evan Prodromou b72788d9ce pass args from Docfile to renderer 2011-04-18 09:47:08 -04:00
Evan Prodromou 99d538af58 docfiles can take arguments 2011-04-18 09:03:43 -04:00
Evan Prodromou 551a4e8324 mail paths for docfile 2011-04-18 09:03:28 -04:00
Evan Prodromou 4784e3fe36 correctly parse help files 2011-04-18 06:30:33 -04:00
Evan Prodromou e53edc2b6b allow user properties in documentation files 2011-04-18 06:17:28 -04:00
Evan Prodromou ef67262a3f Externalize document-finding code so plugins can use it 2011-04-18 06:16:32 -04:00
Samantha Doherty 368b810a0e Add new Infield Label jQuery plugin files to action.php 2011-04-18 00:27:46 -04:00
Zach Copley 5206ee7f9a Allow setting separate name and id in textare inputs, and cols and rows 2011-04-17 15:09:00 -07:00
Zach Copley 606d7d7185 Allow setting separate name and id on form input elements 2011-04-17 14:29:38 -07:00
Evan Prodromou 5e50acb23b Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-17 17:00:54 -04:00
Evan Prodromou b1cc12af2c use small triangle for notice addressees 2011-04-17 17:00:38 -04:00
Siebrand Mazeland 4ab995dd1e Complete "people tag" to "list" in UI messages.
Update translator documentation accordingly.

Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
Siebrand Mazeland 25e38ebeca Add/update translator documentation. 2011-04-17 13:00:52 +02:00
Siebrand Mazeland d26d408304 Add support for Tagalog. 2011-04-17 10:49:48 +02:00
Siebrand Mazeland 8cfd8450d5 Update/fix translator documentation. 2011-04-17 02:26:53 +02:00
Siebrand Mazeland 858aa37985 i18n fixes.
Translator documentation added.
2011-04-17 00:36:14 +02:00
Evan Prodromou f548831eb1 hide the nickname so it doesn't go into replies 2011-04-16 16:29:09 -04:00
Evan Prodromou 51a7e9961d Merge branch '1.0.x' into testing 2011-04-16 15:58:16 -04:00
Evan Prodromou 53c927ed8e don't show addressee info for root notice of conversation 2011-04-16 15:39:54 -04:00
Evan Prodromou 1c3ce200e7 show addressee arrow if just a notice to a user 2011-04-16 15:39:34 -04:00
Evan Prodromou 83dfe5ed3e show addressees in notice lists 2011-04-16 15:30:50 -04:00
Evan Prodromou b3e7838552 show best name in noticelistitem 2011-04-16 11:22:46 -04:00
Evan Prodromou ff782f1d97 Thread by conversation, not id 2011-04-15 18:28:36 -04:00
Evan Prodromou 2dd81d9a5c add a threading notice stream class 2011-04-15 18:20:54 -04:00
Evan Prodromou 97bae46da1 Revert "Add threading notice stream class to threaded pages"
This reverts commit 97a8bae4a9.
2011-04-15 18:20:06 -04:00
Evan Prodromou 97a8bae4a9 Add threading notice stream class to threaded pages
For those pages where threading is important, we now have an extra filtering stream
class to skip stuff in conversations that have "already" been seen.
2011-04-15 18:17:48 -04:00
Zach Copley da6822c1f0 Merge branch 'lists_fixes' into 1.0.x 2011-04-15 20:50:04 +00:00
Shashi Gowda b78e5de474 Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists. 2011-04-16 00:52:58 +05:30
Siebrand Mazeland c27b9c0722 Update translator documentation.
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland edb467978d Fix incorrect translator documentation. 2011-04-15 09:31:30 +02:00
Zach Copley bef1ed75b5 Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x 2011-04-14 22:29:11 +00:00
Evan Prodromou 3d9dc111a2 class on the invite link 2011-04-14 18:28:37 -04:00
Shashi Gowda 7224ca571c List timeline cache blowing wasn't working. fixed. 2011-04-14 22:28:25 +00:00
Evan Prodromou 873b1fb186 invite button section 2011-04-14 18:19:09 -04:00
Evan Prodromou f512e3df40 breakup Section::show() 2011-04-14 18:18:39 -04:00
Evan Prodromou 9eba121339 better title for active groups 2011-04-14 18:16:27 -04:00
Evan Prodromou e5a84bfca2 better title for active groups 2011-04-14 18:16:10 -04:00
Evan Prodromou 9208c94b29 don't show private lists; correct link in header 2011-04-14 17:27:26 -04:00
Evan Prodromou edee3995c2 no All groups link 2011-04-14 17:14:57 -04:00
Evan Prodromou c8a58c924b show lists as a comma-separated list in sidebar 2011-04-14 17:03:10 -04:00
Evan Prodromou 90e6eab68e show user's lists in sidebar 2011-04-14 16:57:50 -04:00
Evan Prodromou 14308c21db Don't show featuredusersection by default 2011-04-14 16:25:13 -04:00
Evan Prodromou a2d1eb399f disable sms, email by post by default 2011-04-14 16:24:56 -04:00
Evan Prodromou 9ef13976fc Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-14 16:09:18 -04:00
Evan Prodromou 80ba45d665 better title for personal tagcloud section 2011-04-14 16:08:26 -04:00
Evan Prodromou ddb03c9fc6 move follower/following/groups stats to those sections 2011-04-14 16:08:10 -04:00
Evan Prodromou 0c52ed76dd gallery actions use same aside as profile 2011-04-14 15:50:45 -04:00
Zach Copley 7a00be5cc7 Merge branch 'people_tag_fixes' into 1.0.x 2011-04-14 19:50:44 +00:00
Shashi Gowda 45952ff164 "Lists with you" and "List subscriptions" in the right aside, "Lists" in the left aside 2011-04-14 19:49:43 +00:00
Shashi Gowda 53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Shashi Gowda 22f6151a10 Annihilate profile_tag_inbox. 2011-04-14 19:45:31 +00:00
Evan Prodromou b64a1ef0e7 No All subscriptions/subscribers links 2011-04-14 15:43:08 -04:00
Evan Prodromou 0ff4dc0a03 just 8 groups per minilist 2011-04-14 15:07:24 -04:00
Evan Prodromou 52e3a72102 just one line of 8 in the minilist 2011-04-14 14:58:24 -04:00
Zach Copley bcafe0f819 Can't put a form (block level element) inside a span; changed it to a div 2011-04-13 17:34:31 -07:00
Zach Copley e188a11ef6 Fix public group nav to highlight properly when our group directory is selected 2011-04-13 16:11:34 -07:00
Zach Copley 0f9d6f4c82 DirectoryPlugin - Hijack router mapping for normal groups page to substitute a directory page 2011-04-13 15:09:45 -07:00
Siebrand Mazeland f20ddaec56 Add plural support where needed for added/removed tags messages. 2011-04-13 13:30:21 +02:00
Zach Copley 03de85ed46 Make it so input forms that don't have navigation don't accidentally get hidden. Add a "nonav" class to them. 2011-04-12 14:20:19 -07:00
Zach Copley fcd863bba9 Theming - add some new markup to DM and new notice pages 2011-04-12 11:54:12 -07:00
Evan Prodromou be467fef91 like search is the default for 1.0.x 2011-04-11 19:00:25 -04:00
Evan Prodromou 4331b8b4f1 make search results privacy-aware 2011-04-11 18:59:58 -04:00
Evan Prodromou 9204719522 inviteonly by default 2011-04-11 17:06:20 -04:00
Evan Prodromou 09cffc1928 hide and disable ToSelector for replies 2011-04-11 12:55:49 -04:00
Evan Prodromou d197c86a61 show full threaded notice list in conversation view 2011-04-11 12:39:06 -04:00
Evan Prodromou d7f96307dc all filtering stream classes take an optional profile parameter 2011-04-11 12:32:35 -04:00
Evan Prodromou 820e19e197 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-11 11:20:27 -04:00
Evan Prodromou 61f62241da Get conversation root visible to this user in threadednoticelist 2011-04-11 11:19:11 -04:00
Evan Prodromou cc9f65ac81 pass profile down to ScopingNoticeStream in publicnoticestream 2011-04-11 11:17:38 -04:00
Evan Prodromou bae9eacaa1 use -1 for invalid arg default in ScopingNoticeStream 2011-04-11 11:17:14 -04:00
Samantha Doherty 13e2acaf5c Formatting for profile/group account blocks and entity action buttons. 2011-04-11 10:05:36 -04:00
Zach Copley 3ddaa5bff4 Fix bad i18n function call 2011-04-10 19:07:30 -07:00
Evan Prodromou 70faf76001 threadednoticelist takes a profile param 2011-04-10 20:16:51 -04:00
Evan Prodromou dfdde5d2bc groupnoticelist takes a profile param 2011-04-10 20:16:37 -04:00
Evan Prodromou 8b54f28330 getNotices() takes optional last 2 params 2011-04-10 20:16:14 -04:00
Evan Prodromou dad5db25e2 start the div 2011-04-10 19:34:48 -04:00
Evan Prodromou 57741c46ef try to fall back to default for exceptions on microapps 2011-04-10 19:33:11 -04:00
Siebrand Mazeland f0d762f196 Update/add translator documentation.
L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.

Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855).
2011-04-10 19:59:55 +02:00
Siebrand Mazeland cad040ce4e Leding tabs to spaces.
Superfluous whitespace removed.
2011-04-10 19:33:58 +02:00
Zach Copley e75c9988eb Merge branch 'people_tags_rebase' into 1.0.x
Conflicts:
	EVENTS.txt
2011-04-10 08:10:01 +00:00
Evan Prodromou c382a1d8cc fix errant class in notice content 2011-04-09 17:05:59 -04:00
Evan Prodromou 4d0f42aea2 Events for showing the 'tail' of a threaded notice 2011-04-09 16:58:38 -04:00
Evan Prodromou 8aacc4b84a Revert "Add an indicator saying to whom a notice is addressed"
This reverts commit 2c14185a52.
2011-04-09 16:30:52 -04:00
Evan Prodromou ec1579474c add classes to profile and group links in notices 2011-04-09 15:42:27 -04:00
Evan Prodromou 2c14185a52 Add an indicator saying to whom a notice is addressed 2011-04-09 15:41:48 -04:00
Shashi Gowda f47027abbe Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
2011-04-09 21:57:45 +05:30
Zach Copley 285c2ee72d Remove debugging statement 2011-04-08 17:41:40 -07:00
Zach Copley e3789488c6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  use conversationnoticestream in conversationrepliesaction
  use conversationnoticestream in conversationaction
  make ConversationNoticeStream accept a profile parameter
  enable user directory and extended profile by default
  Remove incompatible theme victorian
  Remove incompatible theme shiny
  Remove incompatible theme pigeonthoughts
  Remove incompatible theme mnml
  Remove incompatible theme identica
  Remove incompatible theme h4ck3r
  Remove incompatible theme default
  Remove incompatible theme cloudy
  Remove incompatible theme cleaner
  Remove incompatible theme clean
  Remove incompatible theme biz
  correctly return for deleted items
  show event as deleted
  Use pkeyGet() instead of idStream() for fave caching
  store oft-requested stuff in the data object
2011-04-08 15:47:18 -07:00
Zach Copley 3022d711e3 Add some more events to aside profile blocks and rework a bit 2011-04-08 15:45:49 -07:00
Evan Prodromou 85c4e11f83 make ConversationNoticeStream accept a profile parameter 2011-04-08 18:03:18 -04:00
Evan Prodromou dc25564251 enable user directory and extended profile by default 2011-04-08 17:46:49 -04:00
Shashi Gowda 4d61760154 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-08 17:16:20 +05:30
Shashi Gowda d442f59693 Fix weird alignment of controls in subscriptions page. The dots are gone now 2011-04-08 17:10:48 +05:30
Shashi Gowda 14a82dae61 Sidebar sections to show peopletags and tag subscriptions.
FIXME: currently you can see the subscriptions section only on *your* profileaction pages, is this OK?
2011-04-08 16:22:51 +05:30
Shashi Gowda c44a94e8f5 Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS. 2011-04-08 14:51:05 +05:30
Siebrand Mazeland 8d99a5f949 Whitespace updates. 2011-04-08 01:49:34 +02:00
Siebrand Mazeland f9f437f5da Update translator documentation. 2011-04-08 01:22:00 +02:00
Evan Prodromou 684d0a386d allow passing a profile to inboxnoticestream 2011-04-07 15:39:23 -04:00
Shashi Gowda e5495e7df8 Fix subscription lists 2011-04-08 00:39:40 +05:30
Evan Prodromou 5dfb8e2bc4 Use InboxNoticeStream class for inbox
Move the code for inbox fetching to the InboxNoticeStream class.
2011-04-07 14:54:42 -04:00
Shashi Gowda ad86eb78d3 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	js/util.min.js
	lib/default.php
2011-04-07 23:13:45 +05:30
Evan Prodromou ca0f59d46a Revert "add some timing comments to output to debug poor performance"
This reverts commit a2782523d7.
2011-04-07 00:07:39 -04:00
Evan Prodromou 59d0e2f373 cache the notice count for threaded view 2011-04-06 23:17:17 -04:00
Evan Prodromou a2782523d7 add some timing comments to output to debug poor performance 2011-04-06 18:33:05 -04:00
Evan Prodromou 4b5f76d688 more flexible oEmbed handling 2011-04-06 17:57:33 -04:00
Shashi Gowda 14aef781ad Use the cool and new NoticeStream for people tag timeline 2011-04-06 11:25:50 +05:30
Siebrand Mazeland 69778f12c8 Update translator documentation.
Whitespace updates.
2011-04-06 01:55:29 +02:00
Siebrand Mazeland 3d36c755a3 Fix translator documentation issues. 2011-04-06 01:40:03 +02:00
Evan Prodromou 2138c3b339 a hook for showing the default local nav 2011-04-05 18:07:10 -04:00
Evan Prodromou a36fa8364a Move streams nav to groups nav 2011-04-05 17:49:45 -04:00
Evan Prodromou 77441beb97 Merge branch '1.0.x' into testing 2011-04-05 17:20:48 -04:00
Evan Prodromou 9568d17cb9 Add streams to left nav 2011-04-05 17:02:48 -04:00
Evan Prodromou 8697f1a1e7 alpha2 2011-04-05 15:47:35 -04:00
Evan Prodromou 1328023f88 Merge branch '1.0.x' into testing 2011-04-05 13:30:21 -04:00
Evan Prodromou 4b9c3335d4 default to private sites 2011-04-05 13:30:05 -04:00
Evan Prodromou 2d2c134a1f fix constructor error in FileNoticeStream 2011-04-05 13:28:41 -04:00
Evan Prodromou 36b331d469 Merge branch '1.0.x' into testing
Conflicts:
	plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Evan Prodromou 7533c7cfe1 Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."
This reverts commit 880661de4e.
2011-04-05 12:53:49 -04:00
Samantha Doherty 5bc6a8c614 Style changes for privacy selectors and markers. 2011-04-05 12:38:15 -04:00
Shashi Gowda ced00cf0bd Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-05 10:28:05 +05:30
Evan Prodromou ddbd4801e0 include protected flag for users in JSON or XML 2011-04-04 17:44:23 -04:00
Evan Prodromou b41c62a27c single flag for private groups 2011-04-04 16:58:52 -04:00
Shashi Gowda 57198a7464 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
Siebrand Mazeland cdebd59970 L10n consistency tweak. 2011-04-04 01:08:11 +02:00
Siebrand Mazeland 2dbdb0f185 Translator documentation updated/added.
i18n tweaks.
Superfluous whitespace removed.

YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
2011-04-04 00:41:48 +02:00
Brion Vibber c642eb2771 Switch some strings from heredoc to double-quotes so xgettext picks them up. 2011-04-03 15:37:39 -07:00
Siebrand Mazeland 9a6ee5e859 Update translator documentation. 2011-04-03 23:47:46 +02:00
Siebrand Mazeland 18185b2237 Tabs to spaces. 2011-04-03 23:02:24 +02:00
Siebrand Mazeland 7bd594e9d3 Use _m() instead of ngettext(). 2011-04-03 22:08:50 +02:00
Siebrand Mazeland ea8b468348 Update translator documentation.
Remove superfluous whitespace.
i18n/L10n tweaks.
2011-04-03 14:43:18 +02:00
Siebrand Mazeland b1d451f98b Upadte translator documentation.
Add FIXME for missing class documentation.
i18n/L10n tweaks.
Superfluous whitespace removed.
2011-04-03 14:24:55 +02:00
Siebrand Mazeland fec3edee45 Fix several L10n and i18n issues.
Add dummy method MessageListItem::messageListItemDummyMessages() to allow xgettext to add possible sources to POT files.
Mark a few i18n issues as FIXME as well as some messages for which the use case was not clear to me.
Merged some code on multiple lines into one.
Translator documentation added.
Remove superfluous whiteapace.
2011-04-03 01:09:02 +02:00
Siebrand Mazeland a466d4573a Fix incorrect parameter numbering. 2011-04-01 23:40:20 +02:00
Siebrand Mazeland 7abecb61bd i18n/L10n updates.
Translator documentation updated.
Superfluous whitespace removed.
Some FIXMEs added.
2011-04-01 19:47:24 +02:00
Siebrand Mazeland c17d8e0f5f Update translator documentation.
i18n tweaks.
Add FIXME for missing class documentation.
Remove superfluous whitespace.
2011-04-01 19:47:22 +02:00
Evan Prodromou 61fe49b100 ActivityImporter gives up on any exception 2011-03-31 13:53:17 -04:00
Brion Vibber 02c2c3a6cc Provisional workaround for router inconsistencies in background processes that switch site configs.
Ensure that router is cleared when we do site setup; we can still fetch the data from cache, so it should stay fast, but should ensure that we don't end up with someone else's routes still set up, which may be an issue breaking some of the bookmark handling that needs routing with a rare plugin.
2011-03-30 14:18:29 -07:00
Brion Vibber da7c54023d Format timestamps as UTC in ActivityStreams output. While using local times is legit per spec, it's confusing to have it change around and confuses some clients that don't handle zones right. 2011-03-30 12:36:54 -07:00
Shashi Gowda 5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
2011-03-30 15:47:42 +05:30
Evan Prodromou f213ac33db fix call-by-reference deprecation warning in microappplugin.php 2011-03-30 05:10:07 -04:00
Brion Vibber 674e3c2a0e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/apistatusesretweet.php
	actions/repeat.php
	classes/Notice.php
	lib/command.php
2011-03-29 16:26:20 -07:00
Brion Vibber 9adbb49fc9 Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.
Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)

These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel.
2011-03-29 16:20:12 -07:00
Siebrand Mazeland 0a19674c9f @evan Fixed message domain for messages in plugins for recent commits.
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Brion Vibber 880661de4e Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view. 2011-03-29 15:40:07 -07:00
Brion Vibber 18a994d105 Fix typo in filteringnoticestream that caused some messages to get lost 2011-03-29 15:19:04 -07:00
Brion Vibber d7304d5659 php notice fix -- misspelled bit 2011-03-29 15:05:54 -07:00
Evan Prodromou 9f1603462d Merge branch 'limitdist2' into 1.0.x 2011-03-29 17:32:17 -04:00
Siebrand Mazeland 700018fd09 L10n/i18n updated.
Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks.
2011-03-29 23:00:29 +02:00
Evan Prodromou 32145484c2 Disallow repeats (retweets) of private notices
We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.

Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI.
2011-03-29 11:53:26 -04:00
Evan Prodromou e862dcdb8a Merge branch '1.0.x' into limitdist2 2011-03-28 21:56:34 -04:00
Brion Vibber 5d31dd259a Subscription pending notification mail 2011-03-28 17:15:48 -07:00
Brion Vibber e5b5c256a3 Working subscription approval! 2011-03-28 17:08:04 -07:00
Brion Vibber a70e68e09c Work in progress: can create & cancel sub requests 2011-03-28 16:12:51 -07:00
Evan Prodromou ec5a43bf4f let actions set a default address for toselector 2011-03-28 16:24:02 -04:00
Evan Prodromou dca5e20b91 Make the to-selector clear left 2011-03-28 16:23:31 -04:00
Evan Prodromou b1783e8d49 make to_user/to_profile consistent in NoticeForm 2011-03-28 12:13:46 -04:00
Evan Prodromou 5147404ea2 ToSelector widget to send private notices
A new widget, ToSelector (Sorry, couldn't think of anything better)
that lets you select an addressee for a notice and whether it's
private.
2011-03-28 11:02:20 -04:00
Ian Denhardt d36f0707a4 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 2011-03-28 03:25:40 -04:00
Evan Prodromou c1fd36c043 Merge branch '1.0.x' into limitdist2 2011-03-27 11:36:57 -04:00
Evan Prodromou c7defb32f9 NoticeForm constructor takes array of optional parameters
NoticeForm::__construct() had 9 parameters, and I was about to add a
few more, so I figured it'd be better to use an $options array instead.
2011-03-27 11:25:24 -04:00
Evan Prodromou 53a3fd822d add indicator for limited-scope notices 2011-03-26 16:47:36 -04:00
Evan Prodromou c7f866b032 Caller can set scope for Notice::saveNew() 2011-03-26 15:49:46 -04:00
Evan Prodromou d69f912b00 Merge branch '1.0.x' into limitdist2 2011-03-25 16:18:10 -04:00
Evan Prodromou 7a56637baa Make function signature for getNoticeIds agree
There were some differences between defaults for the
NoticeStream::getNoticeIds() function and some of its subclasses'
implementations. So, I got them rationalized.
2011-03-25 16:15:55 -04:00
Evan Prodromou e0d5093ee5 Merge branch '1.0.x' into limitdist2
Conflicts:
	lib/groupnoticestream.php
	lib/taggedprofilenoticestream.php
2011-03-25 15:57:07 -04:00
Evan Prodromou 84984fdbfe All notice streams check notice scope
Added filtering code so that notice streams check notice scope.

Added new class to implement filtering a stream, FilteringNoticeStream.

Added a subclass that does the logic for checking Notice scope.

And made all the streams use ScopingNoticeStream.
2011-03-25 12:22:22 -04:00
Siebrand Mazeland ac955699b6 Fix use of incorrect method causing i18n issue. 2011-03-25 10:13:26 +01:00
Siebrand Mazeland 3cc7dda478 * PHP short tags "<?" to full tag "<?php".
* superfluous whitespace removed.
2011-03-25 10:02:02 +01:00
Evan Prodromou 22bf63bb46 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-24 18:05:32 -04:00
Evan Prodromou 44bcc942b8 Break up stream code to use separate notice stream classes
Rearchitect (again!) notice stream code to delegate different functionality up and down the stack.

Now, different classes implement NoticeStream.
2011-03-24 18:04:19 -04:00
Siebrand Mazeland 8a8a194316 Fix typo in documentation. 2011-03-24 17:02:28 +01:00
Siebrand Mazeland 3810482d1c Fix i18n. 2011-03-24 16:52:32 +01:00
Siebrand Mazeland 53d3455749 Change formatting of i18n slightly. Translator hints were not picked up in pot file. May now they are. 2011-03-24 16:47:29 +01:00
Siebrand Mazeland 3be26565fb Update translator documentation.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation.
2011-03-24 11:48:51 +01:00
Brion Vibber 265f9af6f7 Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons... 2011-03-23 15:21:12 -07:00
Evan Prodromou fd4d535d91 add a fix1 to the version number 2011-03-23 14:34:32 -04:00
Evan Prodromou 2b901894c2 Some fixes to make the notice stream class work 2011-03-23 11:59:01 -04:00
Evan Prodromou efb6a7b441 let Inbox class go fingerpokin' in streams 2011-03-23 11:42:52 -04:00
Evan Prodromou 0b35ce7c37 New NoticeStream class to reify streams of notices
We've been muddling through with 6- or 8-argument functions for managing streams. I'd
like to start thinking of streams as their own thing, and give them some more value.

So, the new NoticeStream class takes over the Notice::stream() function and Notice::getStreamByIds().

There's probably some fine-tuning to do on the object interface.
2011-03-23 11:29:55 -04:00
Brion Vibber 14a6ab2b04 Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins. 2011-03-22 16:50:27 -07:00
Brion Vibber a12680e8d5 Fix typo in cf45c978 2011-03-22 14:20:21 -07:00
Evan Prodromou 83fb5e6023 Mass replacement of #-comments with //-comments
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
Shashi Gowda f81aaa5375 Blend people tags UI into the new theme! 2011-03-22 12:18:12 +05:30
Shashi Gowda bf121a695a Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	classes/Profile.php
2011-03-22 07:59:06 +05:30
Shashi Gowda 31c1177970 Merge branch '1.0.x' into people_tags_rebase
Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
Brion Vibber 61960d3668 Add pending members list to group navigation, if group has joins moderated or if it has pending requests open 2011-03-21 17:23:13 -07:00
Brion Vibber 942887ca8c Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working. 2011-03-21 17:17:18 -07:00
Brion Vibber 6bdb1053ad Pending members queue list -- doesn't yet allow approval. 2011-03-21 16:40:10 -07:00
Brion Vibber 471a480587 Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests. 2011-03-21 16:26:41 -07:00
Brion Vibber a54eb0941e Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way. 2011-03-21 15:05:36 -07:00
Brion Vibber 541dfa04fe Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated. 2011-03-21 14:35:29 -07:00
Brion Vibber 0bec9cfdbc Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
UI for setting the join policy is in, but not yet used.
2011-03-21 13:51:13 -07:00
Brion Vibber 089c10d5d8 get_class -> class_exists for class loading hack (fixme for 1.0: make sure all these classes are in own files) 2011-03-21 11:43:02 -07:00
Evan Prodromou 0a71622aa7 Widget automatically delegates unimplemented methods to attribute 2011-03-21 11:09:16 -04:00
Zach Copley fc0ed76ebd Remove stray get_class() call 2011-03-20 19:37:25 -07:00
Brion Vibber 1fdc72f595 Merge branch '0.9.x' 2011-03-18 14:11:27 -07:00
Brion Vibber df4afee86c Tickets #1610, #1949: show permalinks on Popular Notices, attachments aside sections
These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.
2011-03-18 14:09:41 -07:00
Brion Vibber 4874ab0e7d Tickets #1610, #1949: show permalinks on Popular Notices, attachments aside sections
These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.
2011-03-18 13:58:13 -07:00
Siebrand Mazeland a4e334a0ba Translator documentation added/updated.
i18n updates.
Superfluous whitespace removed.
2011-03-18 18:03:41 +01:00
Siebrand Mazeland cf45c978d9 Fixed issues with plural handling.
L10n/I18n updates.
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 17:59:51 +01:00
Brion Vibber 90a7631592 Caching for conversation root lookup, some logic fixes in threaded view 2011-03-17 17:36:53 -07:00
Brion Vibber 0c2c73659c Use cached sources for favorites & repeats info on threaded notice lists 2011-03-17 17:06:04 -07:00
Brion Vibber 4afa3caae3 ajax load for additional inline replies; /replies variant of conversationview 2011-03-17 16:27:42 -07:00
Brion Vibber 94ecfc3fcd Initial use of inline reply area for marking repeats... 2011-03-17 15:17:45 -07:00
Brion Vibber c70fdef368 Merge branch 'faves' into 1.0.x 2011-03-17 14:48:14 -07:00
Brion Vibber ed6d5c6e7a Initial inline listing of favoriters 2011-03-17 14:19:03 -07:00
Brion Vibber 58d39153c6 Favored lists in progress: 'foo, bar and baz' 2011-03-17 13:51:55 -07:00
Brion Vibber 6c236ab0ff work in progress 2011-03-17 13:25:20 -07:00
Brion Vibber 8ef9d75bbc Work in progress: faves in the threaded reply area 2011-03-17 13:07:17 -07:00
Evan Prodromou 60a237ac62 some flushing in the UI 2011-03-17 15:26:37 -04:00
Evan Prodromou a430540155 configuration option to bust frames or not 2011-03-17 11:32:14 -04:00
Evan Prodromou 531400be6f upgrade lifecycle to release 2011-03-17 09:58:41 -04:00
Evan Prodromou 409f5f5658 alpha1 version of the software 2011-03-17 09:21:26 -04:00
Brion Vibber bd12546984 Allow plugins to modify or append command help text; broke the command help down into pieces which also will aid translators in future, as the entire message blob won't change every time something gets fiddled with. 2011-03-16 17:07:06 -07:00
Evan Prodromou f5bde9b693 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 18:54:07 -04:00
Evan Prodromou 0791d0034f return Ajax-y XML on exceptions 2011-03-16 18:53:46 -04:00
Brion Vibber a81a599d8a MESSAGES_PER_PAGE constant missing (merge error?) 2011-03-16 11:11:06 -07:00
Samantha Doherty 5e40450efd Quick style update for profile blocks. 2011-03-16 13:50:24 -04:00
Zach Copley 3692a09095 Extended profile - add nav link to new profile block 2011-03-16 10:30:57 -07:00
Evan Prodromou c99f6f6afc remove a bunch of common_debug() calls for url shortening 2011-03-16 10:26:14 -04:00
Evan Prodromou 32aa061c17 remove debugging code for microapp 2011-03-16 10:16:29 -04:00
Evan Prodromou 519bbfb2e9 use <p> to keep stuff in profile block from bunching 2011-03-16 10:03:28 -04:00
Evan Prodromou 410ca34ce9 remove edit link from profileblock 2011-03-16 09:59:36 -04:00
Evan Prodromou 07d9cca004 fix bug with undefined variable 2011-03-16 09:57:10 -04:00
Evan Prodromou bbba1f6e16 Show group actions in profile block 2011-03-16 09:57:10 -04:00
Evan Prodromou 2d4554ea03 Remove UserProfile class 2011-03-16 09:57:10 -04:00
Evan Prodromou 3d68474e14 move UserProfile actions to account profile block 2011-03-16 09:57:10 -04:00
Evan Prodromou 051e374792 profile block can have actions 2011-03-16 09:57:10 -04:00
Evan Prodromou a661b22fad use stream-sized avatar for default profileblock 2011-03-16 09:57:10 -04:00
Evan Prodromou fbc11b72d7 Allow profileblock subclasses to show different sized avatars 2011-03-16 09:57:10 -04:00
Evan Prodromou f242cf0e58 move profile block to the aside 2011-03-16 09:57:09 -04:00
Evan Prodromou f23184a8d6 add newline to group profile block 2011-03-16 09:57:09 -04:00
Evan Prodromou 66b505a341 show group profile block for group pages 2011-03-16 09:57:09 -04:00
Evan Prodromou 561458650f profile group uses account profile block 2011-03-16 09:57:09 -04:00
Evan Prodromou e5133f8150 add accountprofileblock and make defaultprofileblock use it 2011-03-16 09:57:08 -04:00
Evan Prodromou d0317d96e1 hide profile block on settings and admin panels 2011-03-16 09:57:08 -04:00
Evan Prodromou a72dbc1aff add a profile block to left column 2011-03-16 09:57:07 -04:00
Evan Prodromou 41420449f8 Merge branch 'jqueryui' into 1.0.x
Conflicts:
	lib/action.php
2011-03-16 09:56:26 -04:00
Evan Prodromou afa1aa6c9b Revert "use jquery-ui for input_forms tabset"
This reverts commit c4bada9022.
2011-03-16 09:53:27 -04:00
Brion Vibber 7345de1202 Add layout divs to InfoAction's core block; fixes error display layout in Neo skin 2011-03-15 17:32:25 -07:00
Ian Denhardt 27ef3b1d90 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
Conflicts:
	actions/public.php
2011-03-15 12:42:58 -04:00
Samantha Doherty 4334bb7132 Adding wrapper divs for equal height columns. 2011-03-14 15:30:51 -04:00
Brion Vibber 2bccd18d9a JS optimization: move creation of inline reply placeholders to server-side so we don't have to create them client-side (which causes reflows and takes about 25-30ms on my test system)
Using live instead of bind for the event handling, we don't have to play any games on the ones that we do add at runtime. Yay!
2011-03-11 15:20:20 -08:00
Brion Vibber 4e2a0e2fd0 Use non-minified jQuery when $config['site']['minify'] is off; aids in debugging when something fails deep in jQuery-land. 2011-03-11 14:48:47 -08:00
Brion Vibber 717fed785e Update PersonalGroupNav with fixed highlighting checks.
Couldn't use Menu::item() as its checks are only for the action name, so would have highlighted stuff for other users though it always links to self.
2011-03-11 14:25:57 -08:00
Brion Vibber d393ac4bbb remove stray close div from empty search results doc bits 2011-03-11 14:08:48 -08:00
Brion Vibber 3c9561b3f0 Merge branch 'atomic-json' into 1.0.x 2011-03-11 12:47:11 -08:00
Brion Vibber 3146c9fae8 Add event hooks for customizing ActivityObject output to Atom and JSON, and helpers for MicroAppPlugin.
New hooks:
* StartActivityObjectOutputAtom
* EndActivityObjectOutputAtom
	$obj ActivityObject
	$out XMLOutputter

* StartActivityObjectOutputJson
* EndActivityObjectOutputJson
	$obj ActivityObject
	&$out array
2011-03-11 11:58:53 -08:00
Siebrand Mazeland eff26421ab Move translator documentation one line lower. Otherwise it will not be added to the POT file. 2011-03-11 19:32:35 +01:00
Brion Vibber 0f3af3e3b7 Keep 'Status' tab current while showing the placeholder -- pretend like it's a mini version of the status notice form :D 2011-03-10 18:01:40 -08:00
Brion Vibber 771682b6eb Add placeholder status form for the top (needs to hook up to JS) 2011-03-10 17:40:25 -08:00
Brion Vibber 874804a0c4 use a data attribute instead of 'title' for geo lookup api; fixes failure of cloned forms to work 2011-03-10 16:49:24 -08:00
Brion Vibber acd3f957ba Micro-app fix: pass foreign options (remote source & original URI) with OStatus input 2011-03-10 12:05:25 -08:00
Brion Vibber 0511800351 Provisional tweak for polls to go through atom feeds / ostatus
Had to fix some calls to MicroAppPlugin->saveNoticeFromActivity() which passed an OStatus_profile instead of a Profile...
Imported polls don't get data from upstream or send it back currently.
2011-03-10 11:35:04 -08:00
Evan Prodromou c4bada9022 use jquery-ui for input_forms tabset 2011-03-10 10:53:11 -06:00
Evan Prodromou a5daed0aa8 load jquery-ui css and js by default 2011-03-10 10:28:08 -06:00
Brion Vibber cecc2576a5 Fixes for direct message form for JS changes to the main form 2011-03-09 16:55:52 -08:00
Brion Vibber 040baf291d Fix for input tab selection 2011-03-09 13:05:12 -08:00
Brion Vibber 381ffc3fe8 Stub 'home' subsection at top of settings & admin nav panels, so folks always know how to get home.
(If we drop the section titles, these'll look a little cleaner since it'll only show 'Home' once :D)
2011-03-09 12:38:06 -08:00
Brion Vibber 1f9a9c69bc Only show the site_nav_object block if Action::showObjectNav has been overridden to do something.
(Copied similar check from showPageNoticeBlock, handy!)
2011-03-09 12:07:26 -08:00
Brion Vibber 0a19949f6d Allow theme.ini to specify external CSS URLs, such as Google Font API loaders.
Example theme.ini:

  external="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
  include=rebase

Notes:
* URLs must be quoted in the .ini file or the .ini file parser explodes!
* To do multiples, list as external[] instead of external.
* If there's an included base theme, any externals it lists will be included first.
* All externals are loaded before any local styles.
2011-03-09 11:38:43 -08:00
Brion Vibber 7f42e48631 section class on object nav 2011-03-09 10:53:45 -08:00
Brion Vibber 1f86f45bb9 Move object menu into aside 2011-03-09 10:38:44 -08:00
Evan Prodromou b150b9439a don't show register in login if already logged in 2011-03-09 10:15:19 -05:00
Evan Prodromou 3d310c80be no notice form on error pages 2011-03-09 10:12:53 -05:00
Evan Prodromou 88e09d45c9 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-08 22:48:34 -05:00
Evan Prodromou b8b1fbb6b5 Give NoticeListItem its own class 2011-03-08 22:48:16 -05:00
Brion Vibber cbf16a4974 Bookmark and poll plugins' custom notice forms now do AJAX submit, with the resulting notice appearing in the timeline.
FormNoticeXHR now is triggered on any form labeled with class 'ajax-notice', so those other than the traditional notice form should work as long as they handle the AJAX submission and return a properly formatted notice.

Things to watch out for:
* to determine whether the resulting notice should show on the current timeline, the JS code needs to be able to check the author and such. Keeping the existing vcard bits helps for this!
* the notice form submission stuff clears out inputs from your form -- test to make sure this behaves correctly
* error messages returned from the thingy _should_ come through, but this needs more testing for consistency
* while form components that aren't in a custom form should just be ignored, this should be tested more. (eg there's no location or attachment box for poll or bookmark plugins)
* NoticeListItem isn't currently reachable via autoloader -- touch NoticeList explicitly before calling into it for now.
2011-03-08 15:10:30 -08:00
Brion Vibber 28809035d0 Replace explicit FormXHR setup for a bunch of simple AJAX form submissions with adding the 'ajax' class on them.
This avoids having to add extra custom JS bits just to initialize forms using the common AJAX submission path.
2011-03-08 13:58:28 -08:00
Brion Vibber ba1ada2880 de-IDifying labels in notice form to fix issue with geo pin activating the wrong place when cloning the form
Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
2011-03-08 12:14:44 -08:00
Zach Copley cfe3e83293 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
  Localisation updates from http://translatewiki.net.
  More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out
  Doc comments for MicroAppPlugin
  mailboxes were wrongly overriding global menu
2011-03-07 21:35:48 -08:00
Brion Vibber 541613ce69 More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out 2011-03-07 15:15:21 -08:00
Brion Vibber 4a54bb337a Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-07 13:36:54 -08:00
Brion Vibber 9a837ee33b Doc comments for MicroAppPlugin 2011-03-07 13:36:15 -08:00
Zach Copley 4b24f09ab4 Merge branch '1.0.x' into directory
* 1.0.x: (68 commits)
  Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one.
  Fix bad reference
  lost a </div> in input_forms
  neo is the default
  First version of 3cl theme neo.
  cleaner is the new default theme (for now)
  store reply_to notices as comment activity objects
  fix object errors with bookmark notices
  save the object type when saving a new bookmark notice
  ActivityObject uses Notice's object_type by default
  Notice saves its object type
  show correct notice in output
  UR FACE
  wrapper div for primary nav
  Revert "abstraction for starting and ending a menu"
  Revert "primarynav uses menustart and menuend"
  primarynav uses menustart and menuend
  abstraction for starting and ending a menu
  remove adminpanelnav from adminpanelaction module
  Input form switcher works
  ...
2011-03-07 12:37:51 -08:00
Evan Prodromou f8427f3d1e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-07 15:12:51 -05:00
Evan Prodromou 884c3d06d2 mailboxes were wrongly overriding global menu 2011-03-07 15:11:38 -05:00
Zach Copley 985ff92431 Fix bad reference 2011-03-07 12:10:34 -08:00
Evan Prodromou b7a8863b27 lost a </div> in input_forms 2011-03-07 15:06:21 -05:00
Evan Prodromou 4c0a746831 neo is the default 2011-03-07 15:00:43 -05:00
Evan Prodromou 0b95d68910 cleaner is the new default theme (for now) 2011-03-07 14:32:21 -05:00
Evan Prodromou 55b4303ea4 Merge branch '3cl' into 1.0.x 2011-03-07 14:30:30 -05:00
Evan Prodromou 6862f765f6 ActivityObject uses Notice's object_type by default 2011-03-07 14:21:16 -05:00
Evan Prodromou 618a658985 show correct notice in output 2011-03-07 14:06:46 -05:00
Evan Prodromou 998733cdd4 UR FACE 2011-03-07 12:49:20 -05:00
Evan Prodromou 2272044ad1 wrapper div for primary nav 2011-03-07 12:42:51 -05:00
Evan Prodromou b751ab70fb Revert "abstraction for starting and ending a menu"
This reverts commit b4f1281799.
2011-03-07 12:39:52 -05:00
Evan Prodromou 6ab7329e85 Revert "primarynav uses menustart and menuend"
This reverts commit 8e03c83a57.
2011-03-07 12:39:31 -05:00
Evan Prodromou 8e03c83a57 primarynav uses menustart and menuend 2011-03-07 12:37:07 -05:00
Evan Prodromou b4f1281799 abstraction for starting and ending a menu 2011-03-07 12:36:45 -05:00
Evan Prodromou 876c7a42c8 remove adminpanelnav from adminpanelaction module 2011-03-07 12:36:04 -05:00
Evan Prodromou cf1a4d8292 Input form switcher works
This change adds the input form switcher, which adds a navigation menu
across the top of the input form, letting you switch between different kinds of input.

The input menu doesn't yet look like a nice set of tabs; it could use some love.
2011-03-07 04:57:49 -05:00
Evan Prodromou 7aa55f8200 made the input-form switcher work, kinda 2011-03-07 03:34:20 -05:00