Commit graph

105 commits

Author SHA1 Message Date
Faris Ansari
7f24a3f71d fix: Show user fullname in mentions (#7592)
* fix: Show user fullname in mentions

* fix: Remove unused import

* fix: Update tests
2019-05-30 16:37:40 +05:30
Chinmay Pai
81ee1870e0 feat(email): Add reply all option in timeline (#6733) 2019-04-29 17:43:52 +05:30
Rushabh Mehta
6af03aa129 fix(style): cleaner style for form sidebar and other minor cleanups 2019-04-23 08:28:32 +05:30
Rushabh Mehta
01242afc8f
Merge pull request #7304 from rmehta/milestone-tracker
feat: Milestone Tracker. Track document lifecycle with milestones
2019-04-22 11:08:49 +05:30
Rushabh Mehta
7402f495d5 feat: Milestone Tracker. Track document lifecycle with milestones 2019-04-17 18:00:03 +05:30
Faris Ansari
106c35cd34
Merge branch 'develop' into new-upload 2019-04-16 23:57:45 +05:30
Rushabh Mehta
d0e025ed17 fix(style): minor 2019-04-15 10:18:15 +05:30
Faris Ansari
15b9421365 fix: Refactor Attach controls to use new FileUploader 2019-04-13 14:45:28 +05:30
Rushabh Mehta
ecf6eedd9e fix(style): max height for timeline items, incase of long threads 2019-03-07 16:32:59 +05:30
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
Saurabh
1bf85da159 Merge branch 'staging' into develop 2018-12-27 18:01:28 +05:30
Rushabh Mehta
a74c91742a
fix(formatting): for email replies (#6676)
* fix(fomratting): for email replies

* fix(timeline): some more testing and fixes

* fix(style): for blockquotes, also feedback
2018-12-27 12:55:52 +05:30
Aditya Hase
02d8edd332 [Feature] Markdown Editor (#6383)
* feat(markdown-editor): Add new fieldtype - MarkdownEditor

* feat(markdown-editor): Add MarkdownEditor control

* fix(markdown-editor): Fix placement of "Show Preview" button

* fix(markdown-editor): Render HTML in prints
2018-11-22 11:37:50 +01:00
Charles-Henri Decultot
98abda32b4 [Enhancement] Event timeline (#6133)
* Events in timeline wip

* Events in timeline

* Permission issue + split buttons between Frappe and ERPNext

* Add string type check

* Codacy corrections

* Permission issue

* Test and feedback corrections

* Codacy corrections

* Tests and codacy corrections

* Codacy correction

* Py3 correction

* Travis correction

* Py3 corrections"

* Travis and codacy corrections

* Removed space

* Add check for the removal of new lines

* Codacy rollup watch missing semicolon
2018-10-02 10:12:55 +05:30
Faris Ansari
f169f6231d fix(ux): Reorder Print Server fields (#6115)
- fix timeline overflow text
2018-09-24 12:46:41 +05:30
Rushabh Mehta
7362a0151f
ux(timeline): different background for comment (#6021) 2018-08-28 15:29:27 +05:30
Suraj Shetty
14c621fca2 Success Action (#5434)
* success model init

* ui changes

* whitelisted get_count method

* refactor success action

* refactor form.js
- lint error fixes
- reject promise on error

* Refactor
- option to add body to msg-alert
- remove unwanted css
- tweak msg-alert ui

* remove alert on any action click

* sample success modal config for toDo

* success alert redesign

* docstatus check

* close button position fix

* add doctype for success action setting

* remove unwanted changes

* remove unused import

* rename success action setting to success action

* add translatable label

* rename for_doctype to ref_doctpe

* remove unused frappe import

* replace get_list with get_all
to ignore permission check while loading boot
2018-04-18 11:22:51 +05:30
Shreya Shah
19a8ef39c1 fix-checkbox-margin (#5288) 2018-03-29 11:52:29 +05:30
Prateeksha Singh
b4beb986e4 [fix] checkbox alignment fixes frappe/erpnext#12727 (#5138) 2018-03-08 14:19:28 +05:30
Faris Ansari
8eac4bc124 Styling for Attach control (#4340)
* Update attach.js

* Add attach control styling to form.less

* Add margin
2017-10-18 12:54:58 +05:30
Saurabh
884555b645 [fix] if no_socketio specified, upload file with FileReader 2017-10-09 16:12:00 +05:30
mbauskar
cd7b1c16cd [minor] used @text-color for color attribute instead of black 2017-09-18 15:53:16 +05:30
mbauskar
24dd16f51e [minor] reverted code control's background color to white 2017-09-18 12:07:38 +05:30
pratu16x7
2b200bcf7f [heatmap] choose continuous for dashboard 2017-09-12 10:52:25 +05:30
Rushabh Mehta
efe88591c2 Merge branch 'master' into staging 2017-08-24 16:51:28 +05:30
Rushabh Mehta
798451d254 [fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686 (#3979)
* [fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686

* [minor] timeout not required

* Update layout.js
2017-08-23 18:12:59 +05:30
Rushabh Mehta
19e9834850 [added] print style 2017-08-17 18:34:14 +05:30
Rushabh Mehta
05c88fa3f0 [minor] make email alert configurable, so we can use it list default print formats 2017-08-14 12:58:32 +05:30
Ashwini Save
343b4cfccd Change icons in timeline to Text-All-Format #10273 (#3859)
* Change icons in timeline to Text-All-Format #10273

* Changes for delete icon and alignment fixes.
2017-08-07 13:34:50 +05:30
Prateeksha Singh
7fa8148d33 Graph additions (#3776)
* remove hardcoded height and width

* [graph] relative measures, offsets, generalise all base jobs

* Multiple datasets! (individually colored)

* [graph] Tooltips

* [graph] animate and change values

* [graph] percentage graph

* [graph] custom height, window resize refresh

* [graph] style changes

* [graph] update docs

* [graphs] make graphs.less

* [graphs] prefix classes with 'graph-', nest inside parent class
2017-07-28 11:14:33 +05:30
Faris Ansari
1fde846272 Form Timeline styling (#3778)
* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.

* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.

* Pushing title changes only, reverted timeline changes.

* Pushing title changes only, reverted timeline changes.

* Timelime tilte design update for small resolution.

* Review changes and added minified date

* Review changes for Timeline for smaller screen.

* Changes for tilte, delete icon change and removed duplicate date.

* Review changes

* Fixed Alignment for action buttons.

* Small resolution alignment changes.

* Class name changes.

* Timelime tilte design update for small resolution.

* Changes for tilte, delete icon change and removed duplicate date.
2017-07-25 11:55:29 +05:30
Prateeksha Singh
05a542d7cc Set image control alignment via df (#3754)
* image control alignment via df

* [wiz] remove application brand name
2017-07-25 10:59:39 +05:30
Prateeksha Singh
b602a07c7a Graphs, and target notifications (#3641)
* [sales goal] in company; graph, notifs

* cleanup notifications.js, summary and specific val in graph

* Add line graph, add goal data methods in goal.py

* [tests] targets in notification config

* [minor] type of graph as argument in parent

* Update graph docs

* remove company dependent test for notification

* [fix] test

* look for monthly history in cache

* check for cached graph data in field
2017-07-17 14:51:30 +05:30
Rushabh Mehta
4e4a42af91 [view] form dashboard behaves like a form section and is now collapsible (#3596)
* [view] form dashboard behaves like a form section and is now collapsible

* [fix] alert on newline

* [fix] clear headline in email_account.js
2017-07-07 09:13:55 +05:30
Rushabh Mehta
3c4f3d9454 [minor] [style] 2017-07-05 11:57:59 +05:30
Prateeksha Singh
afed0c9374 Setup wizard refactor (#3548)
* [wizard] refactor and UI cleanups

* [wip] attach image control cleanup

* try and detect lang, country, gravatar

* password control

* frappe.wiz to frappe.setup

* cleaned up slides, yet to decide on master data

* Add function to add dynamic fields in layout

* [fix] independent slide fields numbering by deep-cloning initial fields

* refresh only appended fields, autofill user_details

* [wizard] UI test

* [wizard] frappe icon, reuse get_geo_ip_country, cleanups
2017-07-03 18:15:40 +05:30
Rushabh Mehta
e232abdafd [enhannce] new filter design (#3553)
* [enhannce] new filter design

* [minor]
2017-06-28 14:25:27 +05:30
Rushabh Mehta
e2d51c8589 [multiple] frappe.permissions.add_permission, cleanup address and contact html 2017-06-22 18:21:48 +05:30
Ashwini Save
1823fdc02d Add horizontal border in writable fields for mobile view #2693 (#3241) 2017-05-08 16:30:01 +05:30
Rushabh Mehta
65730d7bcf [minor] allow method object to return its own response object 2017-04-27 16:14:28 +05:30
Rushabh Mehta
54df9298f8 [enhance] Signature Control (#3024)
* - Add controller for signature field, including buttons for save and reset
- Add library and style

* Add DB mapping for Signature field -> fix bug not saving
Add empty image, and auto load image when loading form
Add option for Signature field type on Doctype form

* Make field uneditable after submitting

* Remove console log and revert adding empty lines

* Update layout, remove edit mode/button, make save button compact. Refactor and use change event to trigger save.

* [cleanup] Signature Control
2017-04-07 13:52:42 +05:30
Faris Ansari
e264f215db Refactor LinkedWith (#3023)
* Refactored LinkedWith

* Added new class syntax

* minor
2017-04-07 13:52:05 +05:30
Rushabh Mehta
d453dea055 [minor] catch tag count exception for filters that include child tables 2017-03-15 15:02:08 +05:30
Rushabh Mehta
400dcd369e [style] grey bg for disabled inputs and fix for back button 2017-03-15 13:03:52 +05:30
mbauskar
cbe260c41e add to contact for email inbox 2017-03-14 17:55:07 +05:30
Nabin Hait
78447337d7 Merge branch 'master' into develop 2017-02-27 14:30:21 +05:30
Rushabh Mehta
77b17be78e [enhance] add new buttons on form dashboards 2017-02-23 17:02:27 +05:30
Rushabh Mehta
944739d2d4 [minor] hide gmail replies 2017-02-16 12:07:32 +05:30
Rushabh Mehta
2b191e81ed [minor] allow grid for modal 2017-02-02 17:40:40 +05:30
Rushabh Mehta
08a83f403f [cleanup] timeline sorting 2017-01-20 16:49:30 +05:30