Commit graph

14852 commits

Author SHA1 Message Date
Achilles Rasquinha
d33df3a0ae fixed codacy 2018-01-18 09:57:16 +05:30
Achilles Rasquinha
230a575754 Fix Chat Hint View 2018-01-17 13:32:27 +05:30
Achilles Rasquinha
ac46945e31
Merge pull request #4822 from achillesrasquinha/dep-clean
cleanup dependencies
2018-01-17 12:05:31 +05:30
Rushabh Mehta
9d1b6252b7 [fix] avatar image url with brackets 2018-01-16 15:14:03 +05:30
Achilles Rasquinha
7874abd830
Merge pull request #4841 from achillesrasquinha/fixes-chat
[frappe-chat] Updated System Settings
2018-01-16 12:08:54 +05:30
Achilles Rasquinha
eef939a638 updated system settings 2018-01-16 11:54:18 +05:30
Achilles Rasquinha
1c50e8afd4 updated system settings 2018-01-16 11:49:55 +05:30
Faris Ansari
5bc6431245 Remove Chat Support Link (#4840) 2018-01-16 11:46:53 +05:30
Achilles Rasquinha
8b7fede7f4
Merge pull request #4798 from achillesrasquinha/fixes-chat
[frappe-chat] Fixes and Features.
2018-01-16 10:20:22 +05:30
Achilles Rasquinha
a5d4d8635e Fixed Test Runner 2018-01-15 23:16:51 +05:30
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
Prateeksha Singh
b43e888e0b
Merge pull request #4835 from pratu16x7/hotfix
[fix] slideshow private images validation
2018-01-15 20:52:39 +05:30
Prateeksha Singh
b5480ff557 [fix] slideshow private images validation 2018-01-15 20:49:05 +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
Saurabh
3f43899839 resolved merge conflicts 2018-01-15 18:34:11 +05:30
Achilles Rasquinha
3319d0ca4f more layout fixes for chat 2018-01-15 18:33:39 +05:30
Saurabh
126689f1a9 Merge branch 'hotfix' 2018-01-15 18:26:51 +05:30
Saurabh
ca554764a5 bumped to version 10.0.10 2018-01-15 18:56:51 +06:00
tundebabzy
25451759fe add_dropdown_item should only add unique labels (#4818)
* do not allow add_menu_button duplicate items

* JSDOC documentation
2018-01-15 18:12:03 +05:30
Manas Solanki
edbbf4b464 add the field attach_to_field in the file (#4823) 2018-01-15 18:10:53 +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
653d51f9d4 cleanup dependencies 2018-01-15 12:16:48 +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
1b7a6fe2a5
Merge pull request #4803 from lb-/patch-1
[DOCS, MINOR] Fix line break before Jinja Templating
2018-01-12 19:57:58 +05:30
Achilles Rasquinha
133bf53188 Added Docstrings, fixed test_test_runner error 2018-01-12 17:37:53 +05:30
Saurabh
c62ddaabaa Merge branch 'master' into develop 2018-01-12 16:50:19 +05:30
Saurabh
0cab11b67f Merge branch 'hotfix' 2018-01-12 16:50:18 +05:30
Saurabh
b43b4a559a bumped to version 10.0.9 2018-01-12 17:20:18 +06:00
Saurabh
410e6cadd7 [fix] pass language selected on email dialogue while enqueuing the function (#4808) 2018-01-12 16:43:26 +05:30
Prateeksha Singh
1454a3a282
Merge pull request #4809 from pratu16x7/file-query-fix
[travis][fix] default for null folder sizes
2018-01-11 16:47:06 +05:30
Prateeksha Singh
851e3aa393
Merge pull request #4811 from netchampfaris/hotfix-naming-escape
Hotfix naming escape
2018-01-11 16:43:08 +05:30
Prateeksha Singh
1164c2d8d2 [fix] default for null folder sizes 2018-01-11 16:28:38 +05:30
Prateeksha Singh
ac1a67f083
Merge pull request #4812 from codingCoffee/travis-fix
mongodb removed from travis
2018-01-11 15:26:50 +05:30
Ameya Shenoy
6359e635b8
mogodb removed from travis 2018-01-11 15:19:33 +05:30
Faris Ansari
9dc43f85ce minor 2018-01-11 15:02:19 +05:30
Faris Ansari
ad412de054 Escape name in sql query 2018-01-11 15:00:35 +05:30
Prateeksha Singh
4910b98d20
Merge pull request #4804 from netchampfaris/Routing-fix-for-special-chars
Routing fix for special characters
2018-01-11 14:02:21 +05:30
Prateeksha Singh
eb418d8fb6
Merge pull request #4795 from revant/fix_patch_refactor_social_login_key
[Fix] Patch v10_0.refactor_social_login_keys
2018-01-11 12:31:47 +05:30
Nabin Hait
f3e8446a82 Don't set window size in selenium tests 2018-01-11 12:05:40 +05:30
Nabin Hait
06e2e0fde2 Render children again after adding a child 2018-01-11 12:05:40 +05:30
Prateeksha Singh
5a4e01be79
Merge pull request #4805 from pratu16x7/tree-fixes
[tree] refresh on rename
2018-01-10 18:40:54 +05:30
Prateeksha Singh
c928865648 [tree] refresh on rename 2018-01-10 18:39:56 +05:30
Faris Ansari
aa4e293d3b Routing fix for special characters 2018-01-10 15:11:08 +05:30
LB (Ben Johnston)
4930985d70
Fix line break before Jinja Templating
Rendered version was not showing correctly, the bullet point `Codecademy Tutorial for jQuery` was showing as a header.
2018-01-10 18:44:41 +10:00
tundebabzy
4700782c0b
Merge pull request #4800 from frappe-pr-bot/translations-2018-01-09
[Translation] Updated Translations
2018-01-09 16:32:51 +01:00