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

15187 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Prateeksha Singh
f56000989e
[hotfix] remove legend from heatmap 2018-10-30 09:48:40 +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
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
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
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
8034e8395c
Merge branch 'hotfix' 2018-10-19 12:38:36 +00:00
Ameya Shenoy
d4a062fdbd bumped to version 10.1.54 2018-10-19 12:38:36 +00:00
Ameya Shenoy
bd23de9865
Merge pull request #6280 from codingCoffee/ver 
fix(update message): multiple fixes
 2018-10-19 18:07:34 +05:30
Kenneth Sequeira
026bd0d2bc fixed image link 2018-10-19 14:42:56 +05:30
Kenneth Sequeira
1e0880493c remove rogue tab space 2018-10-19 14:33:30 +05:30
Kenneth Sequeira
f31e7ac8a3 added source link for frappe docs 2018-10-19 14:30:34 +05:30
Shreya Shah
8e0410bdb0
Update help.py 2018-10-19 14:21:36 +05:30
Shreya Shah
0473ea9c6b
Update help.py 2018-10-19 14:09:49 +05:30
Shreya Shah
1f8c8568ed
Update help.py 2018-10-19 11:44:51 +05:30
Kenneth Sequeira
28b5589c72 Docs setup code same as v11 
Currently, in v10, the docs still point to ERPNext develop branch, before it being moved to erpnext.org app.

Co-authored-by: Shreya Shah <shreyashah115@gmail.com>
>
 2018-10-19 03:22:17 +05:30
Ameya Shenoy
be8f37dc5b fix(update message): multiple fixes 
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-18 13:56:32 +00:00
Ameya Shenoy
b848c9dfc7
Merge pull request #6279 from codingCoffee/urllib 
fix(travis): urllib3 version 1.23
 2018-10-18 18:30:03 +05:30
Ameya Shenoy
2bc7d159f0
fix(travis): python package version management 
- urllib3 to 1.23
- bleach to 2.1.4
 2018-10-18 12:45:59 +00:00
rohitwaghchaure
97ec70b83e [Fix] Setup wizard timeout error (#6270) 2018-10-18 12:29:46 +05:30
rohitwaghchaure
573750d6f4
Merge pull request #6271 from rohitwaghchaure/fix_report_is_not_loading 
[Fix] Report Addresses And Contacts not working
 2018-10-17 15:49:29 +05:30
Rohit Waghchaure
4db18698d5 [Fix] Report Addresses And Contacts not working 2018-10-17 15:46:25 +05:30
Ameya Shenoy
5668e7742e
Merge branch 'hotfix' 2018-10-17 09:02:44 +00:00
Ameya Shenoy
9a24ce1814 bumped to version 10.1.53 2018-10-17 09:02:44 +00:00
Faris Ansari
18bfb6df5a
fix(formatter): Item Link formatter when input is disabled (#6263) 2018-10-16 10:14:35 +05:30
Nabin Hait
5966faa468 Merge branch 'hotfix' 2018-10-15 15:39:34 +05:30
Nabin Hait
d215fcd537 bumped to version 10.1.52 2018-10-15 16:09:34 +06:00
Saurabh
b40a679695
Merge pull request #6247 from saurabh6790/get_reset_pwd_url 
get link to reset password only if setup wizard is not completed
 2018-10-11 14:45:07 +05:30
Saurabh
66a2d81df7 get link to reset password only if setup wizard is not completed 2018-10-11 14:43:37 +05:30
Ameya Shenoy
123a192a3a
Merge branch 'hotfix' 2018-10-11 06:47:36 +00:00
Ameya Shenoy
6371cba97e bumped to version 10.1.51 2018-10-11 06:47:36 +00:00
Suraj Shetty
968791195a [Hotfix] [Permission] Fix custom docperm check in get_valid_perm (#6200) 
* Fix custom docperm check in get_valid_perm

- Previously to get_valid perm we just used
to check all the custom docperms
available for the user's role and apply
standard perm for any missing doctype
But there might be some doctypes with
custom docperms which might not match
any of user's role.
Such doctype's perms should not be
replaced by standard docperm.
This PR fixes that.

* Avoids admin lock
 2018-10-08 17:04:26 +05:30
Ameya Shenoy
9d74acfe37
Merge branch 'hotfix' 2018-10-03 15:07:59 +00:00
Ameya Shenoy
ae65dd576f bumped to version 10.1.50 2018-10-03 15:07:59 +00:00