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

16740 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Morlock
62abb3f8a0 Fixes #6178: Properly use ldap settings (#6179) 2018-10-02 10:46:29 +05:30
KanchanChauhan
767814c511 Doctype and name in title on mention notification email (#6150) 2018-10-02 10:03:49 +05:30
Frappe PR Bot
8ac4a294b8 [Translation] Updated Translations (#6151) 2018-10-02 10:01:50 +05:30
Faris Ansari
6811f0345e
Merge pull request #6170 from frappe/file-email-attach 
fix: Ignore permissions when attach file to email
 2018-10-01 13:43:11 +05:30
Faris Ansari
0885179d98
fix: Ignore permissions when attach file to email 2018-10-01 13:42:50 +05:30
Rushabh Mehta
0a1e7b2bf7 version: move to 12.x.x-develop 2018-09-30 23:01:36 +05:30
rohitwaghchaure
c1f2e31342
Merge pull request #6164 from rohitwaghchaure/fix_error_report_v12 
[Fix] _dict() is not defined
 2018-09-30 10:35:57 +05:30
Rohit Waghchaure
79b6709f85 [Fix] _dict() is not defined 2018-09-30 00:13:32 +05:30
Chinmay Pai
cd955824d1 [minor] show-config: add new command to show site config (#6163) 
`bench show-config` will now show site config

if `--site` is specified, it will also show the site config

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-09-28 19:10:26 +05:30
Faris Ansari
7deb57d1a3
Merge pull request #6153 from frappe/v12-file-fixes 
fix: File permissions when parent doesn't exist
 2018-09-27 17:05:56 +05:30
Faris Ansari
b7eec58752
Merge branch 'develop' into v12-file-fixes 2018-09-27 15:37:21 +05:30
Faris Ansari
9cf3e99286 fix: File permissions when parent doesn't exist 2018-09-27 15:35:40 +05:30
Saif
dc5fa81221 Get text from link formatter in indicator formatter function (#6142) 2018-09-27 09:17:31 +05:30
Faris Ansari
80f6269429 chore: Exclude 2.7 and postgres test (#6145) 2018-09-27 09:16:23 +05:30
Suraj Shetty
e61c9ac40c Fix quote issues (#6143) 
* Fix quotes issues

* Escape docname

* Avoid multiple escapes
 2018-09-27 09:15:50 +05:30
rohitwaghchaure
c3525cf52b [Fix] Not able to send the email, if file is attached (#6148) 
* [Fix] Not able to send the email, if file is attached

* Update file.py
 2018-09-27 09:15:29 +05:30
Faris Ansari
725cb6d60b
Merge pull request #6146 from frappe/v12-file-fixes 
fix: More permission fixes
 2018-09-26 18:01:53 +05:30
Faris Ansari
595e96dbff fix: More permission fixes 
If file is attached to Communication, check the permission
on the doc linked to Communication
 2018-09-26 18:00:04 +05:30
Faris Ansari
b8a8f9b8db
Merge pull request #6144 from frappe/v12-file-fixes 
fix(File): Infer File Permissions from linked doc
 2018-09-26 15:43:34 +05:30
Faris Ansari
20e4bbfea7 fix: Add comment only if parent doc exists 2018-09-26 15:30:19 +05:30
Faris Ansari
52ea6fafb5 fix: Add comment only if a file 2018-09-26 14:58:27 +05:30
Faris Ansari
b37c5153a9 fix(File): Infer File Permissions from linked doc 2018-09-26 14:40:10 +05:30
Ameya Shenoy
e551153ea0
Merge branch 'staging' into develop 2018-09-26 07:21:28 +00:00
Ameya Shenoy
f953e310f4
Merge branch 'staging-fixes' into staging 2018-09-26 07:18:59 +00:00
Ameya Shenoy
306d164b2f bumped to version 11.0.3 2018-09-26 07:18:59 +00:00
Ameya Shenoy
3b4f364919
Merge branch 'master' into staging-fixes 2018-09-26 07:12:30 +00:00
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
Prateeksha Singh
bcef7b8ef3
Merge pull request #6089 from jodeq/view-attachments-in-web-form 
[Proposal] View attachments in Web Form
 2018-09-26 00:16:51 +05:30
Mohamed_Alsum
97fb641583 Fix webform error while loading (#6134) 
* remove dublicate error mgs on submit web_form

* show side-bar in RTL lang

* fix webfrom success msg
 2018-09-25 21:58:55 +05:30
Rohit Waghchaure
8ec66fa6b2 [Security] Attachment file in the data import must be private 2018-09-25 19:18:50 +05:30
Faris Ansari
171c650ddf
Merge pull request #6055 from Thunderbottom/file-api 
Streamlined File API based on ORM
 2018-09-25 17:38:04 +05:30
Rushabh Mehta
ee5aecbf3c fixes: fix todo filters and search docs 2018-09-25 17:12:39 +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
Charles-Henri Decultot
044efac4c5 Transaction log corrections (#6131) 2018-09-25 15:40:46 +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
Roland
2a2e3ca0af fairlogin social ID provider (#6096) 
* fairlogin

adding fairlogin provider

* fairlogin

add fairlogin provider

* fairlogin

* fairlogin

* fairlogin userid

fairlogin userid corrected to preferred_username

* removed trailing white space

* removed trailing white space

removing white space mourned by automated code review
 2018-09-25 15:35:46 +05:30
Chinmay Pai
3729037612
file-api: minor fixes and improvements 
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-09-25 14:54:22 +05:30
Aditya Hase
ab81036c20 fix(python3): subproess.check_output should always be decoded (#6135) 2018-09-25 13:14:20 +05:30
Chinmay Pai
6f7faad0ec
file-api: add save test for base64 encoded file 
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-09-24 17:46:37 +05:30
Chinmay Pai
8849036e84
file-api: data_import: fix instance where file_name was used instead of file_url 
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-09-24 15:26:22 +05:30
Sachin Mane
5e5623d7f9 fix - default timeouts never picked up (#6098) 2018-09-24 13:08:08 +05:30
gshmu
bea46dc45c list clear, unselect list-select-all (#6088) 2018-09-24 12:59:37 +05:30
Himanshu Mishra
28b9094353 fix: check CSRF Token for PUT and DELETE methods as well (#6092) 2018-09-24 12:49:14 +05:30
Faris Ansari
f169f6231d fix(ux): Reorder Print Server fields (#6115) 
- fix timeline overflow text
 2018-09-24 12:46:41 +05:30