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

15137 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
8576cd71e4
Merge pull request #6189 from codingCoffee/fake 
chore: fake commit for release
 2018-10-03 20:36:53 +05:30
Ameya Shenoy
a181ba61ae
chore: fake commit for release 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-03 20:34:07 +05:30
Ameya Shenoy
e90a8af3f0
Merge branch 'hotfix' 2018-10-03 14:51:29 +00:00
Ameya Shenoy
00d9c2e290 bumped to version 10.1.49-beta.1 2018-10-03 14:51:29 +00:00
rohitwaghchaure
1c8db8fee3 [Fix] Permlevel 1 with read permission fields are not disaplying in the form (#6160) 2018-10-02 10:08:59 +05:30
rohitwaghchaure
8fe95f2876 Submit the attendance if it's in draft mode (#6156) 2018-09-30 21:11:01 +05:30
Suraj Shetty
a380db49a8 Validation fix (#6138) 
* Validate set_only_once only on doc update

* Remove redundant error message
 2018-09-27 09:16:36 +05:30
Ameya Shenoy
f1fa88192a
Merge branch 'hotfix' 2018-09-26 07:12:27 +00:00
Ameya Shenoy
06d2e36aba bumped to version 10.1.49 2018-09-26 07:12:27 +00:00
Prateeksha Singh
fad8ee775a
[hotfix][email-alert] clean email_by_document code 2018-09-26 00:44:58 +05:30
Prateeksha Singh
f2cd040c3b
Merge pull request #6090 from ci2014/patch-26 
Fix recipients by document field
 2018-09-26 00:38:28 +05:30
Prateeksha Singh
683ff52e03
Merge pull request #6139 from rohitwaghchaure/data_import_file_must_be_private 
[Security] Attachment file in the data import must be private
 2018-09-26 00:21:20 +05:30
Rohit Waghchaure
8ec66fa6b2 [Security] Attachment file in the data import must be private 2018-09-25 19:18:50 +05:30
Ameya Shenoy
025b627579
Merge pull request #6137 from frappe/revert-6132-decode 
Revert "fix(setup_global_help): allow utf-8 in filename"
 2018-09-25 16:50:30 +05:30
Ameya Shenoy
4e4429f169 Revert "fix(setup_global_help): allow utf-8 in filename (#6132)" 
This reverts commit a19525e695.
 2018-09-25 16:49:11 +05:30
Ameya Shenoy
a19525e695 fix(setup_global_help): allow utf-8 in filename (#6132) 
- fixed issue with setting up global help. Setting up global help used
to fail when the filenames were in any language other than english, due
to improper encoding. Used frappe.safe_decode to solve the issue

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-09-25 15:40:18 +05:30
rohitwaghchaure
a8423dd782 [Fix] Email not sending if reciepients is blank because of reciepients is unsubscribed (#6136) 2018-09-25 15:37:26 +05:30
gshmu
bea46dc45c list clear, unselect list-select-all (#6088) 2018-09-24 12:59:37 +05:30
Faris Ansari
50915f3177 fix: Handle empty json in Report (#6127) 2018-09-24 11:30:32 +05:30
Saurabh
087562fc56 Merge branch 'hotfix' 2018-09-20 13:16:23 +05:30
Saurabh
acfdc5a0f3 bumped to version 10.1.48 2018-09-20 13:46:23 +06:00
Faris Ansari
162f1012f8
Merge pull request #6109 from rohitwaghchaure/fix_case_sensitive_for_options 
[Fix] Case sensitive for the doctype name in the options
 2018-09-20 11:25:10 +05:30
Rohit Waghchaure
06566e5036 [Fix] Case sensitive for the doctype name in the options 2018-09-19 16:39:59 +05:30
ci2014
4844fbb92c
Fix recipients by document field 
When having multiple documents in the loop, email_by_document_field would be overridden by the mail address(es). In my case every trigger would only send one email, because for the doc following on the first one, the email_by_document_field would contain mail addresses instead of the field name.

Prefixing with tmp_ solves the problem, because we only need the key in that lines.
 2018-09-14 00:53:11 +02:00
Ameya Shenoy
460329770e
Merge pull request #6081 from rohitwaghchaure/permission_issue_v10_for_permlevel_1 
Permlevel 1 fields are not visible to the users after submission of the document
 2018-09-12 17:03:03 +05:30
Saurabh
90cedec253 Merge branch 'hotfix' 2018-09-12 14:50:15 +05:30
Saurabh
e058e81ba4 bumped to version 10.1.47 2018-09-12 15:20:15 +06:00
Ameya Shenoy
5af49947cc
Merge pull request #6074 from rohitwaghchaure/minor_issue_change_log 
[Fix] Change Log
 2018-09-12 11:51:14 +05:30
Ameya Shenoy
ea40ca6bca
Merge pull request #6083 from sibidharan/patch-1 
Fix #6068
 2018-09-12 10:53:27 +05:30
Sibidharan Nandhakumar
d46c1b5491
Fix #6068 
Fix #6068 where empty options keep adding on each save for fieldtype select.
 2018-09-11 21:57:47 +05:30
Rohit Waghchaure
312ec9f14d Permlevel 1 fields are not visible to the users after submission of the document 2018-09-11 18:41:05 +05:30
Rohit Waghchaure
5f4432a343 [Fix] Change Log 2018-09-10 13:21:02 +05:30
Zarrar
c760ad5245 put hub node back in modules.txt (#6064) 2018-09-07 17:48:42 +05:30
Faris Ansari
2a6fb43e6b
Merge pull request #5960 from codingCoffee/popup 
[feature] show popup for version update
 2018-09-07 12:43:02 +05:30
Ameya Shenoy
840f05054d
update-info: put json in redis, and generate message at user end 2018-09-05 14:32:52 +00:00
Faris Ansari
0fcc0c9b89
Add only System Managers to update-user-set 2018-09-05 13:36:56 +05:30
Nabin Hait
3265916640 Merge branch 'hotfix' 2018-08-29 12:46:10 +05:30
Nabin Hait
8100327b51 bumped to version 10.1.46 2018-08-29 13:16:09 +06:00
Nabin Hait
ca1946152d
Update email_alert.py 2018-08-29 12:45:01 +05:30
Ameya Shenoy
a4f3ba6d99
translated strings and removed admin upgrade message 2018-08-24 11:38:37 +00:00
Shreya Shah
503da4d7d7 Modify smallest currency fraction for USD (#6000) 2018-08-23 16:00:43 +05:30
Ameya Shenoy
89a8073c1f [fix] the patch needs to be executed before reloading moduledef (#5996) 2018-08-22 11:00:26 +05:30
Ameya Shenoy
b944fcfdb5
[minor] pop up shown to system managers and functionified code 2018-08-20 21:18:09 +00:00
Ameya Shenoy
21bbbd2dbb
[feature] show popup for version update 
- added a new weekly hook to check if new version update is available
- added function to desk.js to show popup in case a new version is
available
- added redis wrappers for set related commands, namely sadd, srem,
sismember, spop, srandmember, smembers
 2018-08-15 20:34:48 +00:00
Shreya Shah
54238c7e4c Fix comment mentions again (#5945) 
* Fix comment mentions again

* Improvise as per suggestion

* Show mentions based on emails instead of names
 2018-08-13 10:30:21 +05:30
Faris Ansari
b5d967677a
Merge pull request #5935 from codingCoffee/whitespace 
[fix] Prevent trailing spaces in Options for Select field
 2018-08-10 18:20:42 +05:30
Ameya Shenoy
71efb0e8e6
[fix] scrub options of whitespace 2018-08-07 13:02:10 +00:00
FinByz Tech Pvt. Ltd
0f68fec03e Added outgoing sender in email alert (#5892) 
* Added outgoing sender in email alert

* Added semicolon

* Minor fix
 2018-08-07 14:45:36 +05:30
Shreya Shah
62a7214a9b Check if fieldname is present in row else continue (#5912) 2018-08-07 14:43:32 +05:30
Ameya Shenoy
7cc7319a8a DocType name should not have hyphens in it (#5934) 2018-08-07 14:39:39 +05:30