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

16237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Saurabh
c9b36c63dd Auto repeat fixes (#5819) 
* add index on next_schedule_date

* optiization and ux fixes

* minor fix

* Add index via DocType
 2018-07-16 18:02:08 +05:30
Saurabh
209c889cec Add beta version parameter for beta release (#5805) 
* Add beta version parameter for beta release

* rename beta to staging

* Update hooks.py
 2018-07-16 18:01:31 +05:30
ashish-greycube
814d7ed870 Update sms_settings.py (#5812) 
In context to https://github.com/frappe/frappe/issues/5811
 2018-07-16 18:00:54 +05:30
aherbhagya
201b193c62 An added checkbox in Dropbox setting for file upload (#5753) 
* Added Custom check box for file upload

* removed half test file

* deleted test files

* deleted test files

* added patch to enable file backup in dropbox settings

* added patch to enable file backup in dropbox settings

* Update set_dropbox_file_backup.py

* Update set_dropbox_file_backup.py
 2018-07-16 17:47:38 +05:30
Suraj Shetty
36c1bc5e6f Check only read and export while creating docperm (#5823) 
- Uncheck everything else
 2018-07-16 17:45:37 +05:30
Zarrar
be38795f8d minor fix in use of reduce (#5825) 2018-07-16 17:41:29 +05:30
Prateeksha Singh
753d542f71
Merge pull request #5826 from pratu16x7/report-backup 
Background Reports
 2018-07-16 17:22:40 +05:30
Prateeksha Singh
bb450619c8 [prepared report] add prepared report condition to ignore in migrate 2018-07-16 17:05:00 +05:30
Prateeksha Singh
f3d9d6d22c [background-report] minor cleanup stage 4 2018-07-16 16:09:02 +05:30
shriharishastry
08cffe3bc7 [background-report] minor cleanup stage 3 2018-07-16 15:47:45 +05:30
shriharishastry
d51f030676 [background-report] minor cleanup stage 2 2018-07-16 15:45:54 +05:30
shriharishastry
0a68539c47 [background-report] minor cleanup 2018-07-16 15:43:40 +05:30
shriharishastry
e0eb3071d9 codacy changes 2018-07-16 15:38:55 +05:30
Prateeksha Singh
6d9ce9b6ab [merge] branch develop into background-report 2018-07-16 15:30:23 +05:30
Prateeksha Singh
b1ce2cec29
Merge pull request #5821 from netchampfaris/fix-query-report 
[fix] frappe.query_report should be null if report is not initialized
 2018-07-13 21:18:50 +05:30
Faris Ansari
ad1a46875e [fix] frappe.query_report should be null if report is not initialized 2018-07-13 12:40:42 +05:30
Aditya Hase
415a335531 Set pager in mariadb console (#5809) 2018-07-13 11:55:04 +05:30
Prateeksha Singh
bd2f992dad
Merge pull request #5818 from netchampfaris/concat-build 
Create a moment bundle and include it in webform
 2018-07-12 16:29:47 +05:30
Faris Ansari
32b4977596 Create a moment bundle and include it in webform 2018-07-12 16:23:25 +05:30
Faris Ansari
72494339dd
Update frappe-datatable styles (#5813) 2018-07-11 15:04:58 +05:30
Faris Ansari
0b44529dc9
Moment (#5808) 
- Add npm packages
- Add moment builds in frappe-web
- Remove import statements to avoid duplicate loading of moment
 2018-07-11 14:52:07 +05:30
Sushant Nadkar
f8dc45c3c1 Convert doc field value to string type before using (#5795) 2018-07-11 11:11:55 +05:30
Rushabh Mehta
c07e85c6da [fix] frappe.query_report_filters_by_name 2018-07-11 11:11:15 +05:30
Zarrar
cb66682b2f skip property setter for naming series (#5796) 2018-07-11 11:05:14 +05:30
Frappe PR Bot
eab1a5a605 [Translation] Updated Translations (#5801) 2018-07-11 11:04:09 +05:30
Saurabh
93165d4a5c test case fixes (#5807) 2018-07-11 11:02:27 +05:30
Prateeksha Singh
85a817cc71
Merge pull request #5806 from pratu16x7/website-datetime 
[fix] fulfill datetime requirement for webform
 2018-07-10 22:18:02 +05:30
Prateeksha Singh
15308750e4 [fix] fulfill datetime requirement for webform 2018-07-10 22:16:58 +05:30
Rushabh Mehta
aae580a53d [style] make page-card self contained 2018-07-10 18:36:58 +05:30
Rushabh Mehta
a4dd9ec91b [test] [style] 2018-07-10 16:10:08 +05:30
Aditya Hase
dca702d898 Allow multiple values to be passed as arguments to rpush and lpush (#5802) 2018-07-10 15:34:29 +05:30
Rushabh Mehta
05d68968ca [fix] test 2018-07-10 15:26:43 +05:30
Suraj Shetty
7f2b4df144 Run user-permission patch before droping apply_user_permission column (#5794) 2018-07-10 15:23:22 +05:30
Rushabh Mehta
8eb5e51042 [style] for webforms and login 2018-07-10 15:22:40 +05:30
Saurabh
2a4b8f1ec3 [fix] merge-conflicts 2018-07-09 15:56:43 +05:30
Saurabh
8ad60a25b9 Merge branch 'hotfix' 2018-07-09 15:55:22 +05:30
Saurabh
34505037cc bumped to version 10.1.39 2018-07-09 16:25:22 +06:00
Saurabh
cc9ba4d9b9
Merge pull request #5798 from pratu16x7/hotfix 
[global-search] add doc check for route
 2018-07-09 14:42:44 +05:30
Prateeksha Singh
479f51e23a [global-search] add doc check for route 2018-07-09 12:49:26 +05:30
Rushabh Mehta
db3a950db3
[email] smtp connection per sender (#5791) 
* [fix]email error due to incorrect smtp server auth

- A dict of smtpserver objects is created for every sender
- A smtp server object is created if not present for the given sender
- smtpserver object is picked based on the sender of the mail

* [fix] remove cache from queue.py
 2018-07-06 18:31:13 +05:30
Rushabh Mehta
53a298a5c1 [fix] test_db_query.py 2018-07-06 18:27:08 +05:30
Ameya Shenoy
f23efed7f5
Merge pull request #5792 from codingCoffee/mail_fix_123 
safe encode is not required
 2018-07-06 18:25:33 +05:30
Zarrar
f32467dde8 make content as read only (#5787) 
if message type is file, make content read only
 2018-07-06 18:16:58 +05:30
Ameya Shenoy
ab7b862a49 safe encode is not required 2018-07-06 18:15:17 +05:30
Rushabh Mehta
58733cdf29 [remove] mycli 2018-07-06 17:53:54 +05:30
Saurabh
a135c6c431 resolved merge conflicts 2018-07-06 13:37:51 +05:30
Saurabh
c656704cd7 Merge branch 'hotfix' 2018-07-06 13:26:04 +05:30
Saurabh
aec04731db bumped to version 10.1.38 2018-07-06 13:56:04 +06:00
IOWEB TECHNOLOGIES
44f045ca04 Fix bug with smtplib and crammd5 servers that prevents email sending (#5687) 
* Fix bug with smtplib and crammd5 servers that prevents email sending

* Use frappe.safe_decode instead of str

* Revert "Use frappe.safe_decode instead of str"

This reverts commit 272aa167fd86f90129517666b2cad85363026f87.

* Using frappe_encode to 'ascii' to send the password

* Update smtp.py

* Update smtp.py
 2018-07-06 12:06:02 +05:30
felixvarghese
c55127f7a2 Connect to LDAP Server using StartTLS (#5784) 
* Connect to LDAP Server using StartTLS

Connect to LDAP server using StartTLS for security. An option to require trusted certificates is also included.

* fix try

* remove trailing whitespace
 2018-07-06 11:58:27 +05:30