ckosiegbu
8265acfa1d
Correcting issue with System Settings json file
2017-07-31 01:16:40 +01:00
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
ckosiegbu
4cf4bb38ea
Merge branch 'twofactor' of https://github.com/manqala/frappe into twofactor
2017-07-28 17:52:40 +01:00
B H Boma
94cc69dfa5
[WIP]Add QRCode email feature
2017-07-28 17:48:36 +01:00
mbauskar
11da197bba
resolved merge conflicts
2017-07-28 16:07:36 +05:30
mbauskar
e377e420a5
Merge branch 'hotfix'
2017-07-28 16:04:43 +05:30
mbauskar
04aa13fc9b
bumped to version 8.6.3
2017-07-28 16:34:43 +06:00
Rushabh Mehta
f0f16ff815
[fix] save last route on error so user logs in to the correct page, fixes frappe/erpnext#8174
2017-07-28 15:18:53 +05:30
Rushabh Mehta
df66dfe941
[fix] render.py for home
2017-07-28 15:16:24 +05:30
Rushabh Mehta
50d06d1202
[minor] sitemap.xml is also programmable
2017-07-28 14:42:14 +05:30
Rushabh Mehta
f609a478ae
[refactor] user permissions ( #3713 )
...
* [refactor] user permissions
* [fix] tests
* [ux] user-permissions
* [minor] cleanup system settings
* [minor] end progress
2017-07-28 14:33:31 +05:30
Faris Ansari
67277507f0
[hotfix] Linked with and List item click ( #3803 )
...
* [hotfix] Linked with and List item click
* Run a single test using Test Runner
* Add test for Linked With
* [minor] List view fixes
2017-07-28 14:30:18 +05:30
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
Rushabh Mehta
9214e0f7fc
[fix] flake8 verison
2017-07-28 11:35:25 +05:30
Rushabh Mehta
5fcd0255f9
[fix] subject
2017-07-28 11:25:53 +05:30
Prateeksha Singh
7fa8148d33
Graph additions ( #3776 )
...
* remove hardcoded height and width
* [graph] relative measures, offsets, generalise all base jobs
* Multiple datasets! (individually colored)
* [graph] Tooltips
* [graph] animate and change values
* [graph] percentage graph
* [graph] custom height, window resize refresh
* [graph] style changes
* [graph] update docs
* [graphs] make graphs.less
* [graphs] prefix classes with 'graph-', nest inside parent class
2017-07-28 11:14:33 +05:30
ckosiegbu
cbee42f2d6
Merge branch 'develop' into twofactor
2017-07-27 21:52:42 +01:00
B H Boma
636792489c
[fix]Prevent future of qrcode if user login
2017-07-27 18:02:26 +01:00
B H Boma
dcee43f646
Settings to send Qrcode as email to user
2017-07-27 17:59:43 +01:00
Saurabh
d384722839
Merge branch 'master' into develop
2017-07-27 17:59:19 +05:30
Saurabh
a7fd1691f8
Merge branch 'hotfix'
2017-07-27 17:59:18 +05:30
Saurabh
2389f46411
bumped to version 8.6.2
2017-07-27 18:29:18 +06:00
Faris Ansari
e7790b36d2
Rich Text Comment Area ( #3789 )
...
* first cut
* frappe.ui.CommentArea
* working commit
* enable airmode
* Styling fixes
* Add emoji support in comment
* editing wip
* Fixed editing area
2017-07-27 17:52:51 +05:30
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
Rushabh Mehta
a0aa9a2079
[fix] callback for ajax ( #3802 )
...
* [fix] callback for ajax
* [fix] ajaxSend instead of ajaxStart
2017-07-27 17:49:01 +05:30
Utkarsh Goswami
be60a22365
[UI Test Report] Test for Query Report ( #3801 )
...
* Updated Test for Query Report
* Correct path updated
2017-07-27 17:44:54 +05:30
mbauskar
3c0e8b2ed3
Merge branch 'hotfix'
2017-07-27 12:17:21 +05:30
mbauskar
3f70754e11
Merge branch 'master' into develop
2017-07-27 12:17:21 +05:30
mbauskar
ac3e361ecf
bumped to version 8.6.1
2017-07-27 12:47:20 +06:00
Makarand Bauskar
22475a046c
[hotfix] encode the email message to utf8 before sending mail ( #3785 )
...
* [hotfix] encode the email message to utf8 before sending mail
* [minor] review fixes
2017-07-27 12:14:37 +05:30
Rushabh Mehta
aef98daae4
[add] catch errors flake8 ( #3800 )
2017-07-27 11:34:44 +05:30
Faris Ansari
1332710982
Email footer ( #3784 )
...
* Add frappe.preview_email for faster feedback on email design
* Set Unsubscribe link color to text-muted
* error handling for header
* codacy fixes
2017-07-27 11:33:31 +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
bcornwellmott
377f233ca4
Allow workflow state and status in listview ( #3757 )
...
* Allow workflow state and status in listview
* Clear trailing blankspace
* Fixed bug when missing override_status
* Commonized duplicate code
2017-07-27 11:24:50 +05:30
Nabin Hait
ff248fd4fa
Pass if unable to handle failed ajax response ( #3797 )
2017-07-27 11:21:15 +05:30
Rushabh Mehta
25dcdd2462
[minor] add clear in msgpring
2017-07-27 10:39:26 +05:30
Rushabh Mehta
bc8044c4e0
[fix] no breadcrumbs in update-password
2017-07-27 10:39:26 +05:30
Makarand Bauskar
a66845036b
[minor] revert enable all roles ( #3790 )
2017-07-27 09:01:48 +05:30
B H Boma
68251a6112
[WIP][Refactor] Redo twofactor code
2017-07-27 01:12:22 +01:00
B H Boma
a8b526bfd1
[WIP][Refactor] Redo twofactor code
2017-07-26 17:34:36 +01:00
mbauskar
29c4622fa0
Merge branch 'develop' into staging
2017-07-26 18:00:00 +05:30
Prateeksha Singh
d94d992337
[fix][img-control] detach wrapper after inserting ( #3794 )
2017-07-26 17:50:49 +05:30
omkarghaisas
fad9c91cfe
Added mobile number in edit user profile web form ( #3766 )
...
updated mobile number is required to login using mobile number
2017-07-26 11:52:21 +05:30
Prateeksha Singh
c2f18dd9e4
[fix] detach instead of emptying parent ( #3783 )
2017-07-26 11:50:22 +05:30
Saurabh
9174b245d8
Merge branch 'staging'
2017-07-25 16:39:57 +05:30
Saurabh
9b4d8ad8a8
Merge branch 'master' into develop
2017-07-25 16:39:57 +05:30
Saurabh
f26695cdba
bumped to version 8.6.0
2017-07-25 17:09:56 +06:00
Saurabh
8eba852a13
Merge branch 'hotfix'
2017-07-25 15:58:28 +05:30
Saurabh
ae8d26760b
Merge branch 'master' into develop
2017-07-25 15:58:28 +05:30
