Commit graph

18458 commits

Author SHA1 Message Date
Rushabh Mehta
313fb361dc fix(style): max height for timeline items, incase of long threads 2019-03-07 13:21:29 +05:30
Prateeksha Singh
5a67c57171
Merge pull request #7031 from pratu16x7/desk-use-container
fix(desk): use pre-existing container for desk
2019-03-07 08:45:41 +05:30
Prateeksha Singh
85d1b768b9 fix(desk): use pre-existing container for desk 2019-03-07 08:31:17 +05:30
Shivam Mishra
2a40eeb89a
Merge pull request #7023 from scmmishra/web-fixes
Web fixes
2019-03-06 19:03:38 +05:30
scmmishra
ad2c192f76 Merge branch 'develop' of https://github.com/frappe/frappe into web-fixes 2019-03-06 17:27:49 +05:30
Shivam Mishra
be3716cec5
Merge pull request #7024 from pratu16x7/remove-desk-test
chore(test): remove desk test
2019-03-06 16:46:04 +05:30
Prateeksha Singh
a6d5a27de0 chore(test): remove desk test 2019-03-06 15:39:20 +05:30
scmmishra
80ab621073 fix: Minor filter bug
Co-authored-by: Deepesh <deepeshgarg6@gmail.com>
2019-03-06 15:00:11 +05:30
scmmishra
a6a4d3c112 style: Fix Codacy 2019-03-06 14:59:23 +05:30
scmmishra
0f737d7834 fix: Minor css fix 2019-03-06 14:46:33 +05:30
scmmishra
f69adb4314 style: Fixed button placement in web form page 2019-03-06 14:45:41 +05:30
scmmishra
d97352c7ad fix (webform): Fixed filters in web_from frid view 2019-03-06 14:45:41 +05:30
scmmishra
fa4f88db07 fix (web form): Fixed link to doc form in form grid 2019-03-06 14:45:41 +05:30
scmmishra
53b97e0fd5 fix (web-form): In form grid 2019-03-06 14:45:41 +05:30
scmmishra
8ea272601f fix: Added from_grid.less to web_form 2019-03-06 14:45:41 +05:30
scmmishra
d484ee2d12 fix: button alignment on web-form 2019-03-06 14:45:41 +05:30
scmmishra
f4efb7df0a [fix] Awesomeplete breaking on web forms
- Added variables.less to awesomeplete
- Added awesompelete to web_form.css in build.json
2019-03-06 14:45:41 +05:30
Prateeksha Singh
16598191c2
Merge pull request #7019 from deepeshgarg007/installer
fix: Removed desktop icon syncing from installer.py
2019-03-05 17:22:51 +05:30
deepeshgarg007
d50a3d8351 fix: Removed desktop icon syncing from installer.py 2019-03-05 17:13:18 +05:30
Rushabh Mehta
18f1e4a5ca fix(node-sass): upgrade node-sass 2019-03-04 21:54:51 +05:30
Rushabh Mehta
626092e898 fix(test): test_assign.py 2019-03-04 21:13:14 +05:30
Rushabh Mehta
f50efad863 fix(assignment): apply unassign only if assigned 2019-03-04 20:53:16 +05:30
Rushabh Mehta
7031a9175c fix: auto assign round robin if last user is no longer present 2019-03-04 17:29:15 +05:30
Saurabh
5df9860c1e
Merge pull request #7016 from saurabh6790/fixes
fix: check if app and category exists in module
2019-03-04 17:05:36 +05:30
Saurabh
d334933601 fix: check if app and category exists in module 2019-03-04 16:55:58 +05:30
Faris Ansari
d84ed2e115
fix: Update vue and regenerate yarn.lock file (#7015) 2019-03-04 16:36:49 +05:30
Rushabh Mehta
f7cf745fb5 fix: assginment rule only reassign if not assigned 2019-03-04 16:15:50 +05:30
Prateeksha Singh
6455fa5d5e
Merge pull request #7013 from pratu16x7/desk-customize
fix(desk): customisation settings
2019-03-04 12:53:54 +05:30
Prateeksha Singh
01f3e38c8e fix(desk_settings): check json none case 2019-03-04 12:39:46 +05:30
Prateeksha Singh
10030e5fcb fix(desk): shortcut routes 2019-03-04 12:39:46 +05:30
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