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
Evan Prodromou
7759aa51e6
extra logging for OStatus enqueuing
2011-06-29 13:20:18 -04:00
Evan Prodromou
c7608a9ddd
fix missing variable for createsim.php
2011-06-27 17:29:33 -04:00
Evan Prodromou
ccca5ef62c
change default theme to neo theme for installer
2011-06-27 17:14:35 -04: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
20396ce8e1
ActivityStreamJSONDocument served as application/stream+json
2011-06-23 11:38:46 -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
6d2ba2b7bb
lost cookie-jar file
2011-06-22 17:21:15 -04:00
Evan Prodromou
0755f45bf0
add activitystreams links to other actions
2011-06-22 17:19:46 -04:00
Evan Prodromou
e5d8fd6857
Add Activity Streams feeds to export data
2011-06-22 17:09:04 -04:00
Evan Prodromou
d2c886023c
update HTTP_Request2 to 2.0.0RC1
2011-06-22 15:56:27 -04:00
flyingmana
62977ad4f2
allow cross-origin requests for xrd
2011-06-21 23:43:53 +02:00
Zach Copley
fe28432a26
Merge branch '1.0.x' into testing
...
* 1.0.x:
* only send the one invitation reminder per email address, regardless of how many invitations there are * don't send invitations converted invitations * better error checking * more logging
2011-06-21 13:26:44 -07:00
