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

15732 commits

This branch
This branch
All branches
Author SHA1 Message Date
Prateeksha Singh
30e1bb5df7
Merge pull request #5476 from Zlash65/user-tags 
[Minor] User tags fix and refresh list
 2018-04-21 14:25:08 +05:30
Zlash65
225fda199c minor user tags fix 2018-04-21 13:40:45 +05:30
Suraj Shetty
95c02f94ef Nested permission (#5460) 
* nested permission

* test for nested permission

* [minor] Format code

* Fix nested permission test

* Fix codacy
 2018-04-20 18:07:55 +05:30
Zarrar
33b9bca057 [Fix] Fix treeview adding child to wrong parent and Freeze screen while adding a node. (#5464) 
* fix parent wrong selected, freeze screen while adding a node

* unfreeze dom always

* fix translation method
 2018-04-20 14:08:46 +05:30
KanchanChauhan
97226f0fb1 [Fix] Print for Report View (#5470) 
* [Fix] Print for List report view fixed

* Update report_view.js

* Show standard filters too
 2018-04-20 12:40:33 +05:30
Faris Ansari
8283cd3fbb
Show Permission Restrictions in a Table (#5457) 2018-04-20 12:36:21 +05:30
Rah Yuliantoro
d6902b5010 Update permission_manager_help.html (#5462) 
translation tag
 2018-04-20 12:26:15 +05:30
Shreya Shah
655e6daee5 Rename doctype Standard Reply to Email Template (#5444) 
* Rename Standard Reply to Email Template

* rename occurrences
 2018-04-19 20:57:40 -08:00
Zarrar
a5cca5ae73 fix user-tags trigger (#5471) 2018-04-19 20:48:43 -08:00
Faris Ansari
ba4201c569 Disable "User Settings" in query reports (#5473) 2018-04-19 20:45:21 -08:00
Saurabh
56b6167c1f [fix] merge conflicts 2018-04-19 11:16:28 +05:30
Saurabh
28287d4d8f Merge branch 'hotfix' 2018-04-19 11:00:11 +05:30
Saurabh
0a18c47fda bumped to version 10.1.24 2018-04-19 11:30:11 +06:00
Faris Ansari
217156e5fa
Add filepath param in read_xlsx (#5465) 2018-04-18 16:38:57 +05:30
Saurabh
3d7e56d1ef [fix] added ignore_in_install flag to accommodate Gcal custom field (#5455) 2018-04-18 12:39:56 +05:30
Suraj Shetty
14c621fca2 Success Action (#5434) 
* success model init

* ui changes

* whitelisted get_count method

* refactor success action

* refactor form.js
- lint error fixes
- reject promise on error

* Refactor
- option to add body to msg-alert
- remove unwanted css
- tweak msg-alert ui

* remove alert on any action click

* sample success modal config for toDo

* success alert redesign

* docstatus check

* close button position fix

* add doctype for success action setting

* remove unwanted changes

* remove unused import

* rename success action setting to success action

* add translatable label

* rename for_doctype to ref_doctpe

* remove unused frappe import

* replace get_list with get_all
to ignore permission check while loading boot
 2018-04-18 11:22:51 +05:30
rohitwaghchaure
7425c83bf1
Merge pull request #5454 from rohitwaghchaure/dynamic_report_issue 
[Fix] Dynamic column not loading in the report
 2018-04-18 11:10:38 +05:30
Suraj Shetty
cb627cc7d6 workflow fix (#5452) 
* workflow fix

* add a line
 2018-04-17 01:23:49 -08:00
Rohit Waghchaure
27b84f22aa [Fix] Dynamic column not loading in the report 2018-04-17 14:49:45 +05:30
Nabin Hait
5c824c1ee0
Revert "[Minor][Bug Fix] permission in workflow docs (#5449)" (#5453) 
This reverts commit 4d4c4e55fd.
 2018-04-17 12:50:10 +05:30
KanchanChauhan
4d4c4e55fd [Minor][Bug Fix] permission in workflow docs (#5449) 2018-04-17 11:59:38 +05:30
Nabin Hait
de63fa5737
Sync optimization related to varchar length and index on version table (#5437) 
* Sync optimization related to varchar length and index on version table

* Minor fix
 2018-04-17 11:58:01 +05:30
Shreya Shah
c007c0c225 Fix for unknown locale languages in print format (#5424) 
* fix for unknown locale in dates

* formatting fix
 2018-04-17 11:29:22 +05:30
Rushabh Mehta
3de97c567b [minor] frappe.has_permission 2018-04-16 21:16:16 +05:30
Rushabh Mehta
f03ac687ab [travis] --quiet 2018-04-16 15:09:08 +05:30
Shreya Shah
fc7de01017 Raise exception while deleting an item which is a product bundle (#5286) 
* raise exception while deleting an item which is a product bundle

* separated if statements and added a comment

* modified condition
 2018-04-16 01:26:19 -08:00
Shreya Shah
64fe2749cb avoid link validation error in authentication (#5415) 2018-04-16 01:25:34 -08:00
Rushabh Mehta
e4aa433ea3 [travis] --quiet 2018-04-16 11:25:39 +05:30
Rushabh Mehta
102dd9fea8 [travis] sleep more 2018-04-16 11:04:07 +05:30
Rushabh Mehta
74046de5dd [minor] 2018-04-16 10:57:33 +05:30
Manas Solanki
68377501fc increase the field limit for the csv file (#5438) 2018-04-15 21:15:02 -08:00
FINE FILM Ltd
63170989f9 [fix][minor] Fix logical error in event repeat condition check (#5439) 
Without this fix you can only create Every Day repeating events that are not ending on the same day.
The condition is doing the total opposite check, if you are trying to create a repeating event with the same day end you get the following error: "Every day events should finish on the same day."
 2018-04-15 21:14:38 -08:00
Frappe PR Bot
f1c17faf94 [Translation] Updated Translations (#5419) 2018-04-15 21:14:17 -08:00
Saurabh
7e58f36c88 Merge branch 'master' into develop 2018-04-15 12:50:28 +05:30
Saurabh
d0666b77c9 Merge branch 'hotfix' 2018-04-15 12:50:27 +05:30
Saurabh
056f93949e bumped to version 10.1.23 2018-04-15 13:20:27 +06:00
Saurabh
7098be2ef2
Merge pull request #5447 from codingCoffee/pip10 
Compatibility for pip10
 2018-04-15 12:42:25 +05:30
Ameya Shenoy
a6087cb243
Compatibility for pip10 
- also some spaces and tabs fixes
 2018-04-15 03:41:32 +05:30
Saurabh
9385fc32be encode parameters in set route (#5442) 2018-04-13 21:29:56 -08:00
Prateeksha Singh
286131b422
Merge pull request #5443 from pratu16x7/hub-fixes 
[fix] desk svg icons
 2018-04-13 17:06:22 +05:30
Prateeksha Singh
b72b208afa [fix] desk svg icons 2018-04-13 17:05:10 +05:30
Nabin Hait
c4c3cd3131 Merge branch 'master' into develop 2018-04-13 14:32:03 +05:30
Nabin Hait
54388e7f70 Merge branch 'hotfix' 2018-04-13 14:32:02 +05:30
Nabin Hait
5527a80d3c bumped to version 10.1.22 2018-04-13 15:02:02 +06:00
Nabin Hait
ec45bc767f Set email account while creating new documents based on email 2018-04-13 14:28:59 +05:30
Nabin Hait
e4aed8c4db Set email account while creating new documents based on email 2018-04-13 13:28:18 +05:30
KanchanChauhan
4232013e65 Check number format only if precision missing (#5357) 
* Check number format only if precision missing

* handle string inputs
 2018-04-13 11:11:09 +05:30
Faris Ansari
026f57d4ad
[fix] Query Report data fetch (#5441) 
- fallback for user arg
- also commit yarn.lock
 2018-04-12 17:50:02 +05:30
Achilles Rasquinha
8b70725951
Merge pull request #5425 from achillesrasquinha/bench-523 
add set-config for global
 2018-04-12 17:31:06 +05:30
Achilles Rasquinha
a814cdd1cf
Merge pull request #5421 from achillesrasquinha/chat-profile-exists 
check chat profile exists the right way
 2018-04-12 17:30:15 +05:30