Zlash65
369fb8fbc6
multiselect - behave like link field
2018-05-03 17:00:37 +05:30
Prateeksha Singh
8cdfd6fc88
Merge pull request #5515 from rohitwaghchaure/url_encode_issue
...
Double encode url issue
2018-05-03 12:14:24 +05:30
Prateeksha Singh
278a6fed78
Merge pull request #5506 from manassolanki/bs4
...
remove bs3 js from the frappe-web.min.js and include that in base.html
2018-05-03 11:16:10 +05:30
Saurabh
da1e6ee789
[fix] merge conflicts
2018-05-02 21:38:06 +05:30
Saurabh
880d2e5101
Merge branch 'hotfix'
2018-05-02 21:36:12 +05:30
Saurabh
bded2cd3e9
bumped to version 10.1.28
2018-05-02 22:06:12 +06:00
Saurabh
869976b1bc
Merge pull request #5517 from codingCoffee/travis
...
dark magic to revive travis
2018-05-02 21:35:30 +05:30
Saurabh
7ed0621e1e
Merge pull request #5518 from netchampfaris/handle-row-dict-list
...
Handle row which can be dict or list
2018-05-02 21:34:28 +05:30
Faris Ansari
c8538445ab
Handle row which can be dict or list
...
- (why no normalization?)
2018-05-02 21:29:41 +05:30
Ameya Shenoy
ab0198b513
dark magic to revive travis
...
It seems that some process inside travis is using port no 9000. Hence
adding this line in the travis.yml to change common_site_config.json and
use port no 9001 for socket_io
2018-05-02 17:30:35 +05:30
Saurabh
dee3a6ed1d
Merge branch 'master' into develop
2018-05-02 16:18:48 +05:30
Saurabh
cef7f1c3b9
Merge branch 'hotfix'
2018-05-02 16:18:47 +05:30
Saurabh
36cfa144e6
bumped to version 10.1.27
2018-05-02 16:48:47 +06:00
Saurabh
5e489228f3
Merge pull request #5516 from surajshetty3416/hotfix
...
[urgent] Fix query_report has_match
2018-05-02 16:15:24 +05:30
Suraj Shetty
7cba1f41a5
[urgent] Fix query_report has_match
2018-05-02 16:06:59 +05:30
Prateeksha Singh
54a96761c1
Merge pull request #5495 from surajshetty3416/build-match-condition-fix
...
[Minor] Fix bug with build_match_condition
2018-05-02 16:06:47 +05:30
Rohit Waghchaure
5df1e427db
Double encode url issue
2018-05-02 16:00:38 +05:30
Bassam Ramadan
adf4f3fc8c
doc-img-fix ( #5088 )
2018-05-02 15:13:09 +05:30
Saurabh
f3a25b3f91
Merge branch 'master' into develop
2018-05-02 14:51:46 +05:30
Saurabh
c4d598cd99
Merge branch 'hotfix'
2018-05-02 14:51:45 +05:30
Saurabh
74c645b6d2
bumped to version 10.1.26
2018-05-02 15:21:45 +06:00
Saurabh
10dec5db25
Merge pull request #5513 from frappe/revert-5486-hotfix
...
Revert "Hotfix to allow for modal to be scrolled"
2018-05-02 13:22:17 +05:30
Saurabh
1d0fdf7dcc
Revert "Hotfix to allow for modal to be scrolled ( #5486 )"
...
This reverts commit 526ebb71a3
2018-05-02 13:18:50 +05:30
spa49
526ebb71a3
Hotfix to allow for modal to be scrolled ( #5486 )
...
* Update desk.css
* Update desk.less
2018-05-02 11:08:20 +05:30
Faris Ansari
1ccf9d85b8
get_emails_from_role should only pickup enabled users ( #5504 )
2018-05-02 11:02:07 +05:30
Prateeksha Singh
cccfa6657a
Merge pull request #5507 from shreyashah115/color-map
...
Map color field for calendar view
2018-05-01 18:51:01 +05:30
Prateeksha Singh
be8f73f551
Merge pull request #5510 from pratu16x7/hotfix
...
[control] code value field
2018-05-01 10:23:26 +05:30
Prateeksha Singh
7cc6f9482c
[control] code value field
2018-05-01 08:21:13 +05:30
Nabin Hait
cfff0c46b2
Merge branch 'tundebabzy-new-autorepeat' into develop
2018-04-30 19:34:11 +05:30
Nabin Hait
0658f035c2
Minor fixes
2018-04-30 19:34:00 +05:30
Nabin Hait
ee022bcd30
Merge branch 'new-autorepeat' of https://github.com/tundebabzy/frappe into tundebabzy-new-autorepeat
2018-04-30 16:26:04 +05:30
Shreya
bef9338605
set color if color field in any doctype
2018-04-30 13:55:33 +05:30
Ameya Shenoy
b6ec76c2db
i still don't know why we're still using travis ( #5500 )
2018-04-30 11:30:27 +05:30
Zarrar
8da9a7e86f
hide user-progress and help for mobile view ( #5492 )
2018-04-30 11:29:33 +05:30
Zarrar
efa359e201
restore original permissions for standard and custom doctypes ( #5498 )
2018-04-30 11:29:05 +05:30
Faris Ansari
8923cb6aa9
Validate fieldnames that contain space ( #5499 )
2018-04-30 11:27:44 +05:30
Ameya Shenoy
c6e4699e5b
removed bad code and made compatible with pip 10 ( #5458 )
2018-04-30 11:22:09 +05:30
Manas Solanki
099bbaa91c
remove bs3 js from the frappe-web.min.js and include that in base.html
2018-04-30 10:27:55 +05:30
Shreya
1662d0170b
map color field
2018-04-29 12:09:22 +05:30
Suraj Shetty
6521bb00d3
[Minor] Fix bug with build_match_condition
...
- change in commit fb25fdb6
2018-04-27 12:37:21 +05:30
Rushabh Mehta
e5d2c82760
[minor] ignore_validate option while creating custom fields
2018-04-26 10:09:40 +05:30
Nabin Hait
45edd310e1
Don't allow submitting/cancelling already submitted/cancelled docs ( #5484 )
2018-04-25 17:35:49 +05:30
Zarrar
7a96ed3781
[Minor] Refresh list header on refreshing list_view or performing operations ( #5489 )
...
* refresh list header on refresh
* remove redundant flag
2018-04-25 17:35:08 +05:30
Prateeksha Singh
4eab463969
Merge pull request #5490 from pratu16x7/hotfix
...
[hotfix] query report dict key fetch
2018-04-25 13:19:54 +05:30
Prateeksha Singh
6dfc888f82
[fix] query report dict key fetch
2018-04-25 13:18:05 +05:30
Saurabh
ab6c3b5dad
Merge branch 'hotfix'
2018-04-25 11:35:48 +05:30
Saurabh
1e00ef289e
Merge branch 'master' into develop
2018-04-25 11:35:48 +05:30
Saurabh
8b2ab352d1
bumped to version 10.1.25
2018-04-25 12:05:48 +06:00
ashish-greycube
07c45a99a0
Update trigger-event-on-deletion-of-grid-row.md ( #5488 )
...
Trigger name is incorrect, it should be "before_items_remove"
2018-04-24 20:55:31 -08:00
Nabin Hait
673b75fbe3
Minor fix in reloading email template
2018-04-24 17:50:10 +05:30
