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

15701 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rushabh Mehta
3de97c567b [minor] frappe.has_permission 2018-04-16 21:16:16 +05:30
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
Achilles Rasquinha
e8ba23ea7c
Update LICENSE 2018-04-12 17:27:20 +05:30
Achilles Rasquinha
5c21a49346
Merge pull request #5426 from achillesrasquinha/5364 
Fix Chat Enable for System Settings
 2018-04-12 14:50:01 +05:30
Saurabh
b5f4959f74 check track changes attribute with getattr (#5435) 2018-04-12 11:14:14 +05:30
Saurabh
f395e31e30 check track changes attribute with getattr (#5435) 2018-04-11 02:25:56 -08:00
Saurabh
992b61e863 patch fixes (#5436) 
* patch fixes

* minor fix
 2018-04-11 02:21:41 -08: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
Achilles Rasquinha
cfa2006bf3 Non Pour Accent! (#5427) 2018-04-10 22:53:42 -08:00
Suraj Shetty
aa213277dd Bulk Actions in Report (#5429) 2018-04-10 18:13:57 +05:30
rohitwaghchaure
d9f88b9622
Merge pull request #5422 from rohitwaghchaure/image_in_text_editor 
[Fix] Text editor with value image not displaying in the print form
 2018-04-10 17:31:42 +05:30
Faris Ansari
c6a99669e7
Listview fixes (#5423) 
- notification click handler fix
- activity page fix
- find txt in list fix (awesome bar)
 2018-04-10 10:53:53 +05:30
Suraj Shetty
fb25fdb609 Auto email report fixes (#5410) 
* fixes https://github.com/frappe/erpnext/issues/13319

* fixes https://github.com/frappe/erpnext/issues/13422

* change auto email report template

* change auto email report template

* Update data.py

* Update data.py
 2018-04-10 10:53:05 +05:30
Achilles Rasquinha
64412510a8 Fix Chat Enable for System Settings 2018-04-10 00:00:06 +05:30
Achilles Rasquinha
ce913f7a07 add set-config for global 2018-04-09 23:51:46 +05:30
Rohit Waghchaure
2ccc7593b1 [Fix] Text editor with value image not displaying in the print form 2018-04-09 20:56:45 +05:30
Nabin Hait
9fea757559 Merge branch 'master' into develop 2018-04-09 19:16:01 +05:30
Nabin Hait
e13f220991 Merge branch 'hotfix' 2018-04-09 19:16:00 +05:30
Nabin Hait
0e7cd23331 bumped to version 10.1.21 2018-04-09 19:45:59 +06:00
Nabin Hait
665d203146 Save versions only if track changes enabled 2018-04-09 19:06:09 +05:30
Saurabh
7971a79f3b syntax fix in doctype.py (#5413) 2018-04-09 18:26:35 +05:30
partzsch
8cc96357ff Signature field - stop the line width from expanding with each stroke (#5408) 
* Update jSignature.min.js

* Adjust line width to smothen strokes
 2018-04-09 18:20:46 +05:30
Achilles Rasquinha
fea7c02b7e hide banner image (#5420) 2018-04-09 18:02:14 +05:30
Achilles Rasquinha
536069147e check chat profile exists the right way 2018-04-09 15:35:18 +05:30
Nabin Hait
116ac139cf Merge branch 'master' into develop 2018-04-09 15:21:30 +05:30
Nabin Hait
fed10cb199 Merge branch 'hotfix' 2018-04-09 15:21:29 +05:30
Nabin Hait
8c3a209323 bumped to version 10.1.20 2018-04-09 15:51:28 +06:00
Saurabh
fbf66336fb [hotfix][urgent] fix backup compression (#5418) 2018-04-09 15:18:55 +05:30
rohitwaghchaure
75ec77193e Removed administrator from the email list of cc, bcc (#5416) 2018-04-09 12:43:11 +05:30
Faris Ansari
6c2236c7d7
Update frappe-datatable (#5404) 
- dynamic row height
- fixes #5293
 2018-04-09 11:23:54 +05:30
Rafael Perelló Rowley
eba4f4afe1 Update search.py (#5409) 
Attending to the comment "In order_by, `idx` gets second priority, because it stores link count" i changed the order in the SQL statement in the order_by variable so the order_by based on meta is before the order_by idx
 2018-04-09 11:18:42 +05:30
Prateeksha Singh
744e963461
Merge pull request #5412 from pratu16x7/hub-fix 
[fix] app-icon-svg
 2018-04-09 10:59:25 +05:30
Prateeksha Singh
9bda662ae7 [fix] app-icon-svg 2018-04-09 10:58:56 +05:30