maxtorete
689f71d9e4
Revert "Fixed problem with margin top and bottom overwritten in print format ( #3451 )"
...
This reverts commit 398f56e4cb
2017-09-23 03:34:21 +02:00
maxtorete
398f56e4cb
Fixed problem with margin top and bottom overwritten in print format ( #3451 )
2017-09-23 03:23:59 +02:00
maxtorete
5f86884031
Fixed rounding problem in stripe integration ( #10645 )
2017-09-23 01:46:12 +02:00
Faris Ansari
0bcb4ee131
[minor] webhooks cleanups
2017-09-22 17:34:49 +05:30
Faris Ansari
1f151ee825
[fix] webhooks cache
2017-09-22 17:23:35 +05:30
Achilles Rasquinha
21b822424b
[FIX] build - for symlinks, --make-coppy - for copy (if symlinks doesn't exists, else no copy), --make-copy-force (force copy, cleans symlinks or dirs)
2017-09-22 15:34:32 +05:30
Achilles Rasquinha
867e9997d2
[MINOR] added --make-copy-force to force copy assets
2017-09-22 15:05:48 +05:30
Rushabh Mehta
d233f65db0
[fix] make domain document
2017-09-22 14:54:29 +05:30
Rushabh Mehta
45e1649340
[fix] add restrict_to_domain in Framework.sql
2017-09-22 14:50:02 +05:30
Rushabh Mehta
1dc8b66a8d
Merge pull request #4160 from mbauskar/quick-entry
...
[hotfix] refresh dependancy after values are set in doc
2017-09-22 14:49:15 +05:30
Rushabh Mehta
455179b872
Update field_group.js
2017-09-22 12:40:22 +05:30
Rushabh Mehta
ea42530112
[minor] automatically add restrict to domain if not added
2017-09-22 12:38:12 +05:30
Rushabh Mehta
9c033db6fc
Merge pull request #4157 from pratu16x7/staging
...
[navbar] layout fixes
2017-09-22 10:32:17 +05:30
Rushabh Mehta
2d9e441cd0
Merge pull request #4158 from pratu16x7/toolbar-fix
...
[fix] Make toolbar only after reaching desk
2017-09-22 10:31:41 +05:30
pratu16x7
70e1158c45
[fix] don't make toolbar while in setup
2017-09-22 03:07:44 +05:30
pratu16x7
532e2e2dcd
[navbar] layout fixes
2017-09-22 01:05:17 +05:30
mbauskar
69eb8934c0
[hotfix] refresh dependancy after values are set in doc
2017-09-21 17:55:10 +05:30
Rushabh Mehta
a52d393980
[fix] test
2017-09-21 17:22:11 +05:30
Rushabh Mehta
dcaf5f98af
[fix] remove prints
2017-09-21 16:47:53 +05:30
Omar Jaber
16c6d64eac
RTL direction reports chart problem
...
This will edit the style of charts in the system
2017-09-21 14:02:36 +03:00
Rushabh Mehta
d4fd3efef4
[fix] checkbox editor
2017-09-21 15:31:12 +05:30
Rushabh Mehta
82c9357b50
[fix] item selector
2017-09-21 14:55:13 +05:30
Rushabh Mehta
1e59f16588
Merge pull request #4153 from manassolanki/eval-try--catch
...
try catch expression in eval for depends_on
2017-09-21 14:53:10 +05:30
Rushabh Mehta
9a9b215de8
Merge pull request #4145 from mbauskar/email
...
[hotfix] set the email account for outgoing emails
2017-09-21 14:52:07 +05:30
Rushabh Mehta
8a2b91b79e
Merge pull request #4133 from mbauskar/grid
...
[minor] don't setup checkbox if the childtable is read_only
2017-09-21 14:51:45 +05:30
Rushabh Mehta
b321d30dea
Merge pull request #4122 from mbauskar/depends-on
...
[test-cases] minor fixes and checked all the depends on fields are valid of not
2017-09-21 14:50:49 +05:30
Rushabh Mehta
fdebb727ed
Merge pull request #4090 from revant/web_hooks
...
Web hooks or Reverse API
2017-09-21 14:49:17 +05:30
Rushabh Mehta
ab2e36fc8c
Merge pull request #4136 from shridarpatil/notiy_by_email
...
Notiy by email
2017-09-21 14:48:08 +05:30
Nabin Hait
9d24c8038a
Merge branch 'develop' into staging
2017-09-21 13:01:51 +05:30
Makarand Bauskar
47677c055c
[minor] refactor mark as read and mark as unread ( #4154 )
...
* [minor] refresh inbox view on mark as read or mark as unread
* [minor] refactor mark as read and mark as unread
* [minor] don't update modified datetime while settings _seen
2017-09-21 12:32:20 +05:30
Manas Solanki
486ea5bb05
fix codacy
2017-09-21 12:24:18 +05:30
Rushabh Mehta
6651726b06
Merge pull request #4151 from rmehta/file-upload-fallback
...
[minor] fallback to file upload
2017-09-20 21:54:25 +05:30
Revant Nandgaonkar
45f2ff43ad
[Fix] Codacy
...
https://www.codacy.com/app/frappe/frappe/pullRequest?prid=900990
2017-09-20 18:52:50 +05:30
Revant Nandgaonkar
2d148c804e
Webhook retry 3 times
2017-09-20 18:34:28 +05:30
Revant Nandgaonkar
520e815f1d
Merge branch 'develop' of frappe/frappe into web_hooks
2017-09-20 16:33:37 +05:30
Revant Nandgaonkar
1f9b1e40e3
Moved run_webhooks to webhook.py
2017-09-20 16:33:28 +05:30
Rushabh Mehta
8a37efcfd2
[fix] lint
2017-09-20 14:59:47 +05:30
Rushabh Mehta
85b88d6b09
[fix] lint
2017-09-20 14:58:54 +05:30
Rushabh Mehta
202732ed5f
[minor] added fallback to file upload
2017-09-20 14:51:55 +05:30
mbauskar
9b1f46d2c8
[minor] move the toggle_check funcation call to refresh
2017-09-20 12:02:22 +05:30
Rushabh Mehta
97393402da
[fix] dirty for text editor and use emoji for desktop icon
2017-09-20 11:54:23 +05:30
mbauskar
bcecf23772
[minor] moved code to set_incoming_outgoing_accounts method
2017-09-20 11:51:09 +05:30
Rushabh Mehta
80679f1b2f
Merge pull request #4135 from mbauskar/backup
...
[minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.*
2017-09-20 11:22:00 +05:30
Rushabh Mehta
16148abc9b
Update backups.py
2017-09-20 11:21:40 +05:30
Rushabh Mehta
98f92d5427
Merge pull request #4146 from mbauskar/html_utils
...
[minor] fixed uneven intendation, replaced spaces with tag
2017-09-20 11:20:08 +05:30
Rushabh Mehta
0bb59b83c2
Merge pull request #4138 from Zlash65/linking
...
[Fix] Minor fix - refresh contact links
2017-09-20 11:17:07 +05:30
Rushabh Mehta
fbabaec919
Merge pull request #4147 from mbauskar/unhandle-emails
...
[minor] save uid, raw email for unhandled emails and other minor fixes
2017-09-20 11:16:09 +05:30
Rushabh Mehta
3ace312ed5
Merge pull request #4149 from agritheory/patch-2
...
Update model.js
2017-09-20 11:15:38 +05:30
Tyler Matteson
86c44b871f
Update model.js
...
Add comment to clarify slug or slugify functionality
2017-09-19 13:31:29 -04:00
Revant Nandgaonkar
daf918bcde
Merge branch 'develop' of frappe/frappe into web_hooks
2017-09-19 16:40:32 +05:30
