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

17342 commits

This branch
This branch
All branches
Author SHA1 Message Date
Deepesh Garg
f79e48ee40 build: Upgraded frappe-datatable (#6732) 
* build: Upgraded frappe-datable

* Update datatable to 1.7.3
 2019-01-10 15:37:04 +05:30
Nabin Hait
f970a9fd61 fix(comments mention): Fix ascii issue in comments mention (#6742) 2019-01-10 15:34:39 +05:30
Saurabh
22b1987dfa bumped to version 11.0.3-beta.48 2019-01-08 16:37:36 +06:00
Saurabh
f8810bbf9d
Merge pull request #6738 from surajshetty3416/fix-image-upload 
fix: No permission for System Settings while uploading image
 2019-01-08 15:34:19 +05:30
Suraj Shetty
cfca17c1be Commonify code 2019-01-08 14:27:16 +05:30
Nabin Hait
1d686e470b
fix(comp_dashboard): Company dashboard if goal is zero. (#6719) 2019-01-08 14:16:04 +05:30
Deepesh Garg
900392efa3 fix : Auto email report fix for XLSX and CSV format (#6729) 2019-01-08 14:09:10 +05:30
Suraj Shetty
c038318446 Remove unwanted network request to check setting 
- check use_socketio_to_upload_file flag from
frappe.boot.sysdefaults.use_socketio_to_upload_file
instead of making network request
 2019-01-08 13:03:00 +05:30
Deepesh Garg
c274882fd0 Display all filters in report view (#6722) 2019-01-07 08:56:36 +05:30
Frappe Bot
0e5d378a8c Merge branch 'staging-fixes' into staging 2019-01-05 09:03:59 +00:00
Frappe Bot
727e000ab8 bumped to version 11.0.3-beta.47 2019-01-05 09:03:59 +00:00
Suraj Shetty
9adbbd44c8 fix(permission): Role permission check with if_owner enabled (#6726) 
* Allow user to access list even if there is only a docperm with if owner enabled

* Add test to check if user gets access to the list

- User should be able to access list even if the user has only
 role for which docperm is created with if_owner check

* Remove commented code
 2019-01-05 14:31:40 +05:30
Saurabh
aa2f23efc4
Merge pull request #6724 from surajshetty3416/fix-patch-for-mac-users 
fix(patch): Move frappe.db.commit() after transactional query
 2019-01-04 13:34:04 +05:30
Suraj Shetty
f42ca945d3 fix(patch): Move frappe.db.commit() after transaction statement 2019-01-04 13:28:30 +05:30
Sagar Vora
f91c277c86
Merge pull request #6723 from surajshetty3416/fix-patch-for-mac-users 
fix: rename view log patch for mac users
 2019-01-04 12:12:23 +05:30
Suraj Shetty
eb2b91d302 Fix rename view log patch for mac users 
for mac users direct renaming would not work
since mysql for mac saves table name in lower case,
so while renaming `tabView log` to `tabView Log` we get
"Table 'tabView Log' already exists" error

# more info https://stackoverflow.com/a/44753093/5955589
https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_lower_case_table_names
 2019-01-04 11:58:52 +05:30
Sagar Vora
6c1f2a236c
Merge pull request #6716 from saurabh6790/fix_modified_date 
fix: update modified date for Dropbox Settings Doctype
 2019-01-04 10:58:24 +05:30
Sagar Vora
a45a37b95a
Merge pull request #6721 from surajshetty3416/fix-patch 
fix(patch): Rearrange patch execution to fix a patch failure
 2019-01-04 09:56:39 +05:30
Suraj Shetty
281b213f9d Rearrage patch execution to fix a patch failure 
- Should fix "Column 'apply_user_permissions' cannot be null" while
 executing reload_and_rename_view_log patch
 2019-01-04 07:40:06 +05:30
Rushabh Mehta
d272a5a76b fix: prepared report should not open in a new tab 2019-01-03 18:05:54 +05:30
Saurabh
f5607f5b1b fix: update modified date for Dropbox Settings Doctype 2019-01-03 16:45:39 +05:30
Sagar Vora
53b11e3d0d fix(core): rename "View log" to "View Log" and patch (#6708) 2019-01-03 16:34:08 +05:30
Sagar Vora
b12abda507 fix(chat): register last_seen only if last_message exists (#6712) 2019-01-03 12:55:09 +05:30
Shivam Mishra
12798c9ee5 Fixed Addresses and Contacts Report (#6651) 
* Fixed Addresses and Contacts Report

* minor change

* [Report Fix] Added test cases for Addresses and Contacts Report

* [Report Fix] Fixed a small typo 'Doctype' - 'DocType'

* [Report Fix] Fixed code formatting

* [Code Formatting] Removed unused variables

* [Code Formatting] Removed unused variable doc
 2019-01-02 09:12:07 +05:30
Shivam Mishra
b86663490c [Base 64 Fix]: Added check for base64 image in abs_url (#6688) 
* [Base 64 Fix]: Added check for base64 image in abs_url

The abs_url filter used in website appends a '/' before every link.
This broke the website image display.

* fix(abs_url): add check for all image types

* Update utils.py
 2019-01-02 09:11:05 +05:30
Charles-Henri Decultot
06ea7499ab [Fix] Transaction log corrections (#6693) 
* Transaction log corrections + improvements

* Remove unused import

* Timestamp format

* Add system manager to permissions
 2019-01-02 09:10:50 +05:30
Faris Ansari
8e854fa494 fix: Delete deprecated App Installer page (#6686) 2019-01-02 09:08:49 +05:30
Suraj Shetty
d3722cdaee test: Add code to test build_match_conditions (#6704) 
* Add code to test build match condition

* Fix typo

* Make quotes consistent

* Reorganize

* Fix test
- Add user permission for record created during test

* Reset session user as admin

* Fix a year dependent test
- Remove hardcoded year from test
 2019-01-01 15:04:30 +05:30
Saurabh
e9a1ad5081 bumped to version 11.0.3-beta.46 2019-01-01 14:56:16 +06:00
Suraj Shetty
eacaea6a0d Add accidently removed match filters (#6701) 
- Fixes "No user permission applied for Reports" issue
 2018-12-31 20:07:13 +05:30
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