Commit Graph

1835 Commits

Author SHA1 Message Date
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
JC Brand
2066cdce31 Nicer display of roster filter and add labels to chatrooms form 2014-12-13 00:15:19 +01:00
JC Brand
cdacf40646 Ignore ruby/sass/bundler files 2014-12-13 00:15:09 +01:00
JC Brand
970fed4d29 Rename button to clarify 2014-12-13 00:14:35 +01:00
JC Brand
063e31e39e Add skeleton-sass and convert css files to scss. 2014-12-13 00:14:11 +01:00
JC Brand
cbfd8d8e90 Merge pull request #288 from arsh-co/master
Set immediate to true when calling _.debounce
2014-12-12 15:37:21 +01:00
Mohammad Javad Naderi
5424e301ff Set immediate to true when calling _.debounce
When clicking on restore button for a minimized chat, the page's hash will change to `#`. It may cause problems for web apps that listen to changes in page's hash.

When `immediate` argument of `debounce` function is not set, `ev` is null and ev.preventDefault() will not be called.
2014-12-11 15:22:51 +03:30
JC Brand
cb09801f65 Merge pull request #287 from gbonvehi/fix-pending-not-showing
Always show pending/requesting users in roster
2014-12-11 09:34:10 +01:00
Guillermo Bonvehí
00af792899 Unified pending/requesting checking 2014-12-10 22:42:09 -03:00
Guillermo Bonvehí
2354a27832 Always show pending/requesting users in roster
Even if show_only_online_users or hide_offline_users
are set, show users that are pending or requesting
2014-12-10 21:32:59 -03:00
JC Brand
889d5cf5c9 Add sass file for converse 2014-12-09 00:49:21 +01:00
JC Brand
a546f6f9ef Add default avatar user.png 2014-12-08 11:15:50 +01:00
JC Brand
c46a220907 Mention official converse.js chat room. 2014-12-08 11:03:20 +01:00
JC Brand
303a412b38 New release 0.8.6 2014-12-07 22:50:10 +01:00
JC Brand
f47949b91e Get index.html ready for release. 2014-12-07 13:45:14 +01:00
JC Brand
e71cad8583 Add default avatar for users. 2014-12-07 13:44:27 +01:00
JC Brand
5142f5637b Mention Gina Moerk's mailing list post. 2014-12-07 12:37:33 +01:00
JC Brand
3072620428 Add mockup for chat room config form. 2014-12-07 12:24:16 +01:00
JC Brand
9f94d0f4ea Nicer styling for the chat room configuration form. 2014-12-07 12:23:53 +01:00
JC Brand
3bf5eeb4a8 Bugfix. Could not render chat room configuration form. 2014-12-07 11:13:50 +01:00
JC Brand
9359c76c42 Small tweaks to site and doc css.
Also, in Makefile, remove old HTML build first during "make html" step.
2014-12-07 10:48:32 +01:00
JC Brand
d3eb6b431f Don't open docs in new tab 2014-12-07 01:32:46 +01:00
JC Brand
d65d4e2fee Enable message carbons for the demo. 2014-12-07 01:30:45 +01:00
JC Brand
bcf47d6c7c Add documentation on how to contribute to the docs. 2014-12-07 01:19:01 +01:00
JC Brand
84fd21b38b Configure docs theme. 2014-12-07 00:53:59 +01:00
JC Brand
1be0917a7b Enable chat for the documentation as well. 2014-12-07 00:53:41 +01:00
JC Brand
c8e4f02bf5 Split the documentation out into subfiles. 2014-12-07 00:53:17 +01:00
JC Brand
f893e94312 rid, jid and sid weren't being set. fixes #285 2014-12-06 19:05:50 +01:00
JC Brand
20e15b5623 Sphinx changes.
* Add buildout config for Sphinx
* Add new Sphinx theme
* Remove the built html theme files
2014-12-06 18:58:58 +01:00
JC Brand
e4307f7ab8 See below
* Fix login panel rendering bug
* Make registration form i18n aware.
* Make providers link configurable.
2014-12-06 18:58:14 +01:00
JC Brand
f5115b295f Merge pull request #283 from gbonvehi/fix-po2json
Added po2json module path to Makefile, make po2json now updates the file...
2014-12-03 09:58:11 +01:00
Guillermo Bonvehí
e28d9a4801 Added po2json module path to Makefile, make po2json now updates the files correctly 2014-12-02 15:32:14 -03:00
JC Brand
92ed46f844 New release 0.8.5 2014-12-01 20:53:08 +01:00
JC Brand
03ec659b50 Add another test and another template. refs #117 2014-12-01 20:31:01 +01:00
JC Brand
0ae8008201 Tweak reg form buttons. refs #117 2014-12-01 20:30:14 +01:00
JC Brand
702cddd89b Add tests for account registration. 2014-11-27 11:16:06 +01:00
JC Brand
444734a802 Add form_username.html (should have been added in earlier commit) 2014-11-27 10:41:58 +01:00
JC Brand
67418b3036 Let href point to panel id
so that it properly gets hidden by switchTab
2014-11-27 10:40:50 +01:00
JC Brand
96c2f2fca0 CSS tweak. Properly position status edit icon. 2014-11-27 10:40:23 +01:00
JC Brand
831faf7096 Show domain name in username field of the registration form. updates #117 2014-11-26 21:26:28 +01:00
JC Brand
d2a888e367 Fix urls in readme and add url to another XEP 2014-11-25 11:03:31 +01:00
JC Brand
8cc0d510a7 Fix readme syntax error 2014-11-25 11:00:31 +01:00
JC Brand
5f41d9779a Update readme and changes 2014-11-25 10:59:59 +01:00
JC Brand
329746d839 Merge branch 'register' 2014-11-25 10:51:06 +01:00
JC Brand
d690704f93 Fix tests and added a workaround...
so that we can use require config in main.js also in the tests.
2014-11-25 10:50:30 +01:00
JC Brand
e246335b03 Bugfix. JIDs not shown in chatrooms. fixes #282 2014-11-25 09:55:15 +01:00