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

1875 commits

Author SHA1 Message Date
Ameya Shenoy
bb3cd6e7f3 fix(security): patch to tighten security (#6167) 
- wrote a patch to enforce a password policy, a default password score
of 2 as calculated by zxcvbn, disallow more than 3 login attempts in a
span of 60 seconds
- added '3' to the allowed password score
- enabled password policy by default
- set 3 as the default value for login attempts in a span of 60 seconds

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
 2018-10-02 10:42:30 +05:30
Shreya Shah
b7d8f23a8b Modify Email Signature fieldtype (#6161) 
- Change fieldtype from Text to Text Editor
- Add patch to handle cases having a new line
 2018-10-02 10:41:03 +05:30
Charles-Henri Decultot
98abda32b4 [Enhancement] Event timeline (#6133) 
* Events in timeline wip

* Events in timeline

* Permission issue + split buttons between Frappe and ERPNext

* Add string type check

* Codacy corrections

* Permission issue

* Test and feedback corrections

* Codacy corrections

* Tests and codacy corrections

* Codacy correction

* Py3 correction

* Travis correction

* Py3 corrections"

* Travis and codacy corrections

* Removed space

* Add check for the removal of new lines

* Codacy rollup watch missing semicolon
 2018-10-02 10:12:55 +05:30
Saurabh
4795572a46
Merge pull request #6165 from saurabh6790/subscription_support 
Subscription support
 2018-10-01 14:59:36 +05:30
Rohit Waghchaure
472640a3f2 [Fix] Unknown column 'uploaded_to_dropbox' in 'where clause' 2018-10-01 13:03:28 +05:30
Saurabh
e1acaba9b7 validate param value 2018-10-01 11:35:14 +05:30
Saurabh
3a25bc3e7c [fix] minor fix in reset password functionality 2018-10-01 11:35:14 +05:30
Ameya Shenoy
3b4f364919
Merge branch 'master' into staging-fixes 2018-09-26 07:12:30 +00:00
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
Charles-Henri Decultot
044efac4c5 Transaction log corrections (#6131) 2018-09-25 15:40:46 +05:30
Faris Ansari
50915f3177 fix: Handle empty json in Report (#6127) 2018-09-24 11:30:32 +05:30
Saurabh
aaebe0bce1 Merge branch 'master' into staging-fixes 2018-09-20 13:16:25 +05:30
Rohit Waghchaure
06566e5036 [Fix] Case sensitive for the doctype name in the options 2018-09-19 16:39:59 +05:30
Faris Ansari
89d56e4de1 fix(translations): Replace translations by keyword with indexed version 
Keywords in the translation also gets translated which
results in an error because python cannot find the key
 2018-09-18 11:55:10 +05:30
Nabin Hait
ff343d577c Merge branch 'staging-fixes' into staging 2018-09-12 17:44:24 +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
Ranjith Kurungadam
5b54d8acb0 fix edit profile (#6059) 2018-09-07 13:20:45 +05:30
Prateeksha Singh
eb5b7a77c9 [Feature] Format Autoname (#6017) 
* [Feature] Format Autoname

- Generate autoname by replacing all instances of braced params
- Independent of remaining string or separators.
- Remove autoname Concatenate option

* [autoname] add test for format autoname
 2018-09-03 10:58:56 +05:30
Rushabh Mehta
a19f7beb39 ux: mandatory red in data import, export 2018-08-29 17:30:27 +05:30
Rushabh Mehta
a9f32f292c default(perms): add default import, export perms 2018-08-29 17:09:35 +05:30
Nabin Hait
886a41d0ce Fixed merge conflict 2018-08-29 13:08:04 +05:30
Charles-Henri Decultot
0292a39d21 Make description translatable (#6024) 2018-08-29 12:44:58 +05:30
Aditya Hase
f3b959b1fe frappe: refactor async to realtime (#6015) 
* frappe: refactor async to realtime

* frappe: refactor async to is_async
 2018-08-28 15:31:20 +05:30
Saurabh
99b102dc25 [fix] v11 patch fixes 2018-08-27 18:13:46 +05:30
Charles-Henri Decultot
6bb36a8c0e Possibility to set custom calendar options (#5957) 
* Possibility to set custom calendar options

* Codacy corrections

* Codacy correction

* Codacy corrections

* Set now indicator as default

* Weekend options as a button

* Codacy corrections

* Move preferences to localStorage

* Codacy corrections

* Update calendar.js
 2018-08-24 15:22:40 +05:30
Zarrar
565c4b24d4 [Enhance] Data Import (#5962) 
* fix checkbox toggling for mandatory option

* update / insert functionality added

* minor changes for naming_series and with_data_download

* changes related to insert record

* show name field as mandatory for update records

* codacy fix

* add parent field to file incase of importing only child table for new records

* test case fixes for Data Import

* added select option instead of checkbox for inert/update

* make action field mandatory
 2018-08-24 15:18:20 +05:30
Neil Trini Lasrado
aef4e03b3d Use email title hook to fetch subject in Welcome Emails sent to new users (#5984) 
* Fix email title hook

* Welcome email code cleanup
 2018-08-24 15:15:48 +05:30
Nabin Hait
dc782ecfb2 Fieldtype changed for filters in prepared report 2018-08-20 16:59:18 +05:30
Himanshu Mishra
10361383c1 [fix]: use is_async in background jobs instead of async (#5986) 2018-08-20 10:36:26 +05:30
Rohit Waghchaure
fa0657ed6e [minor] Visible show report button when prepared report status is completed 2018-08-16 16:53:22 +05:30
Prateeksha Singh
37b4bd7b74 [prepared-report] intuitive first time UI (#5973) 2018-08-15 11:27:21 +05:30
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
Zarrar
a819863f78 typo fix (#5954) 2018-08-10 14:37:01 +05:30
Ameya Shenoy
4b89e0d5b5 Email Read notification (#5911) 
* Email Read notification

* changed email status from Opened to Read
 2018-08-10 12:00:51 +05:30
Rushabh Mehta
b1857a5132
optimize(meta): meta is now cached in redis (#5948) 
* optimize(meta): meta is now cached in redis

* fix(meta): test fixes

* fix(meta): codacy

* fix(meta): allow nulls to be serialized

* fix(form_meta): fix form meta caches

* fix(form_meta): fix form meta caches

* fix(form_meta): don't cache for developer_mode'
 2018-08-09 11:24:42 +05:30
Ameya Shenoy
71efb0e8e6
[fix] scrub options of whitespace 2018-08-07 13:02:10 +00:00
Ameya Shenoy
7cc7319a8a DocType name should not have hyphens in it (#5934) 2018-08-07 14:39:39 +05:30
Rushabh Mehta
bb67915445
feature(web-form): enable client scripts in web form (#5924) 2018-08-05 14:49:55 +05:30
Ameya Shenoy
2962b4c163 Print the doctype when migrations break (#5921) 2018-08-04 16:25:46 +05:30
Nabin Hait
854b068ee9 Fixed merge conflict 2018-07-31 13:15:15 +05:30
Ameya Shenoy
861ebe9046 report_name need not be unique (#5885) 2018-07-31 12:56:38 +05:30
Rushabh Mehta
4367a27181 [fix] rename doctype patch 2018-07-30 19:17:24 +05:30
Rushabh Mehta
62e313f472
[rename] move files with doctype rename (#5881) 2018-07-30 14:33:01 +05:30
Rushabh Mehta
e2b802f0f1
Revert "[First Cut] Address Info for customer (#5872)" (#5873) 
This reverts commit 9b78824946.
 2018-07-26 12:58:43 +05:30
Saurabh
9b78824946 [First Cut] Address Info for customer (#5872) 2018-07-26 12:47:30 +05:30
Rushabh Mehta
aef1046b1f
[email] remove style from email so it does not mess up desk (#5860) 
* [email] remove style from email so it does not mess up desk

* [fix] tests

* [fix] image parsing, #savedbyatestcase

* [fix] timeout issues in test

* [fix] timeout issues in test
 2018-07-24 17:00:14 +05:30
Shreya Shah
b2fbb35efa Fix comment mentions to avoid html tags (#5865) 
* Fix comment mentions to avoid html tags

* Add a test case
 2018-07-24 16:34:18 +05:30
Prateeksha Singh
8b2aa69203 [prepared-report] show tabular filters (#5851) 
* [prepared-report] show tabular filters

* [form] prepared report interaction updates

* [prepared-report] hide ref doctype
 2018-07-24 10:36:59 +05:30