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

18687 commits

This branch
This branch
All branches
Author SHA1 Message Date
Saurabh
6d9fa54f0b Merge branch 'master' into develop 2019-03-20 14:30:48 +05:30
Saurabh
8134ffcb35 Merge branch 'hotfix' 2019-03-20 14:30:47 +05:30
Saurabh
1e4abd4f5b bumped to version 11.1.15 2019-03-20 15:00:47 +06:00
Suraj Shetty
76fd9939a7
Merge pull request #7091 from netchampfaris/reverse-sitemap 
feat: Flip sitemap switch
 2019-03-20 14:09:04 +05:30
Suraj Shetty
d30cd0b4b4
Merge pull request #7090 from saurabh6790/password_fix 
fix: do not check password strength while creating system manager
 2019-03-20 13:24:55 +05:30
Faris Ansari
33932b14db fix: Sitemap test 2019-03-20 13:03:23 +05:30
Suraj Shetty
1135b05cdd
Merge pull request #7093 from deepeshgarg007/auto_email_fix 
fix: Auto email report fix
 2019-03-20 12:41:40 +05:30
deepeshgarg007
47f07668cc fix: Key error handling 2019-03-20 12:10:52 +05:30
Rushabh Mehta
79e7be3303
Merge pull request #7089 from rmehta/assignment-rule-refactor 
fix(assignment-rule): try unassignment from all rules first, then try assignment
 2019-03-20 11:28:54 +05:30
deepeshgarg007
7c0bb37230 fix:Auto email report fix 2019-03-19 21:39:47 +05:30
Faris Ansari
74be94433f test: Sitemap 2019-03-19 20:46:41 +05:30
Faris Ansari
7560d90f5d fix: Add contact to sitemap 2019-03-19 20:34:28 +05:30
Faris Ansari
467bd8a8ad fix: Remove no_sitemap flag 2019-03-19 20:34:19 +05:30
Faris Ansari
479e0c979f fix: Cache sitemap_routes 2019-03-19 16:17:51 +05:30
Faris Ansari
51ece4a920 feat: Flip sitemap switch 
BREAKING CHANGE
A route is added to the sitemap if no_sitemap is not set.
This PR reverses this design. Because sitemap should contain publicly accessible pages and not utility pages.
Also, having lots of utility pages on sitemap does more harm than good.
 2019-03-19 15:12:28 +05:30
Saurabh
4ae92edfb9 fix: do not check password strength while creating system manager 2019-03-19 14:40:29 +05:30
Rushabh Mehta
5cbcdc7e3f fix(assignment-rule): try unassignment from all rules first, then try assignment 2019-03-19 09:42:08 +05:30
Suraj Shetty
53ab51a73d
Merge pull request #7087 from deepeshgarg007/table_patch 
fix: Replace NULL values with zero in tables for fields with data type INT, FLOAT or DECIMAL
 2019-03-18 15:56:18 +05:30
deepeshgarg007
48e2ff5924 fix: Code cleanup 2019-03-18 15:18:25 +05:30
Aleksas Pielikis
70ac6f5c4e fix(email): Fixed py3 email byte-content decoding (#7058) 
* Email decode from bytes fix added.

* Correction according to comments.
 2019-03-18 13:08:06 +05:30
deepeshgarg007
78deb1aec4 fix: Escape sql keywords 2019-03-18 09:27:35 +05:30
deepeshgarg007
fb49819cd7 fix: Replace NULL values with zero having data type as INT, FLOAT or DECIMAL 2019-03-18 08:47:17 +05:30
Suraj Shetty
26197ee29e
Merge pull request #6878 from Mangesh-Khairnar/privacy-data 
Feature: Personal data download and deletion
 2019-03-15 18:36:10 +05:30
Rushabh Mehta
eaaeba5df2 Merge remote-tracking branch 'upstream/hotfix' into develop 2019-03-15 14:52:09 +05:30
Rushabh Mehta
b6d2e61ff0 fix(style): frappe theme colours in bs4 and minor fix 2019-03-15 12:03:35 +05:30
Rushabh Mehta
9a3ff771bc
Merge pull request #7059 from scmmishra/desk-fixes 
feat(desk): UI changes for module cards
 2019-03-15 10:17:09 +05:30
Rushabh Mehta
1a25daf6c1
Merge pull request #7020 from ElasticRun/shift-db 
fix: compulsorily shift db
 2019-03-15 09:09:26 +05:30
Suraj Shetty
45c813222a
Merge pull request #7070 from netchampfaris/verbose-permission-message 
fix: More verbose User permission message
 2019-03-15 08:09:23 +05:30
Suraj Shetty
60c8d47388
Merge pull request #7076 from netchampfaris/fix-revert-traceback-escape 
fix: Don't escape traceback
 2019-03-14 20:35:55 +05:30
Suraj Shetty
72d82538a8
fix: typo 2019-03-14 20:34:12 +05:30
Suraj Shetty
b90c1644db
Merge pull request #7077 from netchampfaris/fix-rollup-watch-output 
fix(rollup): endsWith check for .js and .vue files
 2019-03-14 20:28:25 +05:30
Suraj Shetty
90c3d43347
Merge pull request #7079 from netchampfaris/fix-report-datatable 
fix: Report fixes
 2019-03-14 20:26:58 +05:30
Suraj Shetty
a1082554ac
Merge pull request #7080 from netchampfaris/fix-report-datatable-hotfix 
fix: Report fixes
 2019-03-14 20:25:25 +05:30
Prateeksha Singh
604d099278
Merge pull request #7081 from Mangesh-Khairnar/watchjs-fix 
fix: display js rebuilding logs in bench watch
 2019-03-14 19:22:54 +05:30
Aditya Hase
56f6bcc261
fix(desk): Pop data from keyword arguments when it isn't needed (#7082) 2019-03-14 18:53:29 +05:30
Faris Ansari
58c68bb1fd
Merge pull request #7047 from adityahase/measure-tests 
feat(tests): Record time required for each test
 2019-03-14 17:40:45 +05:30
Aditya Hase
e358841d3c fix(python3): super() backward compatibility fix 2019-03-14 16:52:13 +05:30
Faris Ansari
b85775c7d0
Merge pull request #7073 from adityahase/enhance-recorder 
Recorder Enhancements
 2019-03-14 15:03:45 +05:30
Aditya Hase
d0f83f3420 style: Linting fixes 2019-03-14 14:49:15 +05:30
Faris Ansari
9594c300e1 fix: Report fixes 
- Blank ID column when switching from another report
- Print should show sorted and filtered rows
 2019-03-14 14:26:02 +05:30
Mangesh-Khairnar
37f28685aa fix: display js rebuilding logs in bench watch 2019-03-14 14:22:24 +05:30
Faris Ansari
1ebd633805 fix: Report fixes 
- Blank ID column when switching from another report
- Print should show sorted and filtered rows
 2019-03-14 14:11:34 +05:30
Aditya Hase
53ee408e39 chore(recorder): Add pygments to requirements.txt 2019-03-14 14:00:54 +05:30
Faris Ansari
cd22dd91d3 fix(rollup): endsWith check for .js and .vue files 
JS files didn't pass the endsWith check and were not logged in console.
 2019-03-14 13:22:27 +05:30
Faris Ansari
eeb8fe98eb fix: Don't escape traceback 
Traceback breaks when there is a python object <frappe.model.Document>.
This is occasional, and other tracebacks are not clean, so reverting.
 2019-03-14 13:20:11 +05:30
scmmishra
dbf7b7bd93 Merge branch 'develop' of https://github.com/frappe/frappe into desk-fixes 2019-03-14 12:00:58 +05:30
Shivam Mishra
9e5bff71b0
Merge pull request #7075 from frappe/revert-7072-fix-rest 
Revert "fix(request): Pop data from form_dict when it isn't needed"
 2019-03-14 12:00:10 +05:30
Shivam Mishra
77abf5fc19
Revert "fix(request): Pop data from form_dict when it isn't needed" 2019-03-14 11:58:46 +05:30
scmmishra
ca30cdc0d4 style: Added new line at EOF 2019-03-14 11:45:06 +05:30
scmmishra
53e1ecdb02 fix: Removed conflicts, minor style fixes 2019-03-14 11:43:11 +05:30