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

17462 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faris Ansari
727e24fbb6 feat: Add metatags on every webpage 
- Add keywords field in Web Page for SEO
 2018-12-14 10:55:11 +05:30
Faris Ansari
5cb91ae57b Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-14 10:07:15 +05:30
Saurabh
b727233948 Merge branch 'staging' into develop 2018-12-13 10:37:25 +05:30
Saurabh
f42c5a83da bumped to version 11.0.3-beta.37 2018-12-13 11:02:39 +06:00
Aditya Hase
a23bd34e10 fix(report-view): Update Reports dropdown on creation of a Report (#6604) 
This is done by updating frappe.boot.user.all_reports on creation of Report

Also to ensure that reports are properly ordered,
report list is explicitly sorted by name
 2018-12-12 15:43:25 +05:30
Faris Ansari
5693080940 [UX] Report builder (#6608) 
* fix: Remove fixed height check

* fix(sort-selector): Set sort arrow correctly on load

* fix(query-report): Simplify help message

* fix(report-builder): Set dirty state when report settings are changed

- Also save the page_length when saving the report
 2018-12-12 14:11:23 +05:30
Sagar Vora
36364fa54d fix(ui): make footer appear at end of page (#6610) 2018-12-12 14:10:23 +05:30
Rushabh Mehta
0f5f04b409
fix(tests): one more attempt to fix the erratic test_scheduler.py (#6612) 
* debug(test_scheduler): please fail

* fix(tests): use flags instead of globals since cache is not trhead-safe
 2018-12-12 14:09:50 +05:30
Prateeksha Singh
f4fc85eb87
Merge pull request #6447 from pratu16x7/staging-fixes-make-records 
Add make_records()
 2018-12-11 21:08:06 +05:30
Prateeksha Singh
61f762d0ac [setup] remove debug 2018-12-11 20:32:15 +05:30
Prateeksha Singh
25f2bb0afd [setup] remove execution time 2018-12-11 16:29:49 +05:30
Prateeksha Singh
8d5ee593a5 [router] clarify show desk for no route 2018-12-11 16:27:37 +05:30
Prateeksha Singh
c964d1420c [custom-field] Admin-owned programmed fields 2018-12-11 16:10:02 +05:30
Prateeksha Singh
bf57a4d201 [fix] remove print statements to not raise unicode issues 2018-12-11 16:10:02 +05:30
Prateeksha Singh
ec9eb6d3ad [fix] expand dropdown height 2018-12-11 16:10:02 +05:30
Prateeksha Singh
31c9e5a078 [setup] check skip_setup_wizard from common_site_comfig 2018-12-11 16:10:02 +05:30
Prateeksha Singh
1f1e70d335 [fix] Better multiple root node message 2018-12-11 16:10:02 +05:30
Prateeksha Singh
76386603a4 [setup] Address template message if setup complete 2018-12-11 16:10:02 +05:30
Prateeksha Singh
f05486f814 [comment][fix] add pre-existing clear method 2018-12-11 16:10:02 +05:30
Prateeksha Singh
7b4a4bc5b7 [setup] startup setup dialog if setup not complete 2018-12-11 16:10:02 +05:30
Prateeksha Singh
0ccb159c6f Add make_records() 2018-12-11 16:10:02 +05:30
Prateeksha Singh
50af0dc388 remove setup progress 2018-12-11 16:10:02 +05:30
Saurabh
5dceb7fb42 provision to setup password while adding system manager 2018-12-11 16:10:02 +05:30
Saurabh
8dafb6dc05 [fix] toggle title based on setup status 2018-12-11 16:10:02 +05:30
Frappe Bot
c1ce84e9fc Merge branch 'staging' into develop 2018-12-11 09:53:52 +00:00
Frappe Bot
6859a73d32 Merge branch 'staging-fixes' into staging 2018-12-11 09:53:52 +00:00
Frappe Bot
01b91003f3 bumped to version 11.0.3-beta.36 2018-12-11 09:53:52 +00:00
Faris Ansari
41b7267e4e fix: Email Reply Behaviour (#6578) 
* fix: Email Reply Behaviour

- Now email will be appended to the next reply but it would be clipped
at 20k characters.
- The reply part of the email would not be shown in  the timeline.
- If the email is composed using the "New Email", the last email is not
appended to the email

* fix: Convert into multiline string

* fix: var to let

* fix: var to let
 2018-12-11 13:40:25 +05:30
Rushabh Mehta
dad0b84847
fix(patch): check if table exists for old prepared reports (#6605) 
* debug(test): test_scheduler_events

* fix(patch): check if table exists for old prepared reports

* debug(tests): add comments for debug
 2018-12-11 11:08:50 +05:30
Faris Ansari
c1bd405afc Fix: Query Report (#6603) 
* fix: Update frappe-datatable to 1.7.0

- Fix filtering with sorting
- Equals keyword for numeric columns

* fix: Show tip for inline filtering
 2018-12-11 10:14:21 +05:30
Frappe Bot
a60cb001f6 Merge branch 'staging' into develop 2018-12-10 13:05:59 +00:00
Frappe Bot
306ca0f446 Merge branch 'staging-fixes' into staging 2018-12-10 13:05:59 +00:00
Frappe Bot
d6667da7ed bumped to version 11.0.3-beta.35 2018-12-10 13:05:59 +00:00
rohitwaghchaure
8c0fead00e feat: Added disabled field in the address (#6548) 2018-12-10 18:19:09 +05:30
Saif
58d0e8507d Allow setting MariaDB root user and pass (#6599) 2018-12-10 17:53:00 +05:30
Faris Ansari
e71d412fc8 fix: Totals row in Query Report (#6590) 
* fix: Totals row in Query Report

* fix: Remove quotes around Total
 2018-12-10 17:21:02 +05:30
rohitwaghchaure
19453b8862 [Fix] Component not getting in the refresh event in the employee transfer doctype (#6601) 2018-12-10 16:56:03 +05:30
Faris Ansari
7598c37a2b
Merge pull request #6598 from Thunderbottom/prepared-report-file-fix 
prepared_report: fix file-api reference
 2018-12-10 12:04:55 +05:30
Chinmay Pai
b00df7783d
prepared_report: fix file-api reference 
this removes the unnecessarily declared get_file() method, favoring the file-api get_content() method. also removes a reference to the deprecated file_manager.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-12-09 11:45:53 +05:30
Faris Ansari
cfa2e7613f fix: Replace file_manager api with file doc api 2018-12-09 11:31:12 +05:30
Saurabh
7b7a492380 Merge branch 'staging' into develop 2018-12-07 17:56:57 +05:30
Saurabh
dc2cc5c177 bumped to version 11.0.3-beta.34 2018-12-07 17:53:24 +06:00
Faris Ansari
c2c13f1e5c
Merge pull request #6482 from adityahase/prepared-report-fix 
fix(prepared-report): Prepared Report Enhancements
 2018-12-07 16:49:26 +05:30
Faris Ansari
f23700d33a
Merge pull request #6586 from Thunderbottom/email-attachment-fix 
communication: fix attachments in email queue and generated reports
 2018-12-07 16:38:05 +05:30
Faris Ansari
3cb3bc4bb6
Merge pull request #6589 from netchampfaris/query-report-fixes-4 
fix: Update Datatable to 1.6.1
 2018-12-07 16:33:26 +05:30
Faris Ansari
58dc851e8f
Merge branch 'staging-fixes' into prepared-report-fix 2018-12-07 16:15:43 +05:30
Faris Ansari
5d3c739145 fix(Quill): Use pre tag instead of div (#6585) 2018-12-07 15:55:43 +05:30
Faris Ansari
a4e30abac2 fix: Update Datatable to 1.6.1 2018-12-07 15:30:18 +05:30
Aditya Hase
8006fe4e83 style: Linting fixes 2018-12-06 21:20:46 +05:30
pengfeiqin
b9d6e2d1ea fix: deferred insert json.loads() typeError (#6577) 2018-12-06 20:14:51 +05:30