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

1360 commits

Author SHA1 Message Date
Rushabh Mehta
08d5d9ae2c fix: default None to empty string for markdown conversions 2019-02-26 15:07:08 +05:30
Suraj Shetty
ce18b5ab2f
Fix minor formatting 2019-02-21 12:10:49 +05:30
Himanshu Warekar
121ffc0cf7 renamed function to get_weekdays 2019-02-21 11:17:52 +05:30
Himanshu Warekar
a6ce45240d add function to get weekdays 2019-02-21 11:11:38 +05:30
Aditya Hase
c08bdd88a8 fix: Jinja template error (#6958) 
https://github.com/frappe/frappe/pull/6957
 2019-02-19 14:22:01 +05:30
Suraj Shetty
c19befeb5b
fix: Don't assume async value == True 
fix: Don't assume async value == True
 2019-02-18 08:45:38 +05:30
Rushabh Mehta
fcaadf78ad
Merge pull request #6891 from rmehta/refactor-comments 
BREAKING CHANGE: Comments are now handled separately from Communication and Version
 2019-02-16 16:54:16 +05:30
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Rushabh Mehta
e850721d05
Merge pull request #6843 from Zlash65/enh-treeview 
feat: Minor additional enhancements to Treeview
 2019-02-15 14:30:38 +05:30
Aditya Hase
683be9e096 feat(error-report): Collect frame locals in error report (#6938) 
* feat(error-report): Collect frame locals in error report

* style: Linting fixes
 2019-02-15 14:24:08 +05:30
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30
Nabin Hait
6e659653a9 fix: filter object to list 2019-02-08 12:27:00 +05:30
Rushabh Mehta
ae097e5139 fix: tests, check for spam comments 2019-02-07 16:35:50 +05:30
Himanshu Mishra
8c40a59fde
Merge pull request #1 from frappe/develop 
Merge develop into patch-1
 2019-02-06 22:06:34 +05:30
Saif
1bb4c6275f fix: Don't send attachment/download header with PDF files (#6881) 2019-02-06 12:48:41 +05:30
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Chinmay Pai
6377bdf6db fix(data_import): use absolute url (#6875) 
there is no need to prepend the sitename to the url, since browsers/html are/is smart enough to handle absolute urls.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-05 10:53:31 +05:30
Saurabh
96bff3cd9e fix: jinja local.conf data leak (#6884) 2019-02-05 10:52:00 +05:30
Zlash65
1d8f35ce97 fix: use orm instead of query 2019-02-01 15:53:01 +05:30
Zlash65
04b3a5cabc feat: added a utility method to get all the descendants of a node 2019-02-01 12:14:45 +05:30
Zlash65
a7e127e498 fix: get ancestors for a node with more filters 2019-02-01 12:14:45 +05:30
Chinmay Pai
9873c04231 fix(sync_global_search): decode json object as str (#6867) 2019-01-31 15:16:47 +05:30
Aditya Hase
57196a8bbe fix(website): Enable socketio on website (for file upload) (#6866) 2019-01-31 13:54:42 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
Rushabh Mehta
0704928fd8 fix(global search): fallback if redis is not yet started 2019-01-30 11:26:07 +05:30
Rushabh Mehta
d09792c606 fix: refactor global search to not insert after every commit (#6845) 
* fix: refactor global search to not insert after every commit

* feat: configuration to disable_global_search
 2019-01-30 11:13:51 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Sagar Vora
fe3fe0a4b8 Merge branch 'master' into staging-fixes 2019-01-29 17:08:58 +05:30
Shivam Mishra
dad1c04aae feat: Deprecate In App Help (#6801) 
* [feat] Removed help from toolbar.js

* [feat] Removed help from global search

* [feat] redirected search in help to docs website

[] Url needs to be configurable from hooks

* [Feat] Removed search functions for help

* [fix] Help links not redirecting

* [feat] Modified "Help" menu on desk toolbar

* [feat] Removed docs search from desk toolbar

* Removed Search from toolbar.js

* Removed /search_docs from website

* Removed help from migrate

* Deprecated help from command utils

* Removed help.py

* Removed help setup from travis.yml

* [fix] Fixed formatting issues

* [fix] Deleted commented code from toolbar.js

* [fix] Minor link fix

* [Fix] Fixed a small typo

* Removed docs_app dependency from pathces

* [fix] Removed commented code

* [fix] Typo in function name

* fix: remove commented code

* [fix] Changed 'Deprecated' message to 'Removed'

Removed will be the correct term instead of deprecated
 2019-01-29 14:59:39 +05:30
Rushabh Mehta
6c7be62f24 fix: file upload via url 2019-01-29 12:42:17 +05:30
Sagar Vora
3121a60292
fix: remove trailing whitespace. 2019-01-29 11:00:04 +05:30
Suraj Shetty
5af8d4d1bb
Merge pull request #6824 from netchampfaris/feat-is-set-is-not-set 
feat: New filter type "Is Set", "Is Not Set"
 2019-01-29 07:27:57 +05:30
Aditya Hase
36bc812c94 fix(security): Make server-side PDF rendering tighter 2019-01-28 12:41:21 +05:30
Aditya Hase
837bfc0995 fix(unicode): Import unicode_literals in every file (#6805) 
* fix(unicode): Import unicode_literals in every file

* fix(unicode): Test if safe_json_loads return unicode instead of bytes
 2019-01-25 11:56:27 +05:30
Faris Ansari
5ffdeb19fc feat: New filter type "Is Set", "Is Not Set" 2019-01-24 14:26:27 +05:30
Zarrar
8bdb0dc5f8 feat: Download json file (#6793) 
* feat: download file as json type

* fix: make raw type files downloadable
 2019-01-23 16:51:02 +05:30
Aditya Hase
6b72faf44f style: Linting fixes (#6809) 
* style: Remove unused imports

* style: Remove unused local variables
 2019-01-23 16:39:55 +05:30
Sagar Vora
47c0d10631 Merge branch 'staging' into develop 2019-01-22 15:43:40 +05:30
Deepesh Garg
2ecd805e0e fix: Router options for multiple values (#6779) 
* fix(list_view): Router option support for multiple filters

* fix(utils): fix in get_link_to_report for route options

* fix(Codacy): Added semicolon and fixed indentation

* fix(route_options): Bug fix

* fix(router_options): Added safe encoding for get_link_to_report

* fix(router_options): fixed encoding issue

* Remove encoding

* fix(list_view): fix for find in awesomebar
 2019-01-22 14:27:30 +05:30
Faris Ansari
987a604749 fix: Use ImportError instead of ModuleNotFoundError (#6797) 
- ModuleNotFoundError is available in python 3.6
 2019-01-21 17:57:38 +05:30
sahil28297
3644f5f4cd feat: relative timeframe filters (#6792) 
* feat: relative timeframe filters

* fix: resolve syntax errors

* fix: Translated options
 2019-01-21 16:02:40 +05:30
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Saurabh
2fbf59522e Merge branch 'master' into staging-fixes 2019-01-15 19:05:42 +05:30
Himanshu Mishra
3587edd484
Use pop instead of condition 2019-01-14 13:15:12 +05:30
Himanshu Mishra
1014fc621e
Don't assume async value 
If async was passed in it was being set as true even if the paased value is false. This commit fixes the same.
 2019-01-14 12:54:19 +05:30
Saurabh
835fc2c1a3 Merge branch 'staging' into develop 2019-01-08 16:09:28 +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
817d0744f8 feat: Function for linking reports with filters (#6718) 2019-01-08 10:43:27 +05:30
Nabin Hait
5590193c8d fix(version): getting version update (#6717) 
* fix(version): getting version update

* fix(version): getting version update
 2019-01-07 08:57:04 +05:30
Faris Ansari
ae57e75b0e fix(is_html): Return false if text is not string 2018-12-30 22:43:21 +05:30