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

17312 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
68f651dc75
fix(Kanban): Fix for New Kanban DDL issue 
fix(Kanban): Fix for New Kanban DDL issue
 2018-12-31 16:55:09 +05:30
Chinmay Pai
825b0120fa fix(login): redirect user from login page if already logged in (#6689) 
* fix(login): redirect user from login page if already logged in

the user should not be able to access the login page if a user session already exists. closes #6500.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(test-website): fix website test

what is the point in writing tests if they don't really work/function as intended?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(regex): do not replace '\' in rules

that defeats the entire purpose of creating rules, wtf?

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix(test_website): change user using set_user()

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* redirect: prefix string with r to escape string literals

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-12-31 13:46:55 +05:30
Zarrar
ba72414a3d fix: Hide dialog after assignment (#6696) 
* dialog hide fix after assigning

* fix: remove console statement
 2018-12-31 11:35:59 +05:30
Zarrar
ffa0a1821c fix: Delete View Logs when deleting a document (#6695) 2018-12-31 11:34:48 +05:30
Suraj Shetty
fb3d33593b
fix(is_html): Return false if text is not string 
fix(is_html): Return false if text is not string
 2018-12-31 11:05:39 +05:30
Faris Ansari
ae57e75b0e fix(is_html): Return false if text is not string 2018-12-30 22:43:21 +05:30
Deepesh Garg
dfb725fe7f fix: Currency formatting fix in report view (#6691) 
* Currency formatting fix in report view

* Minor Fix

* (Codacy Fix) Missing semicolon
 2018-12-28 18:28:05 +05:30
Saurabh
f24cb757bf
Merge pull request #6692 from Zlash65/mobile-fix 
[Minor] Mobile app related fix
 2018-12-28 11:50:09 +05:30
Chinmay Pai
e606a1c22c
Merge branch 'staging-fixes' into mobile-fix 2018-12-27 17:29:48 +00:00
Suraj Shetty
added8a07a
Merge pull request #6694 from surajshetty3416/permission-fixes-defaults 
Fix: default not found issue (fixes "in user permission" check)
 2018-12-27 21:02:19 +05:30
Suraj Shetty
4239a56e5c Fix: default not found issue (fixes "in user permission" check) 
Also rename a badly named function
 2018-12-27 20:28:27 +05:30
Zlash65
3ada55f9f8 fix assets for css for mobile build 2018-12-27 19:53:15 +05:30
Saurabh
5dd140c6ed bumped to version 11.0.3-beta.45 2018-12-27 18:31:27 +06:00
rohitwaghchaure
a17d83801a fix: frappe.defaults.get_default not working (#6690) 2018-12-27 17:57:05 +05:30
Rushabh Mehta
a74c91742a
fix(formatting): for email replies (#6676) 
* fix(fomratting): for email replies

* fix(timeline): some more testing and fixes

* fix(style): for blockquotes, also feedback
 2018-12-27 12:55:52 +05:30
Saurabh
37e6cd4bff bumped to version 11.0.3-beta.44 2018-12-26 22:29:51 +06:00
Saurabh
fd68f52c20
Merge pull request #6685 from frappe/fix-key-error 
fix(permission): KeyError
 2018-12-26 21:57:01 +05:30
Suraj Shetty
2a315b154e
fix(permission): KeyError 2018-12-26 21:16:41 +05:30
Frappe Bot
14c8f85af1 Merge branch 'staging-fixes' into staging 2018-12-26 14:31:01 +00:00
Frappe Bot
7e9d29e244 bumped to version 11.0.3-beta.43 2018-12-26 14:31:01 +00:00
Suraj Shetty
8b201911b4
fix(permission): Update db_query.py (#6683) 2018-12-26 19:57:18 +05:30
Suraj Shetty
d483e87aa3
fix(permission): Update user_permission.py (#6684) 2018-12-26 19:56:43 +05:30
Frappe Bot
55576bc939 Merge branch 'staging-fixes' into staging 2018-12-26 12:58:04 +00:00
Frappe Bot
039f0b406a bumped to version 11.0.3-beta.42 2018-12-26 12:58:04 +00:00
Saurabh
a0d212988b
Merge pull request #6681 from frappe/fix-remove_skip_for_doctype_patch 
Convert dict_keys to list
 2018-12-26 18:26:24 +05:30
Suraj Shetty
bd8c3140cb
Convert dict_keys to list 2018-12-26 18:24:06 +05:30
Frappe Bot
cc7eacdaf1 Merge branch 'staging-fixes' into staging 2018-12-26 11:53:47 +00:00
Frappe Bot
1ba53ca957 bumped to version 11.0.3-beta.41 2018-12-26 11:53:47 +00:00
rohitwaghchaure
ef5791a11e
Merge pull request #6397 from surajshetty3416/staging-fixes 
Permission refactor and bug fixes
 2018-12-26 12:01:20 +05:30
Suraj Shetty
1e23e98a54 Catch KeyError in liked_with to fix failing patch 
https://travis-ci.com/frappe/erpnext/jobs/167043420
 2018-12-26 11:06:23 +05:30
Chinmay Pai
3dc57118ea fix(data-import): Import data in batches (#6673) 
* data_import: import data in a batch

data import for a lot of items (more than 200,000?) is not really appreciated by mariadb, so instead we import data in batches.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix: Fetch batch size from site_config
 2018-12-25 15:10:51 +05:30
Suraj Shetty
94a5c9417c Skip codacy warning 2018-12-25 13:27:40 +05:30
Suraj Shetty
3213393727 Display fieldname on which restriction is applied for clarity 2018-12-25 13:16:54 +05:30
Suraj Shetty
87fa40eadf Merge branch 'staging-fixes' of github.com:surajshetty3416/frappe into staging-fixes 2018-12-25 12:23:38 +05:30
Suraj Shetty
574b970afd Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-25 12:23:00 +05:30
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647) 
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
 2018-12-24 15:17:38 +05:30
pipech
4ee79078f2 fixed Cannot set Desktop Icon (#6666) 2018-12-24 14:58:31 +05:30
Zarrar
2075b2e16a add route to home in menu option (#6668) 2018-12-24 14:57:39 +05:30
rohitwaghchaure
574446e092 [Fix] Notification count not showing for the doctypes like purchase order, sales invoice (#6657) 2018-12-24 13:10:58 +05:30
Deepesh Garg
ed80e9dff1 [Fix]Quick entry with geolocation field issue fix (#6662) 
* Quick entry with geolocation field issue fix

* Codacy issue fix
 2018-12-24 13:06:30 +05:30
Faris Ansari
1d461ab5cc fix: Update datatable to 1.7.2 (#6665) 2018-12-24 13:05:58 +05:30
Rushabh Mehta
fafabac492 fix(test): test_report.py 2018-12-23 19:26:23 +05:30
Suraj Shetty
c03ba9b16a
Merge branch 'staging-fixes' into staging-fixes 2018-12-23 18:19:14 +05:30
Rushabh Mehta
5d658f251d fix(style): show some margin on headings for quill editor 2018-12-23 17:55:22 +05:30
Faris Ansari
ccea2e2b00
style: Add semicolon 2018-12-22 00:22:10 +05:30
Frappe Bot
de6b5f686c Merge branch 'staging-fixes' into staging 2018-12-21 05:45:40 +00:00
Frappe Bot
4b336622ae bumped to version 11.0.3-beta.40 2018-12-21 05:45:40 +00:00
Deepesh Garg
72e1ccc8f9 Changed modified timing to pickup changes (#6649) 
* Changed modified timing to pickup changes

* Update address.json
 2018-12-21 11:05:20 +05:30
Suraj Shetty
81911b9373
Merge branch 'staging-fixes' into staging-fixes 2018-12-20 12:27:06 +05:30
Suraj Shetty
432d22ba76 Add get_permitted_documents function 2018-12-19 19:59:58 +05:30