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

927 commits

Author SHA1 Message Date
Saurabh
edf361b132 resolved merge conflicts 2018-06-05 15:14:42 +05:30
Saurabh
8d0b33c5ca bumped to version 10.1.36 2018-06-05 15:42:57 +06:00
Saurabh
1865d543b1 Merge branch 'master' into develop 2018-05-31 17:21:13 +05:30
Saurabh
c903d05c1e bumped to version 10.1.35 2018-05-31 17:51:12 +06:00
Saurabh
56bf3bf40b [fix] resolved merge conflicts 2018-05-28 11:43:38 +05:30
Saurabh
3079f1c5fe bumped to version 10.1.34 2018-05-28 11:54:31 +06:00
Ameya Shenoy
949ec96fbc
Merge branch 'master' into develop 2018-05-24 08:43:19 +00:00
Ameya Shenoy
9a32f55f40 bumped to version 10.1.33 2018-05-24 08:39:55 +00:00
Ameya Shenoy
06851e7376
Merge branch 'master' into develop 2018-05-22 08:45:40 +00:00
Ameya Shenoy
0a45e6af9c bumped to version 10.1.32 2018-05-22 08:43:16 +00:00
Saurabh
f1b35c82f4 [fix] resolved merge conflicts 2018-05-15 12:56:21 +05:30
Saurabh
b42eb308a7 bumped to version 10.1.31 2018-05-15 13:21:03 +06:00
Rushabh Mehta
cca360e8ef [minor] dont render .min.js files as jinja templates 2018-05-10 22:28:42 +05:30
Nabin Hait
6737f1912c Fixed merge conflict 2018-05-08 15:27:37 +05:30
Nabin Hait
db5682e688 bumped to version 10.1.30 2018-05-08 15:56:51 +06:00
Nabin Hait
e3682cec22 Fixed merge conflict 2018-05-05 12:12:28 +05:30
Nabin Hait
00adb31d69 bumped to version 10.1.29 2018-05-05 12:38:47 +06:00
Suraj Shetty
3109123249 Permission improvements (#5494) 
* Overwrite "if owner" restriction*
- Overwrite "if owner" restriction if user has other valid roles
(with access rights) without if_owner enabled for it in doc perm
eg:
If a doctype has 2 docperm for Role A and Role B and the docperm with
Role A has  if owner enabled.

Suppose User 1 has Role A, then User 1 should see only docs
which was created by him.

Now if User 2 has Role A and Role B, User 2 should be able to see all the
records because Role B has unrestricted access on doctype.
------------------------------------------------------

Previously in case of User 2, the restriction(of if owner) from Role A
used to reflect and User 2 was only able to view only records made by
him.

This commit will overwrite the if_owner restriction in such case.
- Refactor get_role_permission method

* Add advanced control for user permission
- Add ability to skip user permission check for specific doctype

* Refactor "linked with" method
- Add option to skip linked with doctype which has
ignore_user_permission enabled against them.

* Clear "linked with doctype" cache on doctype changes

* [Minor] Fix formatting

* Fix error and bugs in linked_with method

* Format code

* Add fix to get allowed docs from user_permission

* Fix has_user_permission bug

* Add before migrate patch for user permission

* Fix typo
 2018-05-04 13:13:29 +05:30
Saurabh
da1e6ee789 [fix] merge conflicts 2018-05-02 21:38:06 +05:30
Saurabh
bded2cd3e9 bumped to version 10.1.28 2018-05-02 22:06:12 +06:00
Saurabh
dee3a6ed1d Merge branch 'master' into develop 2018-05-02 16:18:48 +05:30
Saurabh
36cfa144e6 bumped to version 10.1.27 2018-05-02 16:48:47 +06:00
Prateeksha Singh
54a96761c1
Merge pull request #5495 from surajshetty3416/build-match-condition-fix 
[Minor] Fix bug with build_match_condition
 2018-05-02 16:06:47 +05:30
Saurabh
f3a25b3f91 Merge branch 'master' into develop 2018-05-02 14:51:46 +05:30
Saurabh
74c645b6d2 bumped to version 10.1.26 2018-05-02 15:21:45 +06:00
Suraj Shetty
6521bb00d3 [Minor] Fix bug with build_match_condition 
- change in commit fb25fdb6 introduced this bug which
 2018-04-27 12:37:21 +05:30
Saurabh
1e00ef289e Merge branch 'master' into develop 2018-04-25 11:35:48 +05:30
Saurabh
8b2ab352d1 bumped to version 10.1.25 2018-04-25 12:05:48 +06:00
Saurabh
56b6167c1f [fix] merge conflicts 2018-04-19 11:16:28 +05:30
Saurabh
0a18c47fda bumped to version 10.1.24 2018-04-19 11:30:11 +06:00
Saurabh
7e58f36c88 Merge branch 'master' into develop 2018-04-15 12:50:28 +05:30
Saurabh
056f93949e bumped to version 10.1.23 2018-04-15 13:20:27 +06:00
Nabin Hait
c4c3cd3131 Merge branch 'master' into develop 2018-04-13 14:32:03 +05:30
Nabin Hait
5527a80d3c bumped to version 10.1.22 2018-04-13 15:02:02 +06:00
Rushabh Mehta
c4e1b9e0c1
[enhance] Add condition in transitions and move workflow to server-side (#5399) 
* [workflow] move to server side

* [workflow] tests

* [workflow] tests

* [minor] remove print

* [fixes] tests and lint

* [tests] fix typo

* [fix] tests
 2018-04-11 00:38:13 -08:00
Nabin Hait
9fea757559 Merge branch 'master' into develop 2018-04-09 19:16:01 +05:30
Nabin Hait
0e7cd23331 bumped to version 10.1.21 2018-04-09 19:45:59 +06:00
Nabin Hait
116ac139cf Merge branch 'master' into develop 2018-04-09 15:21:30 +05:30
Nabin Hait
8c3a209323 bumped to version 10.1.20 2018-04-09 15:51:28 +06:00
Nabin Hait
ef536e055b Merge branch 'master' into develop 2018-04-07 19:57:04 +05:30
Nabin Hait
755c0e0b05 bumped to version 10.1.19 2018-04-07 20:27:02 +06:00
Nabin Hait
944b45b62d fixed merge conflict 2018-04-06 15:05:15 +05:30
Nabin Hait
5f6bd7a775 bumped to version 10.1.18 2018-04-06 15:33:57 +06:00
Nabin Hait
82f1058ad4 Merge branch 'master' into develop 2018-04-04 11:23:21 +05:30
Nabin Hait
15823b07c6 bumped to version 10.1.17 2018-04-04 11:53:19 +06:00
Achilles Rasquinha
30b0ce8f64 remove other requirements 2018-04-02 15:32:06 +05:30
Achilles Rasquinha
fdc17c9542 added frappe.mock 2018-04-02 15:31:18 +05:30
Rohit Waghchaure
19a0e0409b [Fix] Letterhead not disaplying in PDF, if salary slip print sent auto from the system 2018-04-01 17:24:53 +05:30
Achilles Rasquinha
9442f14fe9
Merge pull request #5242 from achillesrasquinha/website-chat 
🎉 🎉 🎉Website Chat + Desktop Chat View + Attachments and Media
 2018-03-29 17:22:51 +05:30
Nabin Hait
cc251a0869 Fixed merge conflict 2018-03-29 13:52:00 +05:30