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

16807 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
4eac464387
Merge branch 'staging-fixes' into staging 2018-10-11 10:10:33 +00:00
Ameya Shenoy
eab3900466 bumped to version 11.0.3-beta.9 2018-10-11 10:10:33 +00:00
Zarrar
57933ff3f9 Timeline date fix (#6222) 2018-10-11 15:38:43 +05:30
Ameya Shenoy
c717dcac72 fix: python3 unicode not defined (#6233) 
python 2 had unicode and basestring, however python 3 only has string

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-11 15:36:29 +05:30
Nabin Hait
56be85c934 User permissions patch fixes for skip-for-doctypes (#6229) 
* fix(patch): Fixed skip_for_doctypes in User Permissions

* fix(address): Made address_title non-mandatory, because it is set based on links
 2018-10-11 15:29:03 +05:30
Suraj Shetty
9dea3f1684 Revert permission changes (#6249) 2018-10-11 15:26:47 +05:30
Ameya Shenoy
1dbdb50c55 fix(dropbox): upgraded dropbox to 9.1.0 (#6234) 
- also makes it compatible with python 3

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-11 15:21:43 +05:30
Saurabh
279a5d63e9
Merge pull request #6246 from saurabh6790/get_reset_password_url 
get link to reset password only if setup wizard is not completed
 2018-10-11 14:41:09 +05:30
Saurabh
cdc2e17cbf get link to reset password only if setup wizard is not completed 2018-10-11 14:39:52 +05:30
Suraj Shetty
e85589f46c HTML Editor control (#6237) 
* Add HTML editor

* Add HTML editor map to db_schema.py

* Revert permission change
- ref #6218

* Fix typo

* Add HTML Editor entry to customize form field

* Update customize_form_field.json

* Update permissions.py

* Debounce preview generation

* Translate strings
 2018-10-11 14:07:16 +05:30
Ameya Shenoy
f4230e7c0d
Merge branch 'staging-fixes' into staging 2018-10-11 08:04:38 +00:00
Ameya Shenoy
47d2b43351 bumped to version 11.0.3-beta.8 2018-10-11 08:04:38 +00:00
Faris Ansari
6b19f0437a
Merge pull request #6245 from netchampfaris/datatable-hyperlist 
fix: Update datatable to use Hyperlist
 2018-10-11 13:27:52 +05:30
Faris Ansari
9b52061bdd fix: Show filter row always 2018-10-11 13:27:11 +05:30
Faris Ansari
3551e894c6 fix: Update datatable 
- New DataTable uses hyperlist instead of clusterize to render
large number of rows
 2018-10-11 13:22:19 +05:30
Ameya Shenoy
472d6a50de
Merge branch 'staging-fixes' into staging 2018-10-11 06:55:08 +00:00
Ameya Shenoy
55af089c3b bumped to version 11.0.3-beta.7 2018-10-11 06:55:08 +00:00
Ameya Shenoy
d3b83bd8c6
Merge branch 'master' into staging-fixes 2018-10-11 06:51:33 +00:00
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
rohitwaghchaure
b6ffb5eaa0
Merge pull request #6244 from rohitwaghchaure/get_list_to_get_all 
Fixed permissions
 2018-10-11 12:13:31 +05:30
Rohit Waghchaure
c0cf13149a Fixed permissions 2018-10-11 12:12:47 +05:30
Prateeksha Singh
321e7da182
Merge pull request #6243 from rohitwaghchaure/prepared_report_issue_v11 
[Fix] General ledger prepared report
 2018-10-11 11:42:07 +05:30
Rohit Waghchaure
18da179639 [Fix] General ledger prepared report 2018-10-11 11:38:56 +05:30
Saurabh
a50b21602f
Merge pull request #6242 from saurabh6790/security-fix 
[fix] removing injected security breach
 2018-10-11 11:26:03 +05:30
Saurabh
2a7dd16031 [fix] removing injected security breach 2018-10-11 11:24:44 +05:30
rohitwaghchaure
5732102f93
Merge pull request #6241 from pratu16x7/propared-report-csv-data-format 
[fix] prepared report: check data format for csv
 2018-10-11 10:58:54 +05:30
Prateeksha Singh
f8501b3b93 [fix] prepared report: check data format for csv 2018-10-11 10:56:46 +05:30
rohitwaghchaure
301fcdefdc [Fix] User permissions (#6218) 
* [Fix] User permissions

* Update permissions.py
 2018-10-08 18:33:41 +05:30
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
c4f1cdd502
Merge branch 'staging-fixes' into staging 2018-10-08 09:41:29 +00:00
Ameya Shenoy
1a601e8445 bumped to version 11.0.3-beta.6 2018-10-08 09:41:29 +00:00
Ameya Shenoy
28844e3c63
Merge pull request #6214 from rohitwaghchaure/fixed_user_permissions_issue 
[Fix] User permissions
 2018-10-08 14:40:08 +05:30
Faris Ansari
5b2dc66338
Merge pull request #6215 from netchampfaris/quill-clear-editor-fix 
fix(Text Editor): Clear editor when value is falsy
 2018-10-08 13:08:33 +05:30
Faris Ansari
ee0b116954 fix(Text Editor): Clear editor when value is falsy 2018-10-08 13:06:19 +05:30
Rohit Waghchaure
57eba77bdd [Fix] User permissions 2018-10-08 13:03:33 +05:30
Ameya Shenoy
34064a322f
Merge branch 'staging-fixes' into staging 2018-10-07 07:57:43 +00:00
Ameya Shenoy
1f8008f9de bumped to version 11.0.3-beta.5 2018-10-07 07:57:43 +00:00
Ameya Shenoy
748681ff2c
Merge pull request #6212 from codingCoffee/abc 
fix(user perm patch): frappe db escape on value
 2018-10-07 13:20:46 +05:30
Ameya Shenoy
42126167a3 fix(user perm patch): frappe db escape on value 2018-10-07 13:07:00 +05:30
Ameya Shenoy
497a7b87a8
Merge branch 'staging-fixes' into staging 2018-10-07 06:20:36 +00:00
Ameya Shenoy
910d88e4c4 bumped to version 11.0.3-beta.4 2018-10-07 06:20:36 +00:00
Zarrar
84ad61e701 delete records sequentially to preserve series (#6208) 2018-10-06 17:41:56 +05:30
Faris Ansari
88387b9456
Merge pull request #6207 from netchampfaris/query-report-ajax-abort 
fix(Query Report): Abort last ajax request in refresh
 2018-10-06 14:26:34 +05:30
Faris Ansari
72c44adafc fix(Query Report): Abort last ajax request in refresh 
- If there are two ajax requests and the 1st one takes longer than the
2nd, it's data overrides the report later
 2018-10-06 14:04:33 +05:30
Ameya Shenoy
a10bc8194e
Merge branch 'staging-fixes' into staging 2018-10-05 08:56:56 +00:00
Ameya Shenoy
99dbbdabc8 bumped to version 11.0.3-beta.3 2018-10-05 08:56:56 +00:00
Faris Ansari
396f9508b4
Merge pull request #6205 from netchampfaris/yarn-integrity 
fix(yarn): Add integrity for packages
 2018-10-05 14:16:24 +05:30
Faris Ansari
0c99576e49 fix(yarn): Add integrity for packages 2018-10-05 14:15:22 +05:30
Faris Ansari
379ef83d40
Merge pull request #6203 from netchampfaris/rollup-message 
fix(rollup): Add message to indicate addition of new dependency
 2018-10-05 14:10:28 +05:30