Commit graph

727 commits

Author SHA1 Message Date
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
005cfe3dc8 🎉 NEW Frappe Chat (#4612)
* added doctypes, created frappe chat ui

* added component layout with state-like abilities, added apis

* updated user doctype, moved from state-like feature and component abstraction

* added room component

* fixed publish_realtime with after_commit = True

* created room component and searchbar

* minor fix

* functional message parsing

* update

* Added Chat Profile

* added chat message

* more changes into chat room

* fixed APIs, added client side scripting

* added chat message attachements, more doc updates

* Brand New UI with socket io room integration

* completed socketio integration. off to room subscription and publish

* realtime room update

* raw update

* initialized docs, added p2p connection for call tests

* updated docs

* added coverage, updated api for ease of use

* raw commit

* added test cases

* Chat Room updates and new room creation

* added chat group creation

* added collapsible plugin

* toggable room view

* updated

* [RAW]

* updated UI for chat

* Deleted Previous Chat Page

* moved from frappe.Chat.Widget to frappe.Chat

* modularized frappe-fab

* added more docstrings

* tried adding conversation tones

* Added conversation_tones and refurbished chat popper

* modified frappe.ui.Dialog, moved from AppBar to ActionBar, responsive for Mobile 💃

* moved RoomList item namespace

* Configurable Desktop update, moved profile updates to on_update

* added state change listeners

* removed AppBar to ActionBar customizable 💃

* added destroy method

* removed coverage, refactored group creation

* Successful Chat Rooms and Group creation

* sort rows based on last_message_timestamp or creation

* added frappe._.compare

* removed redundant less variables

* Chat Room back button with custom routing and destroy methods

* Added EmojiPicker

* fixed multiple dialog render

* setup quick access

* added chat chime, functional chat message list updates at room list

* deleted package-lock.json

* realtime date updates

* updated chat message list

* functional message render and updates

* added track seen

* added typing status

* updated typing status

* valid typing statuses and quick search

* Functional Quick Search

* reverted fix

* some more cleanup and promisifed

* fixed hints close on click

* updated fab boldness

* close popper on click panel

* close popper on click panel

* reverted octicon-lg, fixed popper heading click

* new frappe capture

* removed webcamjs

* added uploader and capture

* removed chat FAB, added as notification instead

* on message update
2017-12-28 18:58:43 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Achilles Rasquinha
61b2b25981 [FIX] Fix XSS (#4560)
* [FIX] login xss

* [FIX] Client Side Sanitization

* moved from frappe to frappe.utils

* added strategies

* removed console.log

* fixed codacy

* XSS sanitization at login

* moved to common js - xss_sanitize
2017-12-13 16:25:06 +05:30
Saurabh
20fff6e874 Merge branch 'master' into develop 2017-11-22 18:02:53 +05:30
Revant Nandgaonkar
387a3ad9e3 [Fix] Breadcrumbs for Help Article (#4515) 2017-11-21 16:01:06 +05:30
ci2014
282d3a0b6f Fix typo in render.py (#4512) 2017-11-20 11:37:46 +05:30
paurosello
b8723e72da Allow label and description translation in web forms (#4481) 2017-11-14 10:48:03 +05:30
Britlog
529ae92d1e Encoding error on web form rendering (#4418) 2017-11-03 09:41:43 +05:30
mbauskar
ee7508347d resolved merge conflicts 2017-10-18 16:22:06 +05:30
Rushabh Mehta
69e08f8e97 [minor] web form (#4302) 2017-10-17 12:24:06 +05:30
Makarand Bauskar
9ff3dfcd4c [hotfix] robots.txt file is considered as static instead of getting context from robots.py (#4325) 2017-10-17 11:56:29 +05:30
Makarand Bauskar
91a6c5b246 [minor] create __init__ file, passed create_init=True explicitly (#4265) 2017-10-09 13:17:03 +05:30
Makarand Bauskar
36a0782564 [minor] moved the Website Name field to top (#4258) 2017-10-06 11:48:13 +05:30
Nabin Hait
e9126dfce0 Merge branch 'master' into develop 2017-09-27 18:25:14 +05:30
Rushabh Mehta
3b6ed442af [fix] frappe/erpnext#10939 2017-09-27 18:20:20 +05:30
Aditya Hase
1a0eaa4aaa Convert rendered html to unicode before substring matching 2017-09-27 01:08:07 +05:30
Aditya Hase
52c7b04932 Use next(iter) instead of iter.next() 2017-09-27 01:08:07 +05:30
Nabin Hait
ce01845d11 Merge branch 'master' into staging 2017-09-25 16:30:13 +05:30
Nabin Hait
1d93c66285 Fixed merge conflict 2017-09-25 16:30:08 +05:30
Rushabh Mehta
adc7ad69cd [fix] desktop notifications 2017-09-25 11:06:54 +05:30
Rushabh Mehta
cef8c6be38 [minor] web_page, allow any tags 2017-09-24 20:59:11 +05:30
Rushabh Mehta
1ee6ff1009 [fix] for blog 2017-09-24 20:54:28 +05:30
Rushabh Mehta
a52d927e28 [fix] for blog 2017-09-24 20:51:29 +05:30
Manas Solanki
18d17e2fd5 datepicker in the web form 2017-09-24 19:11:24 +05:30
Rushabh Mehta
52936f724e [fix] cleanup style for blog listings 2017-09-24 12:05:23 +05:30
Rushabh Mehta
57dfa412af [fix] web form datepicker, trigger change event 2017-09-23 16:10:37 +05:30
Rushabh Mehta
e4bca53088 Merge pull request #4130 from mbauskar/4005
[fixes] render extracted jinja title for custom doctypes
2017-09-18 13:25:06 +05:30
mbauskar
9d2985e38c [minor] images attached to website slideshow should be public 2017-09-18 11:57:44 +05:30
Saurabh
287d7dc2c6 Merge branch 'master' into develop 2017-09-16 11:54:28 +05:30
mbauskar
5be75aaf27 [fixes] render extracted jinja title for custom doctypes 2017-09-15 11:38:50 +05:30
Saurabh
607806e74f [fix] set default role specified in Portal Settings while signup as website user 2017-09-14 17:12:47 +05:30
Faris Ansari
0180b3fd3a fix success spelling 2017-09-14 11:54:21 +05:30
Rushabh Mehta
884f00eed8 Update web_form.js 2017-09-14 11:13:40 +05:30
Manas Solanki
f9988fafe9 don't route to success message for the website user 2017-09-13 18:59:52 +05:30
Rushabh Mehta
683bafef6b Merge pull request #4053 from rmehta/contact-us-settings
Contact Us Settings
2017-09-06 10:47:19 +05:30
Rushabh Mehta
faee27f773 [fix] [translation] switch to desk, #3328 2017-09-04 22:26:12 +05:30
Rushabh Mehta
a5b74ba3bc [fix] add phone, email, skype in contact us, fixes frappe/erpnext#1226 2017-09-04 21:46:37 +05:30
Rushabh Mehta
664adb470c [fix] add phone, email, skype in contact us, fixes frappe/erpnext#1226 2017-09-04 21:46:28 +05:30
Rushabh Mehta
1c75167f65 [fix] refactor website_settings, fixes frappe/erpnet#8949 2017-08-31 13:39:09 +05:30
Rushabh Mehta
2ab07f4275 [feature] autoname prompt, refactor control.js, fixes frappe/erpnext#8940 2017-08-24 18:35:07 +05:30
Rushabh Mehta
19e9834850 [added] print style 2017-08-17 18:34:14 +05:30
mbauskar
8c5656b99d Merge branch 'master' into develop 2017-08-14 12:31:52 +05:30
Faris Ansari
4f61e875f2 [hotfix] Website theme 2017-08-14 11:08:16 +05:30
Aditya Hase
e324406c8a Import six.moves.urllib.parse.urlencode instead of urllib.urlencode 2017-08-11 00:38:26 +05:30
mbauskar
81c75602f2 Merge branch 'master' into develop 2017-08-09 11:16:16 +05:30
Makarand Bauskar
6298446be8 [hotfix] encode title and content field for global search (#3881) 2017-08-09 11:01:07 +05:30
Rushabh Mehta
bc4d46a362 [fix] style and move setup to system settings 2017-08-08 14:29:22 +05:30
Aditya Hase
62bb03ef6e Replaced Python 2 print syntax with Python 3 syntax (#3838)
* Replaced Python 2 print syntax with Python 3 syntax

* Update utils.py
2017-08-02 17:10:40 +05:30