Commit graph

66 commits

Author SHA1 Message Date
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
Rushabh Mehta
88120256ee [wip] [cleanup] fixes to kanban board and timeline 2017-01-20 14:49:35 +05:30
Rushabh Mehta
0618b98c92 [minor] cleanup to comment update and maintenance mode page 2017-01-10 17:50:36 +05:30
Faris Ansari
21a2b88d71 Kanban Board #2172 (#2542)
* [kanban] wip

* [kanban] refresh views on kanban change, add kanban board to title, kanban cards draggable

* update field on column change, open form when clicked

* [kanban] refactor into new view KanbanView

* [kanban] minor

* [kanban] refactor into classes

* [kanban] refactor wip

* [kanban] Show Board button in kanban board

* [kanban] add card, move card

* [kanban] wip

* [kanban] filters wip

* [kanban] add new column wip

* [kanban] filters sort-of working

* [kanban] filters still not working, ugh

* another failed attempt :(

* [kanban] filters working, added quick edit for cards

* [kanban] add column partially working

* added assign to

* kanban using stores wip

* wip

* add card, add column working without refresh

* save filter button

* show card meta

* delete column

* fluxify data flow

* change:cards working

* delete changed to archive

* removed old store implementation

* restore column option

* edit card title, api cleanup

* kanban_column_order wip

* kanban column order wip2

* order save finished

* fix new card sorting

* cleanups

* fixed undefined card

* fixed refresh on list view change

* cleanups
2017-01-10 15:06:06 +05:30
Rushabh Mehta
f4f3a07961 [minor] consistent button style in 404.html 2017-01-10 14:49:17 +05:30
DRogue
251328d824 Added edit button to comments of doc timeline (#2536)
* Added edit button to comments of doc timeline

* Used $timeline_item where applicable
Changed pencil-icon to check-icon while editing
Added hover effect to edit icon
Made octicon-check green and slightly bigger

* Used tabs instead of spaces for indentation

* Update utils.py

* Update timeline.js
2017-01-10 14:37:52 +05:30
Rushabh Mehta
d989a95472 [feature] document versioning #2469 (#2523)
* [feature] document versioning #2469

* [minor] remove on_update from WebsiteGenerator

* [fix] delete shares when deleting user

* [test] don't run delete in background if test

* [fix] test_db

* [added] Deleted Document

* [fix] added track_changes in all documents

* [fix] add to deleted only if exists

* [fix] in_install flag in deleted documents

* [minor] name will always be reset
2016-12-29 18:01:42 +05:30
Rushabh Mehta
e858797290 Merge branch 'v7.2.0-beta' into develop 2016-12-20 12:36:25 +05:30
Rushabh Mehta
5d7eb494a0 [minor] frappe.as_unicode 2016-12-20 12:35:59 +05:30
Faris Ansari
ff906ca546 Removed jquery-ui, new datepicker and autocomplete (#2460)
* Replaced old datepicker with flatpickr

* Replaced jquery ui-autocomplete with awesomplete

* airdatepicker, bcoz it's cooler

* air datepicker change event fixed

* ControlLink migrated to awesomeplete

* jQuery ui-autocomplete completely replaced with awesomplete

* removed jquery-ui styling

* awesomebar code cleanup

* @mention now uses awesomplete

* Fix datepicker, added css to complement erpnext, minor fixes

* taggle library for tags

* Communication email input uses awesomplete

* filter dashboard uses awesomplete

* grid report uses awesomplete

* Removed jquery-ui lib, updated build.json
2016-12-20 11:44:19 +05:30
Rushabh Mehta
f4aed17ce6 [minor] close in checkbox and other fixes 2016-12-16 12:55:48 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
Rushabh Mehta
a256e029b6 [minor] UI fixes (#2345) 2016-11-21 13:29:36 +05:30
Rushabh Mehta
74cb41ae71 [enhance] web form pagination frappe/shishuvan#3 (#2076)
* [enhance] web form pagination frappe/shishuvan#3

* [minor] add label in web form grid

* [minor] select module for exporting web form

* [fix] more fixes, #2057
2016-09-20 17:47:39 +05:30
Rushabh Mehta
72ed223d41 [minor] more options for frappe.set_query and set_indicator in dashboard 2016-09-19 16:08:34 +05:30
Rushabh Mehta
b6bee64370 [enhance] minor fixes + background jobs 2016-08-18 18:26:15 +05:30
Faris Ansari
e23e594147 [minor] [ui] 2016-07-27 17:40:07 +05:30
Rushabh Mehta
adb2e86a3d [fix] dashboard cleanup 2016-07-20 18:54:49 +05:30
Rushabh Mehta
5a35548c6a [magic] frappe.emit_js 2016-06-09 18:33:36 +05:30
Rushabh Mehta
dea30f830a [fix] [style] document flow 2016-06-08 17:20:02 +05:30
Anand Doshi
c8e0384ce1 [cleanup] document flow 2016-06-07 18:55:15 +05:30
Saurabh
2fae88e1d4 [fixes] css fixes 2016-06-07 16:30:55 +05:30
Saurabh
55ebe2f63c [fix] css 2016-06-07 16:30:55 +05:30
Saurabh
672225363d [fixes] 2016-06-07 16:30:55 +05:30
Saurabh
4e55c1770c [fixes] get only selected doctype linkings 2016-06-07 16:30:55 +05:30
Rushabh Mehta
671f22f269 [style] [cleanup] 2016-04-20 18:45:27 +05:30
Rushabh Mehta
9c7d1f2ea8 [cleanups] 2016-04-18 19:26:45 +05:30
Rushabh Mehta
c16f77b448 [cleanup] progress 2016-04-15 11:23:52 +05:30
Rushabh Mehta
4bb2fce345 [enhancement] added heatmaps and item count in dashboard 2016-04-14 17:30:06 +05:30
Rushabh Mehta
ae0afc73df [cleanup] dashboard and default image 2016-04-11 17:35:01 +05:30
Anand Doshi
353e8a9d1f [fix] Sanitize form_dict and doc values to prevent XSS 2016-02-23 12:11:28 +05:30
Anand Doshi
465318878e [enhancement] Merge Comment and Feed into Communication 💥 2016-02-04 17:46:53 +05:30
Anand Doshi
3241a0969f [feature] Ability to like a document, comment or communication, see notifications about it and view it on activity feed 2016-01-01 12:50:14 +05:30
Anand Doshi
40f679322b [enhancement] Show who is currently viewing a document 2015-11-02 19:38:30 +05:30
Rushabh Mehta
875ef3bfec [style] use thin fonts for mobile, tablets and other cleanups 2015-08-28 18:31:23 +05:30
Anand Doshi
dce31d8e5c [css] added border-bottom to each section for better separation 2015-08-27 16:54:19 +05:30
Rushabh Mehta
1134c552dd [cleanup] form section UI 2015-08-25 18:02:46 +05:30
Rushabh Mehta
9deec6af5a [form] refactor layout and added collapsible sections 2015-08-25 16:13:30 +05:30
Anand Doshi
65bc63f031 [fix] document refresh notification for same user in different tabs/sessions 2015-08-21 12:56:48 +05:30
Rushabh Mehta
a15af7882b [realtime] clear doc locally if updated 2015-08-18 16:52:23 +05:30
Anand Doshi
c9782e23e4 Merge remote-tracking branch 'frappe/develop' into v6-wip
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.json
	frappe/hooks.py
	frappe/model/document.py
	frappe/public/css/form.css
	frappe/public/less/form.less
	requirements.txt
	setup.py
2015-08-17 12:22:02 +05:30
Rushabh Mehta
748cac0d99 [enhancement] added 'assigned by me' in todo list 2015-08-14 12:19:35 +05:30
Anand Doshi
c079e27d3f Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration 2015-08-11 12:03:13 +05:30
Rushabh Mehta
8b00fecd7a [style] clearer section headings in forms 2015-07-24 15:06:56 +05:30
Anand Doshi
4472af6b48 [minor] fix font size in timeline's blockquotes 2015-04-30 15:53:01 -07:00
Anand Doshi
464011e74f [cleanup] timeline css 2015-04-30 15:33:00 -07:00