Commit graph

14786 commits

Author SHA1 Message Date
Achilles Rasquinha
593bb5cb8b Fixed Test Runner 2018-01-15 23:12:17 +05:30
Achilles Rasquinha
e24c8264fa Create Rooms on the fly! 2018-01-15 22:49:25 +05:30
Achilles Rasquinha
0e8804ba31 enable_chat option within settings 2018-01-15 19:41:08 +05:30
Achilles Rasquinha
3b6dc12e90 More Chat UI Fixes 2018-01-15 19:32:13 +05:30
Achilles Rasquinha
3319d0ca4f more layout fixes for chat 2018-01-15 18:33:39 +05:30
Achilles Rasquinha
b750464181 New Chat Layout 2018-01-15 16:43:03 +05:30
Achilles Rasquinha
aeee6d9da4 Fixed test_runner failure 2018-01-15 12:57:20 +05:30
Achilles Rasquinha
f8c1570488 removed unnecessary dependency cssmin 2018-01-15 12:04:31 +05:30
Achilles Rasquinha
5803868813 fixed typo 2018-01-14 23:21:56 +05:30
Achilles Rasquinha
7f5cef23ec cleaner chat-message and chat-room apis 2018-01-14 22:16:30 +05:30
Achilles Rasquinha
133bf53188 Added Docstrings, fixed test_test_runner error 2018-01-12 17:37:53 +05:30
Achilles Rasquinha
287023daad Truncate ChatMessage when ChatRoomList is shown 2018-01-09 19:11:20 +05:30
Achilles Rasquinha
94c4cbaea1 egyptian brackets 2018-01-09 14:43:54 +05:30
Achilles Rasquinha
39eda7b7c4 message preview and notifications 💃 2018-01-09 14:37:45 +05:30
Achilles Rasquinha
42b5fc0f87 scroll to bottom of chat window, always 2018-01-09 11:27:05 +05:30
Achilles Rasquinha
ab51a2b827 removed unncessary code snippets 2018-01-08 23:14:56 +05:30
Achilles Rasquinha
30f35e96e1 moved files to .github folder 2018-01-08 22:53:50 +05:30
Achilles Rasquinha
b60b001fce Fixed Chat Scrolling Issues 2018-01-08 22:53:37 +05:30
Achilles Rasquinha
8cce47ca64
Merge pull request #4750 from zerodhatech/chat
chat message changed from bold to normal
2018-01-08 12:10:15 +05:30
Faris Ansari
4416b1c16f
[fix] Listview column fields (#4770) 2018-01-08 12:02:40 +05:30
Achilles Rasquinha
79305b8bbe
Merge pull request #4767 from achillesrasquinha/fix-dialog-camera
Fixes Camera not Working
2018-01-08 11:44:15 +05:30
shridhar
751355f109 chat message changed from bold to normal 2018-01-07 12:28:17 +05:30
Achilles Rasquinha
42dbd65e3f Merge branch 'fix-dialog-camera' of https://github.com/achillesrasquinha/frappe into fix-dialog-camera 2018-01-05 20:24:20 +05:30
Achilles Rasquinha
78f096b495 Merge branch develop to fix-dialog-camera 2018-01-05 20:22:48 +05:30
Achilles Rasquinha
fafa6c3e96
Merge branch 'develop' into fix-dialog-camera 2018-01-05 20:10:41 +05:30
Achilles Rasquinha
b9599366d1
Merge pull request #4766 from achillesrasquinha/chat-fixes
[MIN] Fixes Message Timestamp for Chat
2018-01-05 20:07:21 +05:30
Achilles Rasquinha
88c67219d9 extended _ to utils 2018-01-05 15:54:55 +05:30
Achilles Rasquinha
67ddf79747 added the squash method to utils 2018-01-05 14:31:50 +05:30
Achilles Rasquinha
d0e01d4309 Fixed namespacing for utils 2018-01-05 13:59:56 +05:30
Achilles Rasquinha
abbbac5f9b fix this.action.primary being empty 2018-01-05 13:49:56 +05:30
Achilles Rasquinha
5a3e817413 fix this.action.primary being empty 2018-01-05 13:48:56 +05:30
Achilles Rasquinha
5e705983c9 [MIN] Fix datetime creation 2018-01-05 13:36:18 +05:30
Achilles Rasquinha
a110444d1b [MIN] Fix datetime creation 2018-01-05 13:35:21 +05:30
Nabin Hait
161b423417 Merge branch 'master' into develop 2018-01-05 13:16:03 +05:30
Nabin Hait
648af86501 Merge branch 'hotfix' 2018-01-05 13:16:03 +05:30
Nabin Hait
566e25f1b3 bumped to version 10.0.7 2018-01-05 13:46:03 +06:00
Faris Ansari
69ca51fe35 Include dependent currency field with Currency fields (#4747)
* Include dependent currency field with Currency fields

* Escape HTML instead of encode

* Fix for LTR
2018-01-05 13:03:45 +05:30
Achilles Rasquinha
6c6c47109c Fix Social Login Patch Break (#4762) 2018-01-05 13:02:03 +05:30
Prateeksha Singh
b0c28d9280
Merge pull request #4761 from ci2014/patch-20
Fix indentation which causes error on restore
2018-01-05 11:57:01 +05:30
ci2014
eb8f38301a
Fix indentation which causes error on restore
Fixes error message, that document with a specific number already exists, even if it doesn't.
2018-01-04 22:15:01 +01:00
Achilles Rasquinha
337746b4a1
Merge pull request #4760 from achillesrasquinha/new-emoji
Load Emojis Async Using frappe.chat.emoji
2018-01-04 23:42:48 +05:30
Achilles Rasquinha
3b82f3cc13 Fix Codacy 2018-01-04 21:07:46 +05:30
Achilles Rasquinha
04c9d3e8be removed emoji.json from build.json 2018-01-04 19:57:32 +05:30
Achilles Rasquinha
c5d0207e28 deleted emoji.js 2018-01-04 19:49:53 +05:30
Achilles Rasquinha
79831dad81 load emojis async, covers all emojis 2018-01-04 19:47:41 +05:30
Achilles Rasquinha
131ac3b81e
Merge pull request #4753 from Sharath-Chikkanna/add_local_infile_param_to_pymysql_client
Local Infile param added to pymysql client to handle LOCAL keyword in…
2018-01-04 18:48:29 +05:30
Achilles Rasquinha
203675b112
Merge pull request #4756 from achillesrasquinha/chat-fixes
Chat Fixes
2018-01-04 17:19:49 +05:30
Achilles Rasquinha
25ecf977da Fixed Codacy 2018-01-04 17:04:35 +05:30
Achilles Rasquinha
9756e5dc50 Merge branch develop into chat-fixes 2018-01-04 16:48:59 +05:30
Achilles Rasquinha
7541886671 Merge branch 'develop' into chat-fixes 2018-01-04 16:38:51 +05:30