Commit graph

11295 commits

Author SHA1 Message Date
Nabin Hait
c44791660a Merge branch 'hotfix' 2016-11-03 15:13:47 +05:30
Nabin Hait
d44e6c759b bumped to version 7.1.5 2016-11-03 15:43:47 +06:00
Nabin Hait
6ebf24eea9 Merge pull request #2250 from rmehta/email-alert-fix-for-hotfix
[fix] email alert message changed to Code and ignore xss filtering
2016-11-03 14:20:54 +05:30
Rushabh Mehta
18d8d7637d [fix] email alert message changed to Code and ignore xss filtering 2016-11-03 14:12:17 +05:30
John Vincent Fiel
51fa272e4f Problem Summary (#2232)
What we are trying to solve is we want to send a link that will redirect to a doctype for ex. http://localhost:8000/login?redirect-to=/Purchase%20Invoice/PINV-00006 this link should redirect the user to the doctype purchase invoice, but will ask for password first. What we failed to do is it should not ask the user to log in if the user is already logged in. But changing the link to http://localhost:8000/desk?redirect-to=/Purchase%20Invoice/PINV-00006 it will directly go to the invoice, but the problem is if the user is not logged in it will go to 403 page, but if the user will log in it will redirect the user to desk not to the invoice.

Steps to Reproduce the Problem
1. get a 'direct link' ex. http://localhost:8000/desk?redirect-to=/Purchase%20Invoice/PINV-00006
2. go to link 'direct link'
3. it will ask you to login
4. login successfully but it will just go to desk not to the invoice
5. get a direct link ex. http://localhost:8000/login?redirect-to=/Purchase%20Invoice/PINV-00006
6. go to the link
7. it will go to the invoice or any doctype
2016-11-03 13:16:20 +05:30
Faris Ansari
b724c36c82 [ui] yet another z-index fix (#2248) 2016-11-03 13:15:27 +05:30
robert schouten
ea7982d1f8 [fix] linked_with now using list view rendering (#2233) 2016-11-03 13:12:54 +05:30
RicardoJohann
17932d7caf [fix] quoted links now dont contain links (#2246) 2016-11-03 13:11:42 +05:30
robert schouten
2a3f929e35 [fix] dont scroll to top every refresh (#2235) 2016-11-03 13:10:21 +05:30
Faris Ansari
3ed6bef17e [setupwizard] mouseless operation (#2244) 2016-11-03 13:10:10 +05:30
RicardoJohann
41de314a90 [fix] adjusted report datetime fields to use sysdefault date format (#2245) 2016-11-03 13:09:43 +05:30
robert schouten
9f929e76f2 tag autocomplete now on click (#2216) 2016-11-03 12:36:49 +05:30
Nabin Hait
4bd44115bd Merge pull request #2247 from rmehta/email-alert-fix
[fix] email alert message changed to Code and ignore xss filtering
2016-11-03 11:55:29 +05:30
rohitwaghchaure
06b2b44b45 Remember last selected value (#2203) 2016-11-03 11:12:48 +05:30
robert schouten
92ac40df6f Update site_config.md (#2198) 2016-11-03 11:10:55 +05:30
Rushabh Mehta
29bc1b621f [fix] email alert message changed to Code and ignore xss filtering 2016-11-03 11:00:25 +05:30
Nabin Hait
706d6fd698 Merge pull request #2243 from webonyx/fix-base-indicator
Fix doc indicator based on standard fields
2016-11-01 15:22:25 +05:30
Viet Pham
1a52e63d2f Fix doc indicator based on standard fields 2016-11-01 16:35:34 +07:00
Nabin Hait
c0edd95eb9 Merge branch 'hotfix' 2016-11-01 12:38:50 +05:30
Nabin Hait
2772fbd12d Merge branch 'master' into develop 2016-11-01 12:38:50 +05:30
Nabin Hait
4f4dd9c51c bumped to version 7.1.4 2016-11-01 13:08:50 +06:00
Nabin Hait
f68b9ed738 Merge pull request #2239 from webonyx/fix-2221
Fix 'engine' attribute error
2016-11-01 10:59:15 +05:30
Saurabh
050e456335 Merge pull request #2240 from saurabh6790/hotfix
[path][fix] paypal integration
2016-10-31 20:22:17 +05:30
Saurabh
427a97774e [path][fix] paypal integration 2016-10-31 20:20:43 +05:30
Viet Pham
2016841924 Fix 'engine' attribute error 2016-10-31 20:36:32 +07:00
Nabin Hait
d329ee3156 Merge branch 'hotfix' 2016-10-31 15:05:37 +05:30
Nabin Hait
9ecfebd38c Merge branch 'master' into develop 2016-10-31 15:05:37 +05:30
Nabin Hait
e68c2658e7 bumped to version 7.1.3 2016-10-31 15:35:36 +06:00
Nabin Hait
e5b47eab16 Merge pull request #2231 from netchampfaris/ui-fixes
[ui] z-index fix and filter-dashboard css cleanup
2016-10-31 15:02:35 +05:30
Nabin Hait
6c798d8530 Merge pull request #2237 from netchampfaris/hotfix
z-index fix
2016-10-31 15:00:56 +05:30
Faris Ansari
bebf211ed8 [ui] z-index fix 2016-10-31 13:10:01 +05:30
Nabin Hait
f4ef826bbb Merge pull request #2234 from saurabh6790/hotfix
[minor][fix] path fixes for manual dropbox backup
2016-10-31 13:09:07 +05:30
Saurabh
371d9d1f75 [minor][fix] path fixes for manual dropbox backup 2016-10-31 11:41:55 +05:30
Faris Ansari
8a5f214963 [ui] cleanup filter dashboard css 2016-10-29 22:05:43 +05:30
Faris Ansari
67a376cd70 [ui] fix z-index problem 2016-10-29 20:48:25 +05:30
Nabin Hait
4f7a737024 Merge pull request #2230 from shreyasp/bulk_update_validation
[Minor] Added validation to bulk update in case user does not specify value field
2016-10-29 14:36:47 +05:30
Faris Ansari
49b677a77c [ui] z-index fix, added compiled css 2016-10-28 18:21:37 +05:30
Faris Ansari
2cbab3e6da [ui] fix datepicker z-index 2016-10-28 18:14:34 +05:30
shreyas
7fc4c4a82a [Minor] Added validation to bulk update in case user does not specify value field 2016-10-28 17:37:27 +05:30
Nabin Hait
7c4f40b631 fixed conflict 2016-10-27 19:13:44 +05:30
Nabin Hait
9f93076394 Merge branch 'hotfix' 2016-10-27 19:07:25 +05:30
Nabin Hait
c7ebe79330 bumped to version 7.1.2 2016-10-27 19:37:25 +06:00
Nabin Hait
8cd4702dc4 Merge pull request #2223 from saurabh6790/hotfix
[fix] add get_query via individual _tree
2016-10-27 15:36:42 +05:30
Saurabh
a940923e75 [fix] add get_query via individual _tree 2016-10-27 15:21:47 +05:30
Nabin Hait
6956f8d1f2 Merge pull request #2220 from netchampfaris/hotfix
[ui] datepicker z-index fix
2016-10-27 12:51:38 +05:30
Faris Ansari
2002d097c8 [fix] datepicker z-index 2016-10-27 12:49:00 +05:30
Nabin Hait
37614ed43b Merge branch 'master' into develop 2016-10-27 12:38:27 +05:30
Nabin Hait
563e061876 Merge branch 'hotfix' 2016-10-27 12:38:27 +05:30
Nabin Hait
a2f2340f25 bumped to version 7.1.1 2016-10-27 13:08:27 +06:00
Nabin Hait
f93e93d7f1 Merge pull request #2219 from nabinhait/hotfix
minor fix in patch
2016-10-27 12:37:21 +05:30