vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
16948 commits 1 branch 0 tags 587 MiB
Commit graph

16948 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
ca72c772f1
Merge branch 'staging-fixes' into staging 2018-10-31 10:46:24 +00:00
Ameya Shenoy
0fb1df0964 bumped to version 11.0.3-beta.18 2018-10-31 10:46:24 +00:00
Ameya Shenoy
55fbf7ad99
Merge branch 'master' into staging-fixes 2018-10-31 10:40:55 +00:00
Ameya Shenoy
a26dd436f5
Merge branch 'hotfix' 2018-10-31 10:36:54 +00:00
Ameya Shenoy
977b5a118e bumped to version 10.1.58 2018-10-31 10:36:54 +00:00
Ameya Shenoy
9807341146
Merge pull request #6370 from saurabh6790/sql_injection_fix_3110 
[fix] potential sql injection by sanitizing fields parameter
 2018-10-31 16:04:29 +05:30
Saurabh
a1e68b6fd5 [fix] potential sql injection by sanitizing fields parameter 2018-10-31 14:26:22 +05:30
Ameya Shenoy
334859a334
Merge branch 'staging-fixes' into staging 2018-10-31 07:29:05 +00:00
Ameya Shenoy
24bdcd05cc bumped to version 11.0.3-beta.17 2018-10-31 07:29:05 +00:00
rohitwaghchaure
000c61ab87
Merge pull request #6365 from rohitwaghchaure/conflicts_issues 
Fixed conflicts
 2018-10-31 12:23:51 +05:30
Rohit Waghchaure
44441d8ce7 Fixed conflicts 2018-10-31 12:09:31 +05:30
Ameya Shenoy
26099e8b0b
Merge pull request #6362 from shreyashah115/fix-delete 
Revert series count after doc deletion
 2018-10-31 11:30:04 +05:30
Faris Ansari
9d29139c25 fix: Dont refresh list if filters are being edited (#6354) 2018-10-31 11:16:14 +05:30
Faris Ansari
755bb6b63f fix(chat): Separate setup code from constructor (#6363) 
- to avoid class transpilation issue
 2018-10-31 11:15:09 +05:30
Ameya Shenoy
0e0c103a32
Merge branch 'staging-fixes' into staging 2018-10-30 12:50:41 +00:00
Ameya Shenoy
c99e8e26f8 bumped to version 11.0.3-beta.16 2018-10-30 12:50:41 +00:00
Ameya Shenoy
25a0b8dba2
Merge branch 'master' into staging-fixes 2018-10-30 12:09:41 +00:00
Ameya Shenoy
acd190cf9e
Merge branch 'hotfix' 2018-10-30 12:06:19 +00:00
Ameya Shenoy
00f5ce0034 bumped to version 10.1.57 2018-10-30 12:06:18 +00:00
Faris Ansari
6683814cfc
Merge pull request #6351 from frappe/jinja-patch 
fix(security): Make Jinja tighter
 2018-10-30 17:28:26 +05:30
Ameya Shenoy
dd0e7ba472
fix(help): mitigate security fix for docs 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-30 17:13:00 +05:30
Aditya Hase
3afb9ebcbc
fix(security): Make Jinja tighter 2018-10-30 13:13:42 +05:30
Shreya
aca6dd0686 test: Add test case 2018-10-30 12:13:28 +05:30
Charles-Henri Decultot
377bed7007 [Fix] Auto repeat corrections (#6262) 
* Auto repeat corrections

* Correct tests

* Additional test for linked communication

* Cleanup dev

* Remove whitespace
 2018-10-30 11:18:08 +05:30
Navdeep Ghai
c00bf28f15 Patch to modify Int datatype to bigint in tabSeries table (#6284) 
* added patch for converting int to bigint in  table

* patch to modify the  int type  to bigint type in  table

* Update modify_naming_series_table.py

* Update modify_naming_series_table.py
 2018-10-30 11:15:00 +05:30
Jay Parikh
d3c67e8bb5 Fix for [hotfix] [Bug] ListView Filter shows hidden field #6329 (#6331) 
* 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)

* Fix for ListView Filter shows hidden field #6329
 2018-10-30 10:59:14 +05:30
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
Prateeksha Singh
f56000989e
[hotfix] remove legend from heatmap 2018-10-30 09:48:40 +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
c9642532a9
Merge pull request #6348 from deepeshgarg007/date-fix 
[Bug-Fix] Clear datepicker if value or datepicker is not available
 2018-10-29 17:07:19 +05:30
deepeshgarg007
698d17db84 Clear datepicker if value or datepicker is not available 2018-10-29 16:42: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
Shreya
a4f0316119 fix(series): Revert series count after doc deletion 2018-10-25 14:43:31 +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