Commit Graph

2130 Commits

Author SHA1 Message Date
JC Brand
8478b432c3 Lazily call parseJSON on translation data.
Also, moved locales.js to ./src folder.
Add it as dependency to utils.js and remove it from the deps scripts
2015-01-16 22:33:18 +01:00
JC Brand
31cb3d4b6e Fix the non-AMD case. 2015-01-16 22:07:27 +01:00
JC Brand
0a1a98d278 Load the JSON files directly for other langs as well. 2015-01-16 21:16:47 +01:00
JC Brand
d22ab21bbf Proof of work. Load JSON file directly
instead of having to create a .js file with translations.
2015-01-16 21:04:38 +01:00
JC Brand
ba09fa1fbb Generate JSON file from Polish po file. 2015-01-16 20:48:40 +01:00
JC Brand
7ac5785bae Tweak shadow on the unselected tab. 2015-01-16 20:47:10 +01:00
JC Brand
76452982dc Merge pull request #304 from ser/master
Polish translation of version 0.8.6.
2015-01-16 20:07:18 +01:00
JC Brand
cea68e5af0 Merge branch 'chat_states'
Conflicts:
	docs/CHANGES.rst
2015-01-16 20:06:53 +01:00
Serge Victor
09594a7b87 Polish translation of version 0.8.6. 2015-01-12 18:52:22 +07:00
JC Brand
607c2a81c9 Instead of GONE, set chat_state to INACTIVE when a box is closed.
Also, fixed all broken tests.
2015-01-09 10:48:36 +01:00
JC Brand
b4d53aaa94 Some refactoring of chat states work. updates #292
- Don't add a timeout for the GONE state.
- Change state to GONE when the user closes the chat box.
- Change the state to inactive when the user minimizes the chat box.
- Change the state to active when the users maximizes the chat box.
- Add more tests for chat states.
2015-01-09 09:09:49 +01:00
JC Brand
4d6a354734 Merge branch 'gbonvehi-add-allow-registration-doc' 2015-01-07 14:55:21 +01:00
JC Brand
7df30beae2 Merge branch 'add-allow-registration-doc' of https://github.com/gbonvehi/converse.js into gbonvehi-add-allow-registration-doc
Conflicts:
	docs/CHANGES.rst
2015-01-07 14:55:14 +01:00
JC Brand
4140cc12df Merge pull request #302 from gbonvehi/solve-252-253-contact-info-tooltip
Add fullname and jid to contact's tooltip in roster
2015-01-07 14:52:04 +01:00
JC Brand
fee1f83cf5 Merge branch 'master' of github.com:jcbrand/converse.js 2015-01-07 10:19:06 +00:00
JC Brand
3d4c7659be Don't link to jabber.org, link to the directory 2015-01-07 11:17:12 +01:00
Guillermo Bonvehi
a666ba467d added #295 document allow_registration to changes.rst 2015-01-06 00:29:00 -03:00
Guillermo Bonvehi
3bbdafcb9d Closes #295: allow_registration is now mentioned in configuration doc 2015-01-05 14:08:40 -03:00
Guillermo Bonvehi
f7566d0299 Add related issues solved #252 and #253 to CHANGES.rst 2015-01-05 12:40:01 -03:00
Guillermo Bonvehi
4843f7efc2 Add fullname and jid to contact's tooltip in roster
It seems title attributes are limited to 512 chars, we will have
to live with that unless a custom tooltip is used.
2015-01-05 03:43:53 -03:00
JC Brand
2b2b176189 The approve/reject links for a requesting contact where obscured. 2015-01-01 23:08:54 +01:00
JC Brand
bb468ae0a3 Add better support for XEP-0085. closes #292
Converse.js will now send chat state notifications of <paused>, <inactive> and
<gone> when the user has stopped typing for 30 seconds, 2 minutes and 10 minutes
respectively.
2015-01-01 22:59:10 +01:00
JC Brand
3175bddc46 Initial work on adding support for sending <paused> and <gone> chat states. 2015-01-01 05:52:10 +01:00
JC Brand
f738698525 Add dev.html specifically for development. Update CHANGES
removes need to modify index.html all the time.
2015-01-01 03:49:42 +01:00
JC Brand
f4eb8b30b0 Add steps for installing Sass and Bourbon to Makefile 2015-01-01 03:45:26 +01:00
JC Brand
60cfe7f6c6 Remove less files (we now use Sass) 2014-12-31 17:14:53 +01:00
JC Brand
1c3b61274c Bugfix. Don't trim the newly opened (and only current) chat. 2014-12-31 17:07:02 +01:00
JC Brand
516def29cb Styling for the minimized chats list. 2014-12-31 16:58:15 +01:00
JC Brand
adc6fde404 Some initial work on making the UI responsive. 2014-12-31 13:08:51 +01:00
JC Brand
b176545605 Remove neat grid fm again. We won't be using it. 2014-12-31 12:17:30 +01:00
JC Brand
d02838eaee CSS tweak. Padding for login inputs 2014-12-31 12:03:12 +01:00
JC Brand
e03d22580e Move variables to sass/variables.scss 2014-12-31 11:54:33 +01:00
JC Brand
96d904f38e Merge branch 'master' into skeleton 2014-12-31 11:34:34 +01:00
JC Brand
35a542da83 Bugfix. Translate method called before it was defined. 2014-12-31 11:28:52 +01:00
JC Brand
ccb52a5084 Add noscript tag for analytics. 2014-12-30 09:45:33 +00:00
JC Brand
640a344ee2 Make sure placeholder is also translateable 2014-12-20 11:57:03 +01:00
JC Brand
3b65a029cf Update af translations. 2014-12-20 11:56:45 +01:00
JC Brand
15e3c3238a Update locale files when making a release. 2014-12-20 11:19:03 +01:00
JC Brand
8576d9487c Add Norwegian translations. 2014-12-20 11:18:44 +01:00
JC Brand
3e03df4745 Add headings to translations docs. 2014-12-20 10:59:39 +01:00
JC Brand
fadbf2d159 JSHint bitching about wrapped or statements 2014-12-20 10:17:20 +01:00
JC Brand
6ea9d1771e Change headings to make TOC clearer. 2014-12-18 14:39:03 +01:00
JC Brand
768dcbda83 Updated scss/css 2014-12-14 00:45:31 +01:00
JC Brand
309b11122b Merge branch 'master' of github.com:jcbrand/converse.js 2014-12-13 21:56:44 +01:00
JC Brand
2a3aba3ad5 Move analytics code into separate file and add to .gitignore
Thanks to hawkee for the tip.
2014-12-13 21:55:49 +01:00
JC Brand
ff4af318b2 Merge branch 'skeleton' of github.com:jcbrand/converse.js into skeleton
Conflicts:
	sass/converse.scss
2014-12-13 16:46:15 +01:00
JC Brand
64a58f7a55 Some more tweaks and remove skeleton-sass, will try bourbon-neat instead. 2014-12-13 15:45:27 +01:00
JC Brand
b01b4b55e0 Bring mockup markup inline with reality and update scss/css 2014-12-13 03:26:41 +01:00
JC Brand
5c9a7c257b Bring mockup markup inline with reality and update scss/css 2014-12-13 03:23:53 +01:00
JC Brand
3de79ba607 Don't render input inside label 2014-12-13 03:23:49 +01:00