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

16336 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ameya Shenoy
dc41c2a23a
Merge branch 'master' into develop 2018-08-01 06:22:48 +00:00
Ameya Shenoy
aeed481051
Merge branch 'hotfix' 2018-08-01 06:22:44 +00:00
Ameya Shenoy
ecd881628f bumped to version 10.1.44 2018-08-01 06:22:44 +00:00
Ameya Shenoy
9bc18213a4
Merge pull request #5903 from rmehta/codingCoffee-strict_email 
[email] smtp connection per sender
 2018-08-01 11:40:34 +05:30
Nabin Hait
854b068ee9 Fixed merge conflict 2018-07-31 13:15:15 +05:30
Faris Ansari
bf4a184e85 UI Fixes (#5893) 
* Listview

- Reset paging when filters are set

* Broken Image

- Bigger icon for no-image
 2018-07-31 12:55:34 +05:30
Faris Ansari
1360767899 Timeline (#5895) 
- Show who assigned whom
 2018-07-31 12:55:03 +05:30
Prateeksha Singh
ec8677e9c2 add depends_on field in webform (#5896) 2018-07-31 12:49:35 +05:30
Nabin Hait
288b98ca76 Merge branch 'hotfix' 2018-07-31 12:40:42 +05:30
Nabin Hait
cdfba6fd4c bumped to version 10.1.43 2018-07-31 13:10:42 +06:00
Rushabh Mehta
9439b21cce [enhance] optional home page for website user 2018-07-31 11:40:50 +05:30
Prateeksha Singh
5be6036b0f
Merge pull request #5889 from pratu16x7/data-migration-run 
Post process in Data migration run
 2018-07-31 10:51:52 +05:30
Prateeksha Singh
c8c442ccef [data-mig-run][fix] publish complete 2018-07-31 10:43:14 +05:30
Rushabh Mehta
a639001df0 [default list] use in_list_view fields 2018-07-30 23:17:07 +05:30
Rushabh Mehta
4367a27181 [fix] rename doctype patch 2018-07-30 19:17:24 +05:30
Prateeksha Singh
f33e3e1b43 [data-mig-run] publish realtime specified trigger 2018-07-30 16:23:16 +05:30
Rushabh Mehta
3bc8479438 [add] get fields in webform 2018-07-30 16:17:43 +05:30
Rushabh Mehta
62e313f472
[rename] move files with doctype rename (#5881) 2018-07-30 14:33:01 +05:30
Shreya Shah
4c20d1f68f using regex instead of soup to parse pdf page margins (#5883) 
* using regex instead of soup to parse pdf page margins

* Fix codacy
 2018-07-30 14:32:33 +05:30
KanchanChauhan
602bdd0bea [Minor Bug Fix]Query Report Fix (#5890) 2018-07-30 14:07:45 +05:30
Zarrar
389739b5bb Bold email mentions in comment section (#5879) 2018-07-30 12:01:46 +05:30
Prateeksha Singh
8ade18509c [data-mig-run] pass stats to postprocess 2018-07-29 17:58:30 +05:30
Faris Ansari
4912144364
Show review input only if rating is set (#5887) 2018-07-29 17:52:02 +05:30
Faris Ansari
aade8629e0
Add font size utilities (#5888) 2018-07-29 17:51:43 +05:30
Prateeksha Singh
0ad04ce02b [migration-run] run Runs with a remote id 
- to update status remotely in postprocess
 2018-07-29 13:52:54 +05:30
Prateeksha Singh
158d324b76 [data-migration] Make Runs observable 
- Allow Runs to execute a post-process specified in Migration Plan
 2018-07-28 22:34:55 +05:30
Faris Ansari
1922dcc87f Add broken images handler (#5884) 
- Also add flex-column class utility
 2018-07-27 19:03:49 +05:30
Zarrar
88b659d3ac
Merge pull request #5880 from Zlash65/min-fix 
[Minor] Default for items should be empty list
 2018-07-27 13:12:55 +05:30
Zlash65
8d6aef871a minor fix 2018-07-27 13:06:42 +05:30
Ameya Shenoy
92f288bc2f added 2 fucntions to frappe.utils (#5877) 
* added 2 fucntions to frappe.utils

- get_db_count: to get the db count of any DocType
- call: a wrapper for frappe.call

* Update __init__.py
 2018-07-27 11:55:58 +05:30
Sagar Vora
5ddcf40a11 [python3] let PdfFileReader handle file opening (#5878) 
In Python 3, file() is deprecated. 
PdfFileReader can internally handle file opening and closing, so file() no longer necessary.

See description of stream parameter here:
https://pythonhosted.org/PyPDF2/PdfFileReader.html#PyPDF2.PdfFileReader

Alternatively, open() can be used.
 2018-07-27 11:55:48 +05:30
Zarrar
c0b7712b04 [Enhance] Add items to dashboard through client-side scripting (#5861) 
* add items in dashboard as need be
- doctypes can be added throguh js side if needed

* refresh handles open count
 2018-07-27 10:47:06 +05:30
Faris Ansari
737330247e [website] Load chat only if chat is enabled (#5874) 
* [website] Load chat only if chat is enabled

* Update website.js
 2018-07-27 10:43:35 +05:30
Prateeksha Singh
edde827a95
Merge pull request #5875 from shreyashah115/text-muted 
Add text-muted property
 2018-07-26 17:39:17 +05:30
Shreya
0057537f9b Add text-muted property 2018-07-26 17:30:20 +05:30
Rushabh Mehta
e2b802f0f1
Revert "[First Cut] Address Info for customer (#5872)" (#5873) 
This reverts commit 9b78824946.
 2018-07-26 12:58:43 +05:30
Saurabh
9b78824946 [First Cut] Address Info for customer (#5872) 2018-07-26 12:47:30 +05:30
Faris Ansari
98a03f9f0a Use "POST" request in ListView (#5870) 2018-07-26 12:39:23 +05:30
Saurabh
d46fd09b44 [WIP][Enhancement] Provision to pull reports from slave systems (#5844) 
* [Enhancement] Provision to pull reports from slave systems

* [fix] check if master_db exists

* Pull list view from slave system
 2018-07-24 17:42:21 +05:30
Rushabh Mehta
aef1046b1f
[email] remove style from email so it does not mess up desk (#5860) 
* [email] remove style from email so it does not mess up desk

* [fix] tests

* [fix] image parsing, #savedbyatestcase

* [fix] timeout issues in test

* [fix] timeout issues in test
 2018-07-24 17:00:14 +05:30
Fisher Yu
e7ddbb7c5e [bug fix] Label in dashboard.html not translated (#5859) 
* Update translate.py

New label introduced via dashboard html template file can not be translated, because the logic to fetch to be translated label for the doctype does not include dashboard.html

* Update translate.py
 2018-07-24 17:00:05 +05:30
Shreya Shah
b2fbb35efa Fix comment mentions to avoid html tags (#5865) 
* Fix comment mentions to avoid html tags

* Add a test case
 2018-07-24 16:34:18 +05:30
Prateeksha Singh
0c5f5dcb92 [prepared-report] see if report took more than 10 seconds (#5864) 
* [prepared-report] see if report took more than 10 seconds

* Update query_report.py

* Update query_report.py
 2018-07-24 16:30:17 +05:30
Dominik Ottenbreit
feee6cc07e Create more clear docstring for trim_tables (#5863) 
* Create more clear docstring for trim_tables

Current DocString was not clear enough. I updated the description to give background information on why this function may be needed.

* Update meta.py
 2018-07-24 16:30:00 +05:30
Zarrar
3ee8f396c9 minor fix for translation check (#5866) 2018-07-24 16:28:35 +05:30
Nabin Hait
2b14116d83
Fixed webform perms and set defaults based on url params (#5856) 2018-07-24 11:06:04 +05:30
Rushabh Mehta
b8a936f998 [fix] [style] update-password.html 2018-07-24 10:58:17 +05:30
Faris Ansari
15482dce95 Factory: class.extend -> es6 class (#5857) 2018-07-24 10:39:40 +05:30
Prateeksha Singh
8b2aa69203 [prepared-report] show tabular filters (#5851) 
* [prepared-report] show tabular filters

* [form] prepared report interaction updates

* [prepared-report] hide ref doctype
 2018-07-24 10:36:59 +05:30
Prateeksha Singh
0d8b9c8653 Revert "Modules dropdown" (#5855) 
* Revert "bench use <site> should check if the  site exists (#5849)"

This reverts commit 630858eb96.

* Revert "Add option to convert password to use ASCII instead of Unicode when needed by smtp server config (#5793)"

This reverts commit 191684f6a5.

* Revert "Token based authentication (#5752)"

This reverts commit abd3333bae.

* Revert "[minor] test fix"

This reverts commit b6ba3915a6.

* Revert "allow null when time field is not required (#5832)"

This reverts commit 803f6b0c7b.

* Revert "remove duplicate field entry for fieldname two_factor_authentication (#5846)"

This reverts commit 6a06e65d20.

* Revert "Query Report (#5845)"

This reverts commit f870a0bd25.

* Revert "Modules dropdown (#5767)"

This reverts commit 6f908b3443.
 2018-07-23 15:34:34 +05:30