diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-27 13:11:22 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-27 13:11:22 -0400 |
| commit | 4f488c7e3cf1a4bc12e83dfdd44ede32283140ac (patch) | |
| tree | 005db5d365a966743f04cf39518d9dc9f9568645 /js | |
| parent | 5b35a02d260d1f2573895c29f4710b08348ee8ba (diff) | |
| parent | 3968e71d4c24a0dfd37a14545dc159c5f83155c6 (diff) | |
| download | volse-hubzilla-4f488c7e3cf1a4bc12e83dfdd44ede32283140ac.tar.gz volse-hubzilla-4f488c7e3cf1a4bc12e83dfdd44ede32283140ac.tar.bz2 volse-hubzilla-4f488c7e3cf1a4bc12e83dfdd44ede32283140ac.zip | |
Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
Friendicaland - couple of new 'countries'
insidious little parsing bug
have no idea why the if/endif macro block was getting printed and not processed.
highlight js events-reminder on birthday events
moved api direct message formating to own function. added same formating to direct reply message, when posting a new message.
fixed direct message reply in api call.
modified api message reply to set title to conversion title, when replying.
add reliable way to get server version
make it selectable
I want HTML code!
new param getUserObjects to avoid retransmitting the whole user info objects
bugfix
changes on api_direct_messages_box to allow to retrieve conversations and all messages
modified direct_messages
added replyto and subject to direct messages.
modified conversion to use x function for parameter checking.
Diffstat (limited to 'js')
| -rw-r--r-- | js/country.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/country.js b/js/country.js index c3add477f..cc7697a1f 100644 --- a/js/country.js +++ b/js/country.js @@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
-aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
+aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Recolutionari.es|SPRACI|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
/*
* gArCountryInfo
* (0) Country name
|