vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
14946 commits 1 branch 0 tags 587 MiB
Commit graph

742 commits

Author SHA1 Message Date
Britlog
07c0f4fd99 Stripe translations (#4892) 2018-01-23 14:34:11 +05:30
Saurabh
11be75723b Merge branch 'master' into develop 2018-01-09 12:15:49 +05:30
rohitwaghchaure
7e6da701a8 Show inclusive tax in print (#4769) 2018-01-09 11:14:37 +05:30
ci2014
596717989f Align percentage values to the right (#4738) 
Align percentage values to the right
 2018-01-02 12:12:12 +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
Faris Ansari
6d03ebd1c6 Hotfix login (#4680) 
* FIx XSS Sanitize

* Don't sanitize password
 2017-12-25 18:48:59 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Shreya Shah
e44ee0ae7f disabled user not allowed to reset password (#4630) 2017-12-15 12:15:58 +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
Nabin Hait
7506c49dc4 Fixed Merge conflict 2017-12-12 19:08:53 +05:30
Faris Ansari
49b63d7680 Add is_image util (#4605) 2017-12-12 19:04:38 +05:30
Revant Nandgaonkar
ebf3554754 Geolocation control (#4327) 
* added static map field

* leaflet draw plugin added to map control

* Editable layer working no icons

* Save and load data in form field

* images and icons working

* Locate plugin added, and loads on geolocation

* organized map control code

* loads layer as per form

* new form clears editableLayers

* update: leaflet 1.2.0 and leaflet-draw 0.4.2

* changed to ERPNext colors

* Multiple map fields and fixes

* fixes codacy suggestions

* loaded geojson data editable

* Map layers editable

* add only one layer on draw:create

* code organized with helper functions

* Replaced Leaflet Draw with Leaflet Editable

* read values from database

* layers saved in db

* Using Patched Leaflet Draw (mobile-friendly)

* Working Map field with multiple forms open

* Leaflet Draw css image path fix

* Leaflet Draw

Fixes Leaflet draw css image paths
Fixes Circle marker and Circle

* locate to geolocation or set featurecollection as center

* [fix] leaflet fitBounds padding 50,50

* [Fix] Leaflet (auto) locate

* Map field basic test

* added refresh button on map

* Mute map geojson in print format

* renamed Map field to Geolocation

* Suggested changes and fixes

* eslint disable

* csslint allow important
 2017-10-25 18:30:25 +05:30
Shridhar Patil
51c944fd24 Hide email footer in report (#4323) 
* Hide footer in auto email reports

https://github.com/frappe/frappe/issues/3249

* convert to int to comapare
 2017-10-17 14:48:54 +05:30
Saurabh
52d1e7300b [fix] generate token while initiating razorpay payment and accept payment against the token. do not pass payment arguments in url, user can modify payment parameters (#4269) 2017-10-06 17:23:12 +05:30
Rushabh Mehta
52936f724e [fix] cleanup style for blog listings 2017-09-24 12:05:23 +05:30
mbauskar
6fd186eaa3 [minor] translate field label for auto email reports 2017-09-11 18:07:57 +05:30
Faris Ansari
61b4dc3147 [Print Format] Align labels to right 2017-09-05 14:04:39 +05:30
Rushabh Mehta
faee27f773 [fix] [translation] switch to desk, #3328 2017-09-04 22:26:12 +05:30
Faris Ansari
f5af5e8c8a Revert "Fixed top pargin issue in PDF Print (#4028)" (#4040) 
This reverts commit 4ce808a81b.
 2017-09-04 14:29:55 +05:30
KanchanChauhan
4ce808a81b Fixed top pargin issue in PDF Print (#4028) 2017-09-04 13:39:52 +05:30
Rushabh Mehta
efe88591c2 Merge branch 'master' into staging 2017-08-24 16:51:28 +05:30
Rushabh Mehta
798451d254 [fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686 (#3979) 
* [fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686

* [minor] timeout not required

* Update layout.js
 2017-08-23 18:12:59 +05:30
Rushabh Mehta
7dedc69461 [print-style] sync, fix tests and remove selection 2017-08-18 14:53:38 +05:30
Rushabh Mehta
19e9834850 [added] print style 2017-08-17 18:34:14 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
ci2014
3d7d8044b0 Update list.html 
Add _() to More Button, to translate the button.
 2017-08-09 18:42:56 +02:00
Rushabh Mehta
bc4d46a362 [fix] style and move setup to system settings 2017-08-08 14:29:22 +05:30
Rushabh Mehta
4e42ed65e1 Merge branch 'twofactor' of https://github.com/manqala/frappe into manqala-twofactor 2017-08-08 11:58:22 +05:30
Faris Ansari
8dc9645cdb Decrease website sidebar width, push down for mobile (#3864) 2017-08-07 13:35:22 +05:30
Rushabh Mehta
644430754e [minor] sidebar in website not hidden in mobile 2017-08-04 15:49:18 +05:30
Rushabh Mehta
ece91d903c [docs] simplified docs home 2017-07-31 17:39:44 +05:30
Rushabh Mehta
e75dc25a72 [minor] show breadcrumbs in mobile view 2017-07-31 16:53:49 +05:30
Rushabh Mehta
590310091b [docs] remove {{docs_base_url}} 2017-07-31 16:41:19 +05:30
Faris Ansari
343af6af46 Hide links in pdf (#3814) 
* Hide links in pdf

* Show footer in print preview
 2017-07-31 10:59:24 +05:30
Faris Ansari
f3f21554b2 Email footer refactor (#3807) 
* Email footer refactor

* styling fixes

* Unsubscribe message

* fix test
 2017-07-31 10:53:15 +05:30
ckosiegbu
86bfd7bf68 Merge branch 'develop' into twofactor 2017-07-31 00:15:17 +01:00
ckosiegbu
6b06f9e943 Various fixes. Barcode email now sent only once instead of on each login. 2017-07-31 00:02:53 +01:00
Rushabh Mehta
c519122929 [docs] Build docs in an app (#3796) 
* [docs] to be rendered in website

* [docs] generating-docs.md

* [fix] codacy

* [docs] minor updates

* [fix] routing
 2017-07-28 11:43:16 +05:30
ckosiegbu
cbee42f2d6 Merge branch 'develop' into twofactor 2017-07-27 21:52:42 +01:00
B H Boma
dcee43f646 Settings to send Qrcode as email to user 2017-07-27 17:59:43 +01:00
Faris Ansari
3f93565553 Email designs (#3786) 
* New message email

* Mentioned in a comment

* File backup email

* Feedback email

* Administrator logged in email

* Upcoming events email

* minor

* Add header title and indicator color
 2017-07-27 17:51:20 +05:30
omkarghaisas
d56fbaba41 Third party apps portal (#3782) 
* Added third party apps portal page stub

* [WIP] third party apps portal page

* Added portal page third party apps

Added page to manage OAuth 2.0 active sessions

* [Fix] Typo me.html

* frappe/www/third_party_apps.

* [Fix] Added column for last log in
 2017-07-27 11:32:40 +05:30
B H Boma
68251a6112 [WIP][Refactor] Redo twofactor code 2017-07-27 01:12:22 +01:00
Faris Ansari
1549b9aa77 Font size 12px (#3771) 2017-07-25 10:55:01 +05:30
Britlog
998e207a34 Show footer on login page (#3762) 2017-07-24 11:41:18 +05:30
ckosiegbu
97c6d74789 Updates to System Settings and login.js to allow for specification of the name of the token issuer. 2017-07-23 02:16:12 +01:00
ckosiegbu
3329618a14 Merge branch 'develop' into twofactor 2017-07-22 19:05:18 +01:00
crossxcell99
6f4e39fd46 fix Email otp method queue email sending 2017-07-21 17:50:31 +01:00
crossxcell99
aa45ffcac6 fix website user login bug refactor JS 2017-07-21 14:32:04 +01:00
Faris Ansari
5a498616b6 Email header (#3748) 
* Fix fonts for emails

* Email header with indicator

* Login emails with header

* Add tests for email header

* fix codacy
 2017-07-20 17:57:57 +05:30