Commit Graph

13803 Commits

Author SHA1 Message Date
Evan Prodromou
60e0e2b723 Fix the syntax for unique keys on Realtime_channel 2011-07-11 11:29:05 -04:00
Evan Prodromou
3b039ed2e7 Merge branch '1.0.x' into realprivate 2011-07-11 11:03:31 -04:00
Evan Prodromou
3b246d643d use Realtime_channel to target channels to users 2011-07-11 09:16:16 -04:00
Evan Prodromou
8b957c6581 data structure for realtime channels 2011-07-08 17:52:07 -04:00
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
Evan Prodromou
e416f9d28e forgot to cat a bunch of useless separate files when minifying 2011-07-08 10:04:31 -04:00
Zach Copley
cd05fc6aee Remove debugging statement 2011-07-07 17:23:41 -07: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
069d976fab SearchSubMenu is a MoreMenu 2011-07-07 12:06:56 -04:00
Evan Prodromou
baaad0dc8b TagSubMenu is a MoreMenu 2011-07-07 10:59:00 -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
Samantha Doherty
f0af9f45dd Big round of fixups for base and neo themes. 2011-07-06 12:50:42 -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
Evan Prodromou
7b053ccf3f minify new util.js code 2011-07-05 23:19:59 -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
af0eded741 add an URI index to blogs so they get cached 2011-07-04 15:58:56 -04:00
Evan Prodromou
44753d64ea use Poll_response::pkeyGet() in Poll::getResponse() 2011-07-04 15:47:36 -04:00
Evan Prodromou
c468b0d7f3 explicitly name URI attribute for Poll_response 2011-07-04 15:47:09 -04:00
Evan Prodromou
89816551e6 use memcached for Profile_list::staticGet() 2011-07-04 15:37:06 -04:00
Evan Prodromou
6ff3149082 SearchSub respects empty set from memcache. 2011-07-04 12:49:09 -04:00
Evan Prodromou
d4b7f5d8ac TagSub doesn't refetch empty set of tag subscriptions 2011-07-04 12:39:57 -04:00
Evan Prodromou
144755d1c9 Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x 2011-07-04 12:26:59 -04:00
Evan Prodromou
15dafffb3b Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-04 12:26:41 -04:00
Evan Prodromou
db85774f25 only update the avatar of an Ostatus_profile if it's a profile 2011-07-04 12:24:59 -04:00
Evan Prodromou
333876c6a9 don't force replies to empty set in Poll_response 2011-07-02 00:49:04 -04:00
Evan Prodromou
2998033816 Add FIXME comments to remember to encode/decode important data about a
happening in ActivityStreams format
2011-07-01 23:06:16 -04:00
Evan Prodromou
a0ed80a5d8 Correct list of parameters for Happening::saveNew() 2011-07-01 23:04:44 -04:00
Evan Prodromou
66edc023d7 Happening::saveNew() is static 2011-07-01 23:03:41 -04:00
Evan Prodromou
c37c303b14 Correct the category of the EventPlugin 2011-07-01 22:20:13 -04:00
Evan Prodromou
7e9c17bd15 make the default scope depend on site/private 2011-07-01 21:50:04 -04:00
Siebrand Mazeland
eb90389a22 Localisation updates from http://translatewiki.net. 2011-07-01 13:02:21 +02:00
Evan Prodromou
9f8d0b36a8 Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x 2011-06-30 15:44:11 -04:00
Zach Copley
4eac561cf6 Fix ajax error output 2011-06-29 21:55:28 +00:00
Zach Copley
7fb93673bc Get rid of PHP notice 2011-06-29 21:55:00 +00:00
flyingmana
3c47d158f4 make cors header deactivatable 2011-06-29 22:39:33 +02:00
Zach Copley
2471f2092a Fix avatar saving for OStatus -- how did this ever work? 2011-06-29 19:03:16 +00:00
Zach Copley
cc85afda3a Added a couple dirs to .gitignore 2011-06-29 18:59:42 +00:00
Evan Prodromou
da4ba6a5a9 reinstate lost replies code in OStatusQueueHandler 2011-06-29 13:51:19 -04:00