Commit Graph

1449 Commits

Author SHA1 Message Date
JC Brand
40e767b6d3 Tweak activation script 2014-07-23 19:11:06 +02:00
JC Brand
482d09777c Fix width for pending and requesting contacts 2014-07-23 18:25:26 +02:00
JC Brand
2886479b9b Merge branch 'master' into groups
Conflicts:
	converse.js
2014-07-23 13:23:30 +02:00
JC Brand
848d502332 In docs: Mention alternative to using make 2014-07-23 13:18:09 +02:00
JC Brand
c9e3a29515 Don't remove docs when calling Make 2014-07-23 13:12:18 +02:00
Stefan Schoettelndreyer
86c250f325 add 'zh'-locale to fix build task 2014-07-21 15:34:28 +02:00
JC Brand
02083ba0a8 Update changelog 2014-07-21 11:28:01 +02:00
JC Brand
d8db4981e4 Merge pull request #200 from g8g3/master
Assignment to writable property `style.height` instead of readonly `offsetHeight`.
2014-07-21 11:17:23 +02:00
g8g3
05a54ba054 Assignment to writable property style.height instead of readonly offsetHeight.
Fixes #196.
2014-07-21 10:57:12 +02:00
JC Brand
ce617f1f31 Some refactoring of RosterView and skeleton for groups test 2014-07-20 22:44:50 +02:00
JC Brand
0f6d1f9edb Add tests for toggleable headings. updates #83 2014-07-20 20:45:59 +02:00
JC Brand
3236d251e5 JShint doesn't like functions inside loops 2014-07-20 19:36:53 +02:00
JC Brand
e1a19678ad Allow group headings to be toggleable. updates #83 2014-07-20 19:11:34 +02:00
Javier Lopez
aac2acef0a improve Spanish localization 2014-07-20 04:11:42 -05:00
JC Brand
d3a6a4bc07 Remove unused resources 2014-07-20 00:21:10 +02:00
JC Brand
ba9e9cfd15 Manage fontawesome via bower 2014-07-20 00:21:04 +02:00
JC Brand
5b5c7ad7c1 Remove unused resources 2014-07-20 00:20:38 +02:00
JC Brand
0868db3c8a Manage fontawesome via bower 2014-07-20 00:20:28 +02:00
JC Brand
29c822a6b5 Possible fix for issue #175.
Make sure contact's chat_status attr is saved.

Updates #175
2014-07-20 00:16:22 +02:00
JC Brand
0aca9ef3c2 Possible fix for issue #175.
Make sure contact's chat_status attr is saved.

Updates #175
2014-07-19 23:54:52 +02:00
JC Brand
04d2b3aefd Some initial refactoring to support roster groups. updates #83
Made sure that the non-group usecase is still covered.
2014-07-19 23:45:21 +02:00
JC Brand
7c9a86293d Rename 'enable_message_carbons' to 'message_carbons' 2014-07-19 16:43:56 +02:00
JC Brand
df374d3d3e Rename 'enable_message_carbons' to 'message_carbons' 2014-07-19 16:41:53 +02:00
JC Brand
b66560ce90 We now have a functioning mockup of contact groups. updates #83 2014-07-19 16:27:04 +02:00
JC Brand
c839ce2d96 Add new icons for opened and closed groups. 2014-07-19 16:02:01 +02:00
JC Brand
0be33b81ef Fix tests 2014-07-19 15:26:30 +02:00
JC Brand
a338ede0d1 Replace accept/decline buttons with font icons 2014-07-19 14:50:25 +02:00
JC Brand
9bf4eba33b New fonticons from icomoon 2014-07-19 13:50:31 +02:00
JC Brand
00838aa4d8 Also dynamically compute controlbox height (for drag-to-resize) 2014-07-19 12:42:46 +02:00
JC Brand
37ac91dc1e Bugfix. Two undefined vars (now an issue because of strict mode) 2014-07-19 12:31:02 +02:00
JC Brand
ac807ae180 Simplify css for buttons (now looks nicer on IE) 2014-07-17 19:52:49 +02:00
JC Brand
df351d496d Fix vertical resizing of chat boxes.
This fix breaks compatibility with IE8
2014-07-17 19:19:32 +02:00
JC Brand
53f38dcc71 Two changes, see below:
* Call refreshWebkit hack when opening a chat room
* New event emitted when a chat room is opened.
2014-07-17 19:18:48 +02:00
JC Brand
ac6a3cb26c Mention windows. updates #187 2014-07-17 17:52:08 +02:00
JC Brand
3423f7bc74 Bugfix. fixes #180 2014-07-17 17:44:44 +02:00
JC Brand
66e45f91e9 Bugfix. First render before fetching msgs. Fixes #191 2014-07-17 17:29:05 +02:00
JC Brand
df91f17894 Fix tests. Emitted events weren't yet renamed in the tests. 2014-07-14 23:29:08 +02:00
JC Brand
9846f89a2c If no resource exists, add one which mentions converse.js
updates #123
2014-07-15 07:57:28 +02:00
JC Brand
01c2c5d93c Save groups on RosterItem. updates #83 2014-07-14 21:44:18 +02:00
JC Brand
6bded11304 Add connection feedback on the controlbox.
Now that the toggle is hidden when the controlbox is visible.
2014-07-14 20:41:26 +02:00
JC Brand
fe3e9f5294 Bugfix, xhr_user_search_url is not a global. Fixes #192 2014-07-11 16:12:56 +02:00
JC Brand
c07f37549a Merge pull request #189 from alanmeira/master
add more pt_BR translations and some fixes
2014-07-10 10:30:24 +02:00
Alan Meira
7ee25f716f add more pt_BR translations and some fixes 2014-07-07 20:31:24 -03:00
JC Brand
eeaeb3e66e Set lang back to english 2014-07-06 18:34:29 +02:00
JC Brand
012cbfb61a Rename events.
Remove the "on" prefix. Events are listened to via "on" method, so it's
redundant.
2014-07-06 18:31:17 +02:00
JC Brand
bb411b61e8 Wrong translator name 2014-07-06 18:05:47 +02:00
JC Brand
1f7cb9c551 Generate new pot, po and json files (for i18n) 2014-07-06 18:00:11 +02:00
JC Brand
ad90e74260 Simplified Chinese translations, courtesy of Lancelot 2014-07-06 17:56:42 +02:00
JC Brand
4f5534ed66 Finally fixed the non-AMD case to work with external templates. 2014-07-06 17:32:06 +02:00
JC Brand
c5ae10d962 Make an extra build specifically for including the website deps 2014-07-06 16:10:27 +02:00