Commit graph

568 commits

Author SHA1 Message Date
Aditya Hase
703e449cee
fix(hooks): Add missing commas
Fixes following scheduler error

ModuleNotFoundError: No module named 'frappe.deferred_insert.save_to_dbfrappe'; 'frappe.deferred_insert' is not a package
2019-03-07 20:29:39 +05:30
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
Faris Ansari
fadedb0062 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-03-02 15:15:22 +05:30
Rushabh Mehta
fc5b1d2c3e rename: auto assign -> assignment rule 2019-02-28 17:37:20 +05:30
Rushabh Mehta
7f29fd2222 feat: auto assign with tests 2019-02-28 12:50:17 +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
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +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
Sagar Vora
d3735cd107
fix: remove staging version 2019-01-29 18:48:29 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Sagar Vora
ae205fcdd2 bumped to version 11.1.0 2019-01-29 18:20:37 +05:50
Faris Ansari
e4c2f5bae4 feat: Generate Custom Bootstrap Theme using scss variables 2019-01-27 16:11:21 +05:30
Faris Ansari
fd3bb6159e fix: Deprecate profile page
- Route to My Account page
2019-01-26 16:09:30 +05:30
Frappe Bot
f7ea51b8d6 Merge branch 'staging' into develop 2019-01-23 08:10:32 +00:00
Frappe Bot
69548336ba bumped to version 11.0.3-beta.51 2019-01-23 08:10:32 +00:00
Sagar Vora
47c0d10631 Merge branch 'staging' into develop 2019-01-22 15:43:40 +05:30
Sagar Vora
8f7ad2e2f7 bumped to version 11.0.3-beta.50 2019-01-22 16:02:02 +05:50
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Saurabh
cb089b3154 bumped to version 11.0.3-beta.49 2019-01-15 19:44:05 +06:00
Faris Ansari
17e2ea2cc5 fix: Cleanup Blog, List, Comment templates for Bootstrap 4
- Bootstrap 4 class migration
2019-01-15 09:54:05 +05:30
Saurabh
835fc2c1a3 Merge branch 'staging' into develop 2019-01-08 16:09:28 +05:30
Saurabh
22b1987dfa bumped to version 11.0.3-beta.48 2019-01-08 16:37:36 +06:00
Frappe Bot
1197271700 Fixed merge conflict 2019-01-05 09:06:05 +00:00
Frappe Bot
727e000ab8 bumped to version 11.0.3-beta.47 2019-01-05 09:03:59 +00:00
Saurabh
d5fdc670f7 Merge branch 'staging' into develop 2019-01-01 14:26:16 +05:30
Saurabh
e9a1ad5081 bumped to version 11.0.3-beta.46 2019-01-01 14:56:16 +06:00
Saurabh
1bf85da159 Merge branch 'staging' into develop 2018-12-27 18:01:28 +05:30
Saurabh
5dd140c6ed bumped to version 11.0.3-beta.45 2018-12-27 18:31:27 +06:00
Saurabh
3aef483538 Merge branch 'staging' into develop 2018-12-26 21:59:52 +05:30
Saurabh
37e6cd4bff bumped to version 11.0.3-beta.44 2018-12-26 22:29:51 +06:00
Frappe Bot
a7754527df Merge branch 'staging' into develop 2018-12-26 14:31:02 +00:00
Frappe Bot
7e9d29e244 bumped to version 11.0.3-beta.43 2018-12-26 14:31:01 +00:00
Faris Ansari
8641383ed1 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-26 19:51:35 +05:30
Frappe Bot
fec8631fe5 Merge branch 'staging' into develop 2018-12-26 12:58:04 +00:00
Frappe Bot
039f0b406a bumped to version 11.0.3-beta.42 2018-12-26 12:58:04 +00:00
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Frappe Bot
1ba53ca957 bumped to version 11.0.3-beta.41 2018-12-26 11:53:47 +00:00
Frappe Bot
8c58fdc71c Merge branch 'staging' into develop 2018-12-21 05:45:41 +00:00
Frappe Bot
4b336622ae bumped to version 11.0.3-beta.40 2018-12-21 05:45:40 +00:00
Frappe Bot
d2c652ef3a Merge branch 'staging' into develop 2018-12-19 06:30:46 +00:00
Frappe Bot
c824248c58 bumped to version 11.0.3-beta.39 2018-12-19 06:28:00 +00:00
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Saurabh
a62cac8ab7 bumped to version 11.0.3-beta.38 2018-12-18 10:49:37 +06:00
Faris Ansari
5cb91ae57b Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-14 10:07:15 +05:30
Saurabh
b727233948 Merge branch 'staging' into develop 2018-12-13 10:37:25 +05:30
Saurabh
f42c5a83da bumped to version 11.0.3-beta.37 2018-12-13 11:02:39 +06:00
Frappe Bot
c1ce84e9fc Merge branch 'staging' into develop 2018-12-11 09:53:52 +00:00
Frappe Bot
01b91003f3 bumped to version 11.0.3-beta.36 2018-12-11 09:53:52 +00:00
Frappe Bot
a60cb001f6 Merge branch 'staging' into develop 2018-12-10 13:05:59 +00:00
Frappe Bot
d6667da7ed bumped to version 11.0.3-beta.35 2018-12-10 13:05:59 +00:00