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

17707 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Suraj Shetty
d1418781fa
Merge pull request #6783 from netchampfaris/fix-quill-ol-to-ul 
fix(quill): Convert ol to ul before sending the value to server
 2019-01-18 13:42:04 +05:30
gshmu
151ec5efa7 fix: Msgprint with multiple messages should also consider indicator (#6780) 
* fix had title and indicator but array message.

* fix: Pass object to msgprint directly
 2019-01-18 13:33:28 +05:30
Faris Ansari
0dfd3ae0ae fix(quill): Convert ol to ul before sending the value to server 2019-01-18 13:00:20 +05:30
Nabin Hait
1c30523869 Fix: merge conflict 2019-01-18 09:55:39 +05:30
Suraj Shetty
4086d2edef
Merge pull request #6782 from netchampfaris/misc-fixes-6 
fix(timeline-item): User image urls dont load if they have a space
 2019-01-18 07:09:09 +05:30
Faris Ansari
e9b33630e9 fix(timeline-item): User images dont load if they have space in the url 2019-01-17 18:04:15 +05:30
Saif
a9b782b861 fix(Caching): Clear document_cache in clear_doctype_cache (which is called from bench migrate) (#6772) 2019-01-17 12:21:41 +05:30
Saurabh
d55d33ec9e fix: syntax-fix treat obj as list (#6776) 2019-01-16 18:57:22 +05:30
sahil28297
6d2b16cf42 fix(minor): assign_to field disappears while assigning a task/issue (#6775) 
* fix(minor): assign_to field while assigning

* fix: remove whitespaces
 2019-01-16 18:50:14 +05:30
Suraj Shetty
bb7a2f04ac
Merge pull request #6769 from netchampfaris/dt-date-filter-fix 
fix: DataTable date filter
 2019-01-16 14:23:01 +05:30
rohitwaghchaure
45fbd07af1 fix: increased threshold for making report as prepared report (#6773) 2019-01-16 12:04:40 +05:30
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Saurabh
cb089b3154 bumped to version 11.0.3-beta.49 2019-01-15 19:44:05 +06:00
Saurabh
2fbf59522e Merge branch 'master' into staging-fixes 2019-01-15 19:05:42 +05:30
Saurabh
480b31587d bumped to version 10.1.69 2019-01-15 19:35:41 +06:00
rohitwaghchaure
4a20b550be
Merge pull request #6751 from rohitwaghchaure/emails_are_not_fetching 
fix: Email inbox, system not pulling the latest emails
 2019-01-15 18:46:50 +05:30
Faris Ansari
c99726a3c2
fix(TableMultiSelect): Minor bugs (#6730) 
* fix(TableMultiSelect): Minor bugs

- Show dropdown immediately after selecting a value
- Selecting first value in a new Form had no effect
- Delete last value on backspace

* fix: comment

* test(Table MultiSelect): Add tests, update database file

* test: Fix database name

* test: Fill description first
 2019-01-15 13:34:29 +05:30
Aditya Hase
14cedc40ca fix(auth): Decode username, password obtained from cache (#6770) 2019-01-15 11:11:34 +05:30
Aditya Hase
220ac9a137 fix(list-view): Cast docnames to str before sorting (#6766) 
In Python 3 str and non-str comparison is not allowed.

Bulk delete operation fails when selected docnames meet following condition
1. at least on name can be casted to int or other types e.g. "1", "3123423524", "1.0"
2. at least on name that cannot be casted to other types e.g. "A", "56cd83dab1"

The root cause is $.data() which forcefully casts data-name to non string types when possible
 2019-01-14 16:44:54 +05:30
Faris Ansari
239d2dcfce style: missing semicolon 2019-01-14 14:19:52 +05:30
Faris Ansari
7e36e92148 fix: Custom Date filters in DataTable 
Date comparison won't work with simple string comparison. Now, datatable allows to hook into how cell values are compared.
 2019-01-14 14:08:48 +05:30
Rushabh Mehta
61b7b1c0f4 fix(patch): set_backup_limit.py 2019-01-11 16:23:32 +05:30
Rushabh Mehta
258c59c218 fix(ui): default icon for Web Page 2019-01-11 12:11:29 +05:30
Sagar Vora
fff2c5f6f4
fix: message.seen not a function, replace with valid function (#6753) 2019-01-10 18:27:36 +05:30
Rohit Waghchaure
59549eb9df [Fix] Emails are not fetching 2019-01-10 16:01:36 +05:30
Saurabh
ef7cb64fb4
Merge pull request #6747 from saurabh6790/requirement-fixes 
fix(requirements.txt): block oauthlib package version to 2.1.0
 2019-01-10 16:01:30 +05:30
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
Suraj Shetty
4c9ce1701c fix: Remove quotes from desktop icon options (#6746) 
* Show icon label instead of value

* Replicate link, icon & color while making a user copy of icon
 2019-01-10 15:32:42 +05:30
Saurabh
ebca5aabdb fix: block oauth package version to 2.1.0 2019-01-09 12:54:20 +05:30
Suraj Shetty
bd7dce75c3
Merge pull request #6700 from Kratos-Freyja/develop 
fix: Users list doctype with Postgres
 2019-01-09 10:05:52 +05:30
Saurabh
835fc2c1a3 Merge branch 'staging' into develop 2019-01-08 16:09:28 +05:30
Saurabh
22b1987dfa bumped to version 11.0.3-beta.48 2019-01-08 16:37:36 +06:00
Suraj Shetty
d2b7a45429
Revert fix: Remove extra bracket 🤦‍♂️ 2019-01-08 15:51:50 +05:30
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
b0cadea875
Merge pull request #6706 from netchampfaris/cast-numeric-values 
fix: Cast numeric values to int
 2019-01-08 15:14:10 +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
84d3e63859 feat: Links in auto email report (#6710) 
* feat: Link for fields in auto email report

* fix: Typo fix

* Added options for delimiter columns and option for dynamic links

* fix: Exclude currency from links

* fix: Test case for auto email report

* fix(Codacy): Removed unused import

* fix(test): Fix test case for auto email report

* fix(test): Fix test case for auto email report
 2019-01-08 14:14:40 +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
Suraj Shetty
90b6baccf8
fix: Remove extra bracket 2019-01-08 12:30:23 +05:30
Suraj Shetty
507e37e603
fix: use ORM instead of manually adding quotes 2019-01-08 12:27:25 +05:30
Faris Ansari
b7c4593200 Merge branch 'develop' of https://github.com/frappe/frappe into cast-numeric-values 2019-01-08 12:21:25 +05:30
Deepesh Garg
817d0744f8 feat: Function for linking reports with filters (#6718) 2019-01-08 10:43:27 +05:30
Deepesh Garg
d4c2ff74c7 fix(UI Test): Cypress test case fix (#6734) 
* fix(UI Test): Fix test cases for login

* fix: add missing semicolon
 2019-01-07 21:56:44 +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
Deepesh Garg
c274882fd0 Display all filters in report view (#6722) 2019-01-07 08:56:36 +05:30
Frappe Bot
1197271700 Fixed merge conflict 2019-01-05 09:06:05 +00:00