Commit graph

18428 commits

Author SHA1 Message Date
Prateeksha Singh
352eaf0aa2 fix(patch): naming 2019-03-04 12:39:46 +05:30
Prateeksha Singh
d2bde40992 fix(desk): links customization by fetching properties 2019-03-04 12:39:46 +05:30
Prateeksha Singh
75d98df16c feat(desk): Desk Section settings patch 2019-03-04 12:39:46 +05:30
Prateeksha Singh
39ad843b3b feat(desk): DeskModuleBox, get some links if not set 2019-03-04 12:39:45 +05:30
Shivam Mishra
a7b9b4f9d2
Merge pull request #6872 from netchampfaris/website-bootstrap-4
feat: Migrate Website to Bootstrap 4
2019-03-04 11:57:16 +05:30
Rushabh Mehta
62fca0ef2e fix(query): blog_post.py 2019-03-04 09:14:53 +05:30
Faris Ansari
cfbab37bb3 fix: Website Image css 2019-03-03 00:27:53 +05:30
Faris Ansari
f9ae520748 fix: Update slideshow for BS4 2019-03-03 00:27:26 +05:30
Faris Ansari
5d1ecb2e47 fix: Global Search fixes
- Update title, route and published in sync_value
- Update search_template for BS4
2019-03-03 00:27:13 +05:30
Faris Ansari
3e4b6cfb58 fix: Show slideshow indicator if more than 1 image 2019-03-02 20:36:19 +05:30
Rushabh Mehta
478f2edefa
Merge pull request #7012 from frappe/revert-7009-desk-customize
Revert "feat(desk): Link Tags, Customize Sections"
2019-03-02 19:49:48 +05:30
Rushabh Mehta
01c65ef608
Revert "feat(desk): Link Tags, Customize Sections" 2019-03-02 19:48:36 +05:30
Rushabh Mehta
de8eb533d3
Merge pull request #7009 from pratu16x7/desk-customize
feat(desk): Link Tags, Customize Sections
2019-03-02 19:44:36 +05:30
Faris Ansari
3d02648259 tests: Wait for list to update 2019-03-02 19:30:56 +05:30
Faris Ansari
0f2b3657c8 test: Uncomment table_multiselect test 2019-03-02 15:47:00 +05:30
Faris Ansari
12d6ef89d3 fix(snyk): Upgrade bootstrap and generate .snyk file 2019-03-02 15:40:28 +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
Faris Ansari
07ac04e123 fix: Comment test 2019-03-02 14:24:14 +05:30
Faris Ansari
41fafd8b5e fix: Linting 2019-03-02 14:07:12 +05:30
Frappe Bot
497a14046e Merge branch 'master' into develop 2019-03-01 09:10:17 +00:00
Frappe Bot
c7d567c54d Merge branch 'hotfix' 2019-03-01 09:10:17 +00:00
Frappe Bot
e0e8b54fc2 bumped to version 11.1.13 2019-03-01 09:10:17 +00:00
Prateeksha Singh
ab0c87b6b1 feat(desk): Customize Sections 2019-03-01 10:09:44 +05:30
Prateeksha Singh
ae7f89ff24 feat(desk): DeskSections 2019-03-01 10:09:10 +05:30
Rushabh Mehta
b5b863c95c fix: query for postgres 2019-03-01 09:40:03 +05:30
Rushabh Mehta
d7a15e7cd6
Merge pull request #6996 from rmehta/auto-assign
feat: Assignment Rule
2019-03-01 09:20:16 +05:30
Rushabh Mehta
b288522f3f
Merge pull request #7006 from rohitwaghchaure/indexing_for_workflow_action
(fix, workflow action): added indexing for user and status columns
2019-03-01 09:08:53 +05:30
Rushabh Mehta
f0ff4fb6bf
Merge pull request #7007 from rohitwaghchaure/errprint_not_working
fix: errprint not working
2019-03-01 09:08:31 +05:30
Rushabh Mehta
d87496d8d5 fix: clear assignment while reassigning 2019-03-01 09:07:15 +05:30
Rohit Waghchaure
ae67ced14d fix: errprint not working 2019-02-28 20:23:06 +05:30
Rohit Waghchaure
7aad78be75 (fix, workflow action): added indexing for user and status columns 2019-02-28 18:55:57 +05:30
Rushabh Mehta
56592c9292 fix: child table rename 2019-02-28 18:06:59 +05:30
Rushabh Mehta
5fbbdbe499 fix: remove old auto_assign.py files 2019-02-28 17:38:40 +05:30
Rushabh Mehta
fc5b1d2c3e rename: auto assign -> assignment rule 2019-02-28 17:37:20 +05:30
Rushabh Mehta
02726ba3ed feat: multiple auto assigns 2019-02-28 17:11:44 +05:30
Frappe Bot
54e97b9ebc Merge branch 'master' into develop 2019-02-28 10:05:32 +00:00
Frappe Bot
e64757f98e Merge branch 'hotfix' 2019-02-28 10:05:31 +00:00
Frappe Bot
c72c83c400 bumped to version 11.1.12 2019-02-28 10:05:31 +00:00
Rushabh Mehta
d56cc58d52 feat+fix: allow multiple auto assigns, cleaner server error messages 2019-02-28 15:20:00 +05:30
Rushabh Mehta
7c8ffe730c
Merge pull request #6986 from adityahase/fix-recorder
fix(recorder): List view enhancements
2019-02-28 13:02:57 +05:30
Rushabh Mehta
c0631e4e98
Merge pull request #6924 from ElasticRun/db_query_bug_fix
[bug fix]: prepare filter condition function
2019-02-28 13:02:15 +05:30
Rushabh Mehta
abfb44a047
Merge pull request #6993 from zerodhatech/fixtures
export fixtures of a specific app
2019-02-28 13:01:21 +05:30
Rushabh Mehta
a0de1e9614
Merge pull request #6988 from rmehta/communication-in-list
fix: Comment in list view
2019-02-28 12:57:03 +05:30
Rushabh Mehta
b480c6af44
Merge pull request #6995 from Anurag810/unlink_contact
fix: Unlink user with contact during user deletion.
2019-02-28 12:51:31 +05:30
Rushabh Mehta
2d7b4c7782 fix: liniting and comment multiselect tests 2019-02-28 12:50:17 +05:30
Rushabh Mehta
7eed444db1 fix: query 2019-02-28 12:50:17 +05:30
Rushabh Mehta
bd7bc8e5b3 fix(test): postgres friendly queries 2019-02-28 12:50:17 +05:30
Rushabh Mehta
8bff9e1e21 fix(typo): cache_manager.py 2019-02-28 12:50:17 +05:30
Rushabh Mehta
0511b4b78c fix: add Automation to modules.txt 2019-02-28 12:50:17 +05:30
Rushabh Mehta
44aee72ced fix: auto assign 2019-02-28 12:50:17 +05:30