199 Commits

Author SHA1 Message Date
Alan Friedman
ce5585c20e Remove unnecessary code 2016-02-27 15:20:53 -05:00
Alan Friedman
a42c36ad3a Fix for /clear command test 2016-02-27 15:13:46 -05:00
Dan Seripap
f2ef76323d Test for /clear 2016-02-27 14:06:33 -05:00
Daniel Seripap
5e67fad28f Merge pull request #29 from seripap/cleanup-tests
Cleanup tests
2016-02-27 12:06:11 -05:00
Alan Friedman
c92831a4a3 Merge branch 'develop' into cleanup-tests 2016-02-27 11:33:51 -05:00
Alan Friedman
9c16d73fef Cleanup tests
- Tests should now work in both Firefox and Chrome, but we can continue
using Chrome for parity with Travis CI
- When writing acceptance tests for Chrome, prefer using
`waitForElementVisible` instead of `waitForElementPresent`. For
whatever reason in Chrome, but not Firefox, elements can be briefly
‘present’ in the DOM but with no content, causing tests to fail.
Waiting for visibility seems to solve this
- Instead of using callbacks, we can simply chain browser async events
2016-02-27 11:28:06 -05:00
Alan Friedman
8bd05cf7a0 Add ability to pass in class names to message log function 2016-02-27 11:24:28 -05:00
Alan Friedman
fe148efd6f Merge pull request #28 from seripap/feature/cmdk
CMD+K
2016-02-27 10:39:20 -05:00
Dan Seripap
87802963f9 Key definitions. Moving window to window handler 2016-02-27 10:12:57 -05:00
Alan Friedman
16f58684a0 Merge pull request #25 from seripap/bugfix/usernameWarning
Added warning before changing username
2016-02-26 23:42:40 -05:00
Alan Friedman
e4575e064e Merge pull request #27 from seripap/feature/scripts
Added prod script
2016-02-26 23:42:24 -05:00
Dan Seripap
59a59f1ed3 Added prod script 2016-02-26 14:52:21 -05:00
Dan Seripap
7fa4517e01 Merge branch 'develop' into feature/cmdk
* develop:
  Version Up
  Back to jquery
  Better checking of username colors, throw error on blank slash commands
  Fix for safari/ios not being able to access filereader
2016-02-26 14:49:46 -05:00
Dan Seripap
4a087e0988 Version Up 2016-02-26 14:23:50 -05:00
Dan Seripap
4c6ff2fff2 Added warning before changing username 2016-02-26 09:52:59 -05:00
Alan Friedman
8a0b93254b Merge pull request #21 from seripap/bugfix/ios-fileupload
Fix for safari/ios not being able to access filereader
2016-02-26 09:30:25 -05:00
Dan Seripap
87dc8cc056 Back to jquery 2016-02-26 09:14:28 -05:00
Alan Friedman
324ddb9dd1 Merge pull request #22 from seripap/bugfix/slashCommand
Better checking of username colors, throw error on blank slash commands
2016-02-26 08:18:21 -05:00
Dan Seripap
10b1e9c012 Better checking of username colors, throw error on blank slash commands 2016-02-26 00:36:54 -05:00
Dan Seripap
e94b7e192e Fix for safari/ios not being able to access filereader 2016-02-25 23:47:08 -05:00
Dan Seripap
6b7994442d CMD+K clears chat, or /clear, or CTRL+K 2016-02-25 23:37:45 -05:00
Alan Friedman
0d9b41bb3a Merge pull request #17 from seripap/bugfix/usernameChange
Bugfix/username change
2016-02-25 19:07:12 -05:00
Alan Friedman
912389c995 Merge pull request #19 from seripap/bugfix/container-scripts
Updated container scripts
2016-02-25 19:04:54 -05:00
Alan Friedman
b6635aa5db Merge pull request #20 from seripap/bugfix/styles
General language and style cleanup
2016-02-25 19:04:34 -05:00
Dan Seripap
c5c2b44ebb General language and style cleanup 2016-02-25 17:46:58 -05:00
Dan Seripap
0f4fff2d6f Escaping characters before embed 2016-02-25 16:43:53 -05:00
Dan Seripap
db9fc83712 Updated container scripts/readme 2016-02-25 13:22:30 -05:00
Dan Seripap
fc63e1b2b9 Abstracted creating user versus updating user 2016-02-25 12:55:02 -05:00
Dan Seripap
d0d47c098a Fixing colors, allowing only unique usernames per chat session 2016-02-25 12:44:36 -05:00
Dan Seripap
6ce7c10584 Merge branch 'develop' into bugfix/pre-v1.5
* develop:
  Added Heroku procfile
2016-02-25 11:51:10 -05:00
Daniel Seripap
409a68a9be Merge pull request #16 from seripap/feature/containers
Added Heroku procfile
2016-02-25 11:46:49 -05:00
Dan Seripap
03561082bf Added Heroku procfile 2016-02-25 11:19:53 -05:00
Dan Seripap
78790eacec Parsing new usernames as string, requiring letter as starting name 2016-02-25 11:15:26 -05:00
Dan Seripap
7ec18ef656 Merge branch 'master' into develop
* master:
  Removes hard wired URL so that "New Room" works everywhere.
2016-02-25 10:13:41 -05:00
Daniel Seripap
b3befa1247 Merge pull request #7 from seripap/feature/fileTransfer
Abstraction of darkwire, file transfer, slash commands
2016-02-25 10:12:55 -05:00
Dan Seripap
445371465b Enabling file support, passing tests 2016-02-25 09:56:32 -05:00
Dan Seripap
faeb5a0405 Doc updates 2016-02-25 09:39:46 -05:00
Dan Seripap
3ba25cd14a Removed unused code, cleaned up styles 2016-02-25 09:28:19 -05:00
Dan Seripap
0a9db6f85a Copy edits 2016-02-25 09:18:03 -05:00
Dan Seripap
1f92848a1a Removed unused block 2016-02-24 22:33:19 -05:00
Dan Seripap
57cef2f44f Better sanitation of chat messages, support for multiline messages, updated username change method 2016-02-24 22:21:46 -05:00
Dan Seripap
383999b766 Merge branch 'develop' into feature/fileTransfer
* develop:
  Add Nightwatch.js E2E tests
2016-02-24 10:25:17 -05:00
Dan Seripap
e1d095da84 Merge branch 'develop' into feature/fileTransfer
* develop:
  Add Travis yml file
  Add zombie.js tests
2016-02-24 10:25:01 -05:00
Daniel Seripap
71155b3c21 Merge pull request #14 from seripap/nightwatch-tests
Nightwatch tests
2016-02-24 10:22:52 -05:00
Alan Friedman
8119329863 Merge branch 'develop' into nightwatch-tests
Conflicts:
	.travis.yml
	gulpfile.babel.js
	package.json
	test/app.js
2016-02-24 10:04:38 -05:00
Alan Friedman
7bf011d161 Add Nightwatch.js E2E tests
Nightwatch uses Selenium, so we can run tests in real browsers. This
makes it easier to test features that use the web cryptography API.
2016-02-24 10:01:08 -05:00
Dan Seripap
edfab8a0c3 Closes #12 - /me command 2016-02-24 09:17:21 -05:00
Alan Friedman
c7902a6e29 Add helper for waiting for evaluated string 2016-02-23 18:36:04 -05:00
Dan Seripap
0a29d92aed Started write of tests 2016-02-23 17:18:02 -05:00
Alan Friedman
7816f2aa87 Add Travis yml file 2016-02-23 17:05:48 -05:00