Commit graph

17876 commits

Author SHA1 Message Date
Faris Ansari
daca5fbf13 fix: Revert class name for Print Format 2019-02-02 11:34:53 +05:30
Faris Ansari
de8adac6b5 style: Unused variable 2019-02-02 11:32:03 +05:30
Faris Ansari
edc2ea0534 style: Missing semicolon 2019-02-02 11:31:57 +05:30
Faris Ansari
b6d5607ebc Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-01 00:06:21 +05:30
Faris Ansari
c8419aaec0 fix: update web_page.json 2019-01-31 23:56:29 +05:30
Faris Ansari
9a0bfcd775 fix: Bootstrap default custom theme 2019-01-31 23:49:58 +05:30
Faris Ansari
764dd1313b fix: Rename Theme Section properly 2019-01-31 23:17:08 +05:30
Faris Ansari
11427ad8d8 fix(Web Page): Remove old script style
- Set route from title
2019-01-31 22:52:56 +05:30
Faris Ansari
50dbac354d fix: pass spacer to frappe.scrub 2019-01-31 22:52:30 +05:30
Faris Ansari
bc34871445 fix: Deprecate js_globals 2019-01-31 22:52:05 +05:30
Faris Ansari
3e66a3ca87 fix: Remove unused variables file 2019-01-31 22:51:09 +05:30
Faris Ansari
be82712734 style: Spaces to tabs 2019-01-31 21:59:04 +05:30
Faris Ansari
18b6127f47 Merge branch 'develop' of https://github.com/netchampfaris/frappe into website-bootstrap-4 2019-01-31 21:54:32 +05:30
Faris Ansari
6e3dca6563 fix: Add more meta tags from standard properties 2019-01-31 21:53:09 +05:30
Faris Ansari
428c52b99f fix: Bootstrap 4 class fixes 2019-01-31 19:37:43 +05:30
Faris Ansari
93bb5428ed fix: Add datepicker styles for webform 2019-01-31 19:37:26 +05:30
Sagar Vora
cf1818f989 Merge branch 'master' into develop 2019-01-31 13:31:00 +05:30
Sagar Vora
9591fb7660 Merge branch 'hotfix' 2019-01-31 13:28:38 +05:30
Sagar Vora
f904987d2d bumped to version 11.1.3 2019-01-31 13:48:38 +05:50
Suraj Shetty
02664204ae fix: Set modified and created value while creating user permissions from patch (#6847)
* Set modified and created value while creating user permissions

* Add patch to set missing creation and modified value

* Pass dict with value to the query

* Fix query

* Use now instead of now_datetime

* Set actual creation and modified of user permission

* Remove unwanted import

* Remove bad, useless, garbage code
2019-01-31 13:17:22 +05:30
rohitwaghchaure
7ccb5a21c4 fix: prepared report filters not working (#6864) 2019-01-31 09:31:19 +05:30
Sagar Vora
c8f23b4746 Merge branch 'master' into develop 2019-01-30 20:08:53 +05:30
Sagar Vora
09ac86861d Merge branch 'hotfix' 2019-01-30 20:05:49 +05:30
Sagar Vora
3f3dd0ddb1 bumped to version 11.1.2 2019-01-30 20:25:49 +05:50
Aditya Hase
6031e2bc9c fix(search): Fix possible reflected XSS attack vector (#6860) 2019-01-30 19:55:50 +05:30
Sagar Vora
6811d8396f
fix: fallback not reqd for section label, has default (#6865) 2019-01-30 19:44:13 +05:30
Faris Ansari
621cadcf22
Revert "fix: Print Format Builder not working unexpected string (#6861)" (#6863)
This reverts commit 42ec843b24.
2019-01-30 18:43:40 +05:30
Kartik Sharma
42ec843b24 fix: Print Format Builder not working unexpected string (#6861)
* Fix Print Format Builder

* fix: add *working* fallback

* fix: keep quotes around attr value
2019-01-30 18:41:12 +05:30
Nabin Hait
e3952cb199
fix: Better data import error log (#6862) 2019-01-30 18:34:41 +05:30
Faris Ansari
d5617dcf97 fix: Remove utility classes and style using css 2019-01-30 18:14:51 +05:30
Robert
5ac851e420 fix: frappe.throw of 'Invalid Password:' not translatable on update-password page (#6725)
* [Fix] throw 'Invalid Password:' when checking password strongness

* Update __init__.py
2019-01-30 17:40:15 +05:30
Faris Ansari
031b6cfd44 fix: Rename fields and cleanup 2019-01-30 16:22:54 +05:30
Aditya Hase
13de5fa823 fix(search): Fix possible reflected XSS attack vector (#6856) 2019-01-30 14:16:54 +05:30
Shivam Mishra
577c139252 fix: removed help setup from test scripts (#6857) 2019-01-30 14:05:22 +05:30
Karthikeyan S
bd196ac43b fix(router): error handling for use in non-desk environment(marketplace) (#6848) 2019-01-30 13:47:28 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
Saurabh
5f817ed5df Merge branch 'hotfix' 2019-01-30 12:29:38 +05:30
Saurabh
b6c0dad25c bumped to version 11.1.1 2019-01-30 12:59:38 +06:00
rohitwaghchaure
e458d7d0a7 feat: provision to enable/disable prepared report from permission for page and report document (#6831)
* feat: provision to enable/disable prepared report from permission for page and report document

* Added progress bar in the report

* Removed cache and fixed message

* Show progress bar if execution time is greater than 2 seconds
2019-01-30 12:25:29 +05:30
Suraj Shetty
f5ded9fd56 Fix "object has no attribute 'parent_doc'" error while saving doc (#6855) 2019-01-30 11:49:42 +05:30
Rushabh Mehta
0704928fd8 fix(global search): fallback if redis is not yet started 2019-01-30 11:26:07 +05:30
Rushabh Mehta
d09792c606 fix: refactor global search to not insert after every commit (#6845)
* fix: refactor global search to not insert after every commit

* feat: configuration to disable_global_search
2019-01-30 11:13:51 +05:30
rohitwaghchaure
4a1ee3e66f fix: modified date (#6854) 2019-01-30 11:07:13 +05:30
Suraj Shetty
955bddf469
Merge pull request #6757 from zerodhatech/framework_queries
fix: primary key should not have default value
2019-01-29 22:35:51 +05:30
Sagar Vora
26eb775803
fix: keep deprecated help commands (#6851) 2019-01-29 21:56:57 +05:30
Sagar Vora
4e3684ee2a
fix: there are 28 fields in Event, not 30 (#6850) 2019-01-29 21:31:11 +05:30
Sagar Vora
d0c2943637 Merge branch 'hotfix' 2019-01-29 20:19:32 +05:30
Sagar Vora
3af57b757f
Merge pull request #6846 from gmplab/patch-1
fix: incorrect import
2019-01-29 20:05:44 +05:30
Sagar Vora
c5cc95a7ca
Merge branch 'hotfix' into patch-1 2019-01-29 20:05:06 +05:30
gmplab
bcb121bd03
Update purifycss.py
minor fix print_funciton->print_function
2019-01-29 21:34:50 +08:00