Commit graph

14904 commits

Author SHA1 Message Date
Achilles Rasquinha
bda2f52e41 revert 2018-01-23 14:19:51 +05:30
Achilles Rasquinha
d6a6a11808 revert 2018-01-23 14:13:26 +05:30
Achilles Rasquinha
6f5e35582d Added Maxmind GeoIP 2018-01-23 13:38:33 +05:30
Achilles Rasquinha
f1f91e44a9 Fixed showdown.js 2018-01-23 13:18:54 +05:30
Achilles Rasquinha
17d334a5ff chat-list-notifications 2018-01-23 12:21:30 +05:30
Achilles Rasquinha
3f8bf0b5a9 added background image 2018-01-23 10:06:10 +05:30
Achilles Rasquinha
aa58f515a9 Groupable 2018-01-22 23:26:03 +05:30
Achilles Rasquinha
04091a6d83 Fixed Chat Footer Margin 2018-01-22 22:41:22 +05:30
Achilles Rasquinha
63959c9483 Fixed chat-footer padding 2018-01-22 20:36:28 +05:30
Achilles Rasquinha
25b1c0af50 fixed panel padding 2018-01-22 19:53:40 +05:30
Achilles Rasquinha
2f6df81f4b Fixed margin padding issue 2018-01-22 18:59:10 +05:30
Achilles Rasquinha
b04e3cce42 New Chat RoomView Layout 2018-01-22 18:35:25 +05:30
Achilles Rasquinha
27e5cf6967 some minor updates 2018-01-21 11:46:58 +05:30
Achilles Rasquinha
a6e98dd73e
Merge pull request #4872 from achillesrasquinha/chat-fixes
Fixed Chat Sound issues and Room Layout
2018-01-18 19:28:58 +05:30
Achilles Rasquinha
a56452744a Fixed Chat Sound issues and Room Layout 2018-01-18 19:12:41 +05:30
Achilles Rasquinha
2a615d112a
Merge pull request #4870 from achillesrasquinha/new-chat-ui
"New" Chat UI
2018-01-18 18:19:45 +05:30
Achilles Rasquinha
c53ec2e12c
Merge pull request #4871 from achillesrasquinha/Fix-4869
[FIX] permission issues for non System Managers
2018-01-18 18:19:19 +05:30
Achilles Rasquinha
9b5b86a485
Merge pull request #4864 from achillesrasquinha/fix-chat-3
Filter Chat Message List
2018-01-18 18:19:07 +05:30
Achilles Rasquinha
b499dbdf69
Merge pull request #4856 from achillesrasquinha/fix-chat-2
[frappe-chat] Fix Chat Hint View
2018-01-18 18:18:57 +05:30
Achilles Rasquinha
c2a8006db2
Merge pull request #4826 from achillesrasquinha/Feature-get_single_value
Client-Side get_single_value
2018-01-18 18:18:39 +05:30
Achilles Rasquinha
c0d9122592 Fixed Codacy 2018-01-18 17:01:39 +05:30
Achilles Rasquinha
eb229ad14b Fixed Codacy 2018-01-18 16:57:04 +05:30
Achilles Rasquinha
42732aeb3e Fixed Codacy 2018-01-18 16:54:03 +05:30
Achilles Rasquinha
8db0ee37cf Fixed permissions 2018-01-18 16:50:43 +05:30
Achilles Rasquinha
67021b451e new chat ui 2018-01-18 16:37:10 +05:30
Faris Ansari
eff0183151
Listview fixes (#4827)
* Rename _fields to fields

* Update datatable lib
2018-01-18 15:39:40 +05:30
Faris Ansari
32a83ce81f
only promise 2018-01-18 14:56:44 +05:30
Faris Ansari
ba9818a61e
Listview fixes (#4846)
* [minor] Handle empty fieldselect map

* Handle 0 rows in reportview
2018-01-18 14:50:54 +05:30
Ameya Shenoy
7c6efd2e24 Filter dynamic link doctypes enhancement (#4860) 2018-01-18 14:50:33 +05:30
Achilles Rasquinha
42dc1d9a42 Fixed Default Dependency Field Group (#4868) 2018-01-18 14:48:32 +05:30
Achilles Rasquinha
14ee88207a
Merge pull request #4866 from achillesrasquinha/fix-chat-4
Realtime Chat Enable/Disable Feature
2018-01-18 14:16:39 +05:30
Achilles Rasquinha
5551632511 Fixed Codacy 2018-01-18 14:02:09 +05:30
Aditya Hase
8c525fc5d4 Python 3 compatibility Frappe installation fixes (#4863)
* Use consistent indentation

* Fix print syntax

* Pass unicode argument to pymysql.escape_string
2018-01-18 13:52:46 +05:30
Achilles Rasquinha
900b65e9c3 added logging 2018-01-18 13:13:37 +05:30
Faris Ansari
477f4b92ea
[fix] file test (#4861)
* [fix] file test

* minor

* [fix] refresh after apply filter
2018-01-18 13:12:34 +05:30
Achilles Rasquinha
696306ca4e fixed codacy 2018-01-18 13:06:17 +05:30
Achilles Rasquinha
022ae56516 added todos 2018-01-18 12:45:31 +05:30
Achilles Rasquinha
0c0fce72b3 realtime enable chat 2018-01-18 12:43:59 +05:30
Achilles Rasquinha
6bf8547d19 Filter Chat Message List 2018-01-18 09:58:54 +05:30
Achilles Rasquinha
d33df3a0ae fixed codacy 2018-01-18 09:57:16 +05:30
Nabin Hait
268e9b2a58 Merge branch 'master' into develop 2018-01-17 18:48:53 +05:30
Nabin Hait
aa37c00c0c Merge branch 'hotfix' 2018-01-17 18:48:52 +05:30
Nabin Hait
194cb45ecc bumped to version 10.0.11 2018-01-17 19:18:52 +06:00
Faris Ansari
aa7d93cfdb Generic Append number in naming (#4845)
* Generic append_number_if_name_exists

* Add test
2018-01-17 18:45:37 +05:30
Prateeksha Singh
4ba2713874
Merge pull request #4859 from pratu16x7/hotfix
[hotfix] stop notification check in setup
2018-01-17 18:14:40 +05:30
Prateeksha Singh
42c6c3dd1b [hotfix] stop notification check in setup 2018-01-17 18:11:36 +05:30
Achilles Rasquinha
6336310399
Merge pull request #4855 from achillesrasquinha/fix-chat-1
[MINOR] fetch emojis from frappe/emoji
2018-01-17 15:53:10 +05:30
Achilles Rasquinha
e00242ffff
Merge pull request #4853 from achillesrasquinha/fixes-chat
[PATCH, frappe-chat] enable chat by default within system settings
2018-01-17 15:52:29 +05:30
Achilles Rasquinha
230a575754 Fix Chat Hint View 2018-01-17 13:32:27 +05:30
Achilles Rasquinha
49a5d70b65 fetch emojis from frappe/emoji 2018-01-17 13:04:09 +05:30