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

1435 commits

Author SHA1 Message Date
Chinmay Pai
5f0dbecfed data-import: fix UnicodeEncodeError on data import in python2 (#6448) 
why is this not built into re by default?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-11-13 10:35:27 +05:30
Frappe Bot
478e60fdb1 Merge branch 'staging' into develop 2018-11-09 10:18:33 +00:00
Frappe Bot
c373a172af Merge branch 'master' into staging-fixes 2018-11-09 10:08:19 +00:00
gshmu
a2642868a5 fix read_xlsx_file_from_attached_file when xlsx contain functions (#6400) 2018-11-09 10:53:03 +05:30
Faris Ansari
338c4c8794 fix: Email Reply Chain 
Previous email is appended to the next reply, but was not rendered by
splitting it with a hardcoded comment string. Since Quill does not
support comments, created a new HiddenBlock for it.
 2018-11-07 13:06:22 +05:30
Ameya Shenoy
b9ad9f8fb1
Merge branch 'staging' into develop 2018-11-05 11:43:46 +00:00
Faris Ansari
fe334d2c92 fix(Quill): Add all quill attributes that are required to render it 2018-11-05 17:07:21 +05:30
Ameya Shenoy
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
Aditya Hase
e6b070e611 refactor: Deduplication (#6347) 
* refactor: Deduplicate setup_perms_for

`setup_perms_for` has two identical definitions in

frappe/utils/reset_doc.py and
frappe/patches/v7_2/setup_custom_perms.py

Remove definition from setup_custom_perms.py, use import instead

* refactor: Deduplicate get_parent_doc and set_timeline_doc

`get_parent_doc` and `set_timeline_doc` are accidentally defined twice in

frappe/core/utils.py and
frappe/core/doctype/communication/communication.py

Remove definition from communication.py, use import instead

* fix(python3): Replace urlopen import with six.moves.urllib.request.urlopen
 2018-11-05 11:01:59 +05:30
Faris Ansari
e0cf3f367b fix(Quill): Add data-row attr to whitelist 
- data-row attribute is added by Quill for retaining table structure
 2018-11-01 19:06:30 +05:30
Ameya Shenoy
ee3ae7abea
Merge branch 'staging' into develop 2018-10-30 12:52:16 +00:00
Ameya Shenoy
25a0b8dba2
Merge branch 'master' into staging-fixes 2018-10-30 12:09:41 +00:00
Ameya Shenoy
dd0e7ba472
fix(help): mitigate security fix for docs 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-30 17:13:00 +05:30
Aditya Hase
3afb9ebcbc
fix(security): Make Jinja tighter 2018-10-30 13:13:42 +05:30
Ameya Shenoy
42b4419b06
Merge branch 'staging' into develop 2018-10-23 12:55:31 +00:00
Ameya Shenoy
0279e957c6
Merge branch 'master' into staging-fixes 2018-10-23 12:51:30 +00:00
Ameya Shenoy
95c8b30d7d
Merge pull request #6281 from kennethsequeira/hotfix 
Update in-app Docs Generation
 2018-10-23 18:05:18 +05:30
Ameya Shenoy
aa4ef1b405
Merge branch 'staging' into develop 2018-10-23 08:04:11 +00:00
Saif
971e60f0bf Added frappe.get_cached_doc in available jinja methods (#6292) 2018-10-23 11:04:18 +05:30
Saif
25827755b5 PDF allow parsing header-spacing (#6286) 
Simply allow parsing header-spacing from custom css.
 2018-10-22 10:13:26 +05:30
Ameya Shenoy
06d9385829
Merge branch 'staging' into develop 2018-10-19 12:51:40 +00:00
Kenneth Sequeira
026bd0d2bc fixed image link 2018-10-19 14:42:56 +05:30
Kenneth Sequeira
1e0880493c remove rogue tab space 2018-10-19 14:33:30 +05:30
Kenneth Sequeira
f31e7ac8a3 added source link for frappe docs 2018-10-19 14:30:34 +05:30
Shreya Shah
8e0410bdb0
Update help.py 2018-10-19 14:21:36 +05:30
Shreya Shah
0473ea9c6b
Update help.py 2018-10-19 14:09:49 +05:30
Shreya Shah
1f8c8568ed
Update help.py 2018-10-19 11:44:51 +05:30
Kenneth Sequeira
28b5589c72 Docs setup code same as v11 
Currently, in v10, the docs still point to ERPNext develop branch, before it being moved to erpnext.org app.

Co-authored-by: Shreya Shah <shreyashah115@gmail.com>
>
 2018-10-19 03:22:17 +05:30
Ameya Shenoy
be8f37dc5b fix(update message): multiple fixes 
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-18 13:56:32 +00:00
Ameya Shenoy
04d255bc5f fix(update message): multiple fixes (#6275) 
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-18 12:33:00 +05:30
Nabin Hait
d37d111f61 Fixed merge conflict 2018-10-15 15:53:26 +05:30
Chinmay Pai
a5977ab22e file_manager: deprecate file_manager for file api (#6231) 
file_manager will be deprecated from v12 onwards, and shall be moved to a separate file api

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-10-15 10:38:49 +05:30
Rushabh Mehta
1f1a1ec810 fix(formatdate): always replace mm by MM for babel.dates 2018-10-15 10:34:17 +05:30
Ameya Shenoy
63c5613f92
Merge branch 'staging' into develop 2018-10-11 10:11:26 +00:00
Saurabh
66a2d81df7 get link to reset password only if setup wizard is not completed 2018-10-11 14:43:37 +05:30
Saurabh
cdc2e17cbf get link to reset password only if setup wizard is not completed 2018-10-11 14:39:52 +05:30
Rohit Waghchaure
0307b3da59 [Fix] File not found error 2018-10-10 13:17:53 +05:30
Ameya Shenoy
72e5aa57a0 fix(make_content): added missing parameter docsapp 2018-10-06 17:51:09 +05:30
Ameya Shenoy
960d568427
Merge branch 'staging' into develop 2018-10-05 09:08:07 +00:00
Charles-Henri Decultot
09cdb2f39b [Fix] In-app documentation (#6185) 
* In-app documentation correction

* In app images fix proposal
 2018-10-05 11:29:37 +05:30
Ameya Shenoy
387f556dd5
Merge branch 'staging' into develop 2018-10-04 11:41:29 +00:00
Ameya Shenoy
66073c360a
Merge branch 'master' into staging-fixes 2018-10-03 14:51:32 +00:00
Prateeksha Singh
d4d0a87d89
[change_log][minor] remove hr 2018-10-03 17:41:54 +05:30
Shreya Shah
f4c9d5d2b2
Merge pull request #6187 from shreyashah115/allow-images 
Allow img src having data protocol
 2018-10-03 16:13:32 +05:30
Shreya
487fd3e321 Allow img src having data protocol 2018-10-03 10:52:24 +05:30
Ameya Shenoy
1ba3f4a737 fix(release_popup): show only the non-beta release (#6169) 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-02 10:43:09 +05:30
Charles-Henri Decultot
98abda32b4 [Enhancement] Event timeline (#6133) 
* Events in timeline wip

* Events in timeline

* Permission issue + split buttons between Frappe and ERPNext

* Add string type check

* Codacy corrections

* Permission issue

* Test and feedback corrections

* Codacy corrections

* Tests and codacy corrections

* Codacy correction

* Py3 correction

* Travis correction

* Py3 corrections"

* Travis and codacy corrections

* Removed space

* Add check for the removal of new lines

* Codacy rollup watch missing semicolon
 2018-10-02 10:12:55 +05:30
rohitwaghchaure
8fe95f2876 Submit the attendance if it's in draft mode (#6156) 2018-09-30 21:11:01 +05:30
Faris Ansari
b37c5153a9 fix(File): Infer File Permissions from linked doc 2018-09-26 14:40:10 +05:30
Ameya Shenoy
e551153ea0
Merge branch 'staging' into develop 2018-09-26 07:21:28 +00:00