Commit graph

16918 commits

Author SHA1 Message Date
Shreya Shah
db0889131d fix: Add fieldname property (#6349) 2018-10-30 10:50:20 +05:30
Jay Parikh
35d08c124e Fix for [staging-fixes] [Bug] ListView Filter shows hidden field #6329 (#6338) 2018-10-30 10:38:54 +05:30
Faris Ansari
ab1e57d243 feat: Share Listview URL (#6345) 2018-10-29 17:24:20 +05:30
Faris Ansari
16cda77710
Merge pull request #6333 from pm-at/staging-sprint
Added msgprint for 502 for xhr requests
2018-10-29 17:12:05 +05:30
Faris Ansari
34a5004076
Merge pull request #6336 from deepeshgarg007/date-fix
Date picker Fix
2018-10-29 15:29:56 +05:30
Faris Ansari
49856a4f21
Return early if datepicker not initialised 2018-10-29 14:42:40 +05:30
deepeshgarg007
579f315342 Merge branch 'staging-fixes' of https://github.com/frappe/frappe into date-fix 2018-10-29 12:58:54 +05:30
Prateeksha Singh
2a6e16bed2
Merge pull request #6305 from rohitwaghchaure/links_not_working_for_prepared_report
[Fix] Links are not working
2018-10-29 11:35:19 +05:30
pm-at
a39df831ba
Made the error message translatable
Thanks @mnatalia for highlighting this.
2018-10-27 17:32:41 +05:30
Ameya Shenoy
4bf32f4ff2
Merge branch 'staging-fixes' into staging 2018-10-25 11:17:01 +00:00
Ameya Shenoy
0ac9fbd4f2 bumped to version 11.0.3-beta.15 2018-10-25 11:17:01 +00:00
deepeshgarg007
6ab98044f1 Date picker Fix 2018-10-25 16:41:15 +05:30
Saurabh
d80fd366e7
Merge pull request #6183 from saurabh6790/subscription_support
provision to handle PayPal and Razoapay subscription charge notifications
2018-10-25 15:14:10 +05:30
Saurabh
0757c92713 [fix] razorpay subscription cancellation 2018-10-25 14:11:32 +05:30
Saurabh
7201f33eee Add more keys to site config to support subscription 2018-10-25 14:11:32 +05:30
Saurabh
4f4706ae12 [fix] do not cache payment success page 2018-10-25 14:11:32 +05:30
Saurabh
dbe1e41775 [fix] pass form dict to validate function 2018-10-25 14:11:32 +05:30
Saurabh
fbc101db2d [fix] change modified date 2018-10-25 14:11:32 +05:30
Saurabh
0d260be0aa [fix] pass request type as Subscription Notification 2018-10-25 14:11:32 +05:30
Saurabh
3ce7ba4e5d [fix] add validations on payment notification callback 2018-10-25 14:11:32 +05:30
Saurabh
32c5f7a011 provision to handel paypal and razoapay subscription charge notifications 2018-10-25 14:11:32 +05:30
Faris Ansari
3b0892017e
Merge pull request #6323 from netchampfaris/quill-assign-to-fix
Quill Assign To fix
2018-10-25 11:15:34 +05:30
pm-at
8edbd1a6d2 Handled 502 errors so that they are not silently suppressed AFTER the UI had loaded 2018-10-24 18:33:54 +05:30
Faris Ansari
9e9e1f1902 fix(Assign To): Make dialog a property of AssignTo 2018-10-24 17:08:45 +05:30
Faris Ansari
fd2725bb2c fix(Quill): Remove image drop module
Quill 2.0 already has it
2018-10-24 17:08:36 +05:30
Ameya Shenoy
d4ed8f1028
Merge branch 'staging-fixes' into staging 2018-10-23 12:54:56 +00:00
Ameya Shenoy
9545d0fc62 bumped to version 11.0.3-beta.14 2018-10-23 12:54:56 +00:00
Ameya Shenoy
0279e957c6
Merge branch 'master' into staging-fixes 2018-10-23 12:51:30 +00:00
Ameya Shenoy
40787b326a
Merge branch 'hotfix' 2018-10-23 12:42:19 +00:00
Ameya Shenoy
5662d29476 bumped to version 10.1.56 2018-10-23 12:42:19 +00:00
Ameya Shenoy
127d469ee1
Merge pull request #6306 from codingCoffee/setup_wiz
fix: setup wizard
2018-10-23 18:09:02 +05:30
Ameya Shenoy
95c8b30d7d
Merge pull request #6281 from kennethsequeira/hotfix
Update in-app Docs Generation
2018-10-23 18:05:18 +05:30
Ameya Shenoy
854b09137c
fix: setup wizard 2018-10-23 12:10:13 +00:00
Rohit Waghchaure
8f9fbb4cee [Fix] Links are not working 2018-10-23 17:31:49 +05:30
Ameya Shenoy
a8f2798b82
Merge branch 'staging-fixes' into staging 2018-10-23 08:03:18 +00:00
Ameya Shenoy
1949c680ba bumped to version 11.0.3-beta.13 2018-10-23 08:03:18 +00:00
rohitwaghchaure
7085424a9d
Merge pull request #6298 from rohitwaghchaure/make_verbose_false
Set verbose to false
2018-10-23 12:00:57 +05:30
Rohit Waghchaure
63b2c14ec8 Set verbose to false 2018-10-23 11:59:18 +05:30
Faris Ansari
a80fa7d939
Merge pull request #6295 from netchampfaris/quill-mention-local
fix(Quill): Use a local copy of quill-mention
2018-10-23 10:49:36 +05:30
Faris Ansari
fb075437da Ignore eslint rules in quill mention 2018-10-23 10:25:52 +05:30
Faris Ansari
d1c5c263b5 fix(Quill): Use a local copy of quill-mention
quill-mention's distribution copy is built with webpack
so it doesn't work with rollup
2018-10-22 16:12:17 +05:30
Ameya Shenoy
05317b3855
Merge branch 'master' into staging-fixes 2018-10-22 10:31:38 +00:00
Ameya Shenoy
94625ef3a0
Merge branch 'hotfix' 2018-10-22 10:31:33 +00:00
Ameya Shenoy
d8b1ae8d4f bumped to version 10.1.55 2018-10-22 10:31:33 +00:00
Rushabh Mehta
eba27d1a5c fix(test): test_scheduler fails randomly 2018-10-22 10:23:03 +05:30
Rushabh Mehta
54767b4806 fix(query_report): change timeout to 10 seconds for filters 2018-10-22 10:23:03 +05:30
Saif
25827755b5 PDF allow parsing header-spacing (#6286)
Simply allow parsing header-spacing from custom css.
2018-10-22 10:13:26 +05:30
Jay Parikh
0051915645 New keyboard shortcut combination. (#6290)
* New keyboard shortcut combination.

add shift+ the key, add alt+ the key, add alt+ctrl+ the key or single key e.g f1,f2,etc..

* Fixed Indentation Issues.

* Issue fix (no-self-assign)
2018-10-22 09:03:29 +05:30
Ameya Shenoy
9cd5e1af0f
Merge branch 'staging-fixes' into staging 2018-10-19 12:50:06 +00:00
Ameya Shenoy
86b328bae5 bumped to version 11.0.3-beta.12 2018-10-19 12:50:05 +00:00