Commit graph

846 commits

Author SHA1 Message Date
Faris Ansari
5508651485 Browse attached images in Image View (#4374)
* Browse attached images in Image View #4141

* fix codacy
2017-10-26 17:45:53 +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
Prateeksha Singh
1e253b9d13 [controls] Barcode Control (#4335)
* [start] display barcode based on input

* [wip]

* [barcode] use set_value

* parse and set

* remove quagga

* [barcode] set in db

* [fix] set height

* cleanup

* remove from build.json, require instead

* [fix] declare JsBarcode global in .eslintrc
2017-10-18 12:24:58 +05:30
Omar Jaber
071947cd32 Fix fields style in reports for RTL direction (#4178)
This code will fix fields style of the reports in RTL direction
2017-10-17 15:19:04 +03:00
Prateeksha Singh
7e9cce2d3b C3 to Charts (#4228)
* make AxisGraph

* remove jquery and snap

* [major] refactor, svg animations, rename to charts

* remove c3, d3

* [Charts] renaming and namespacing

* [fix] codacy

* Replace in grid report with plot, fixes
2017-10-17 12:02:39 +05:30
mbauskar
6640774b75 Merge branch 'master' into develop 2017-10-11 14:38:27 +05:30
Makarand Bauskar
77f55a0ee1 [hotfix] fixed margin for disabled check field (#4293) 2017-10-10 13:48:20 +05:30
Saurabh
8744795c45 Merge pull request #4284 from saurabh6790/upload_attendance_fix
[hotfix] if no_socketio specified, upload file with FileReader
2017-10-10 11:14:39 +05:30
Saurabh
884555b645 [fix] if no_socketio specified, upload file with FileReader 2017-10-09 16:12:00 +05:30
Faris Ansari
d20f9e2895 Data Migration Tool (for hub) (#4144)
* migration tool

* custom field for primary key added

* foreign key and multiple linking F_key issue resolved

* refined code

* many-to-one mapping temp fix

* added support for pre-process + cleaned up code

* [various] fixes to setup wizard for developer mode, frappe.enqueue_doc, share with assign

* Refactor data migration module

* added migration for hub

* Add "Skip errors" in data import tool

* move db_set to document.py

* Add Data Migration Run

* Dynamic Migration ID

* move run() from Mapping to Run

* Push Deleted Documents

* fixes

* [migration] doc operation counts

* insert and update instead of push in connection

* fix count and total_pages, skip sync if total_pages is 0

* [migration] child tables

* fix complete()

* [page] remove required libs

* Add sidebar.js, rename old sidebar.js to form_sidebar.js

* [minor] get_empty_state fixes

* svg in icon

* remove image check

* fix codacy

* fix is_child_table check

* [connector] add get_list()

* Add test for Data Migration Run

* fix test

* truncate tabNote

* fix test

* sync todo with event to fix test

* fix db count

* [mapping] export Mapping to json

* Add docs for Data Migration Tool

* [migration] pull data as list, test case

* [hub] remove mapping export to files

* Pull refactor

* [test]

* Add comments

* [mapping] exec in mapping formula

* fix codacy

* fix codacy

* Remove exec for pre-process and post-process

* Add pre and post process for Push

* Remove formula

* fixes

* [refactor] add failed_log to pull, handle error in pull

* [test] Push, pull, update

* Fix codacy, fix insert_doc for pull

* Set migration id on successful insert

* fix update_doc

* fix update_doc

* method is a function

* child table mapping

* Refactor logging

* fix update_doc again

* fix hostname, password

* update docs, minors

* Remove assign_if_none

* Remove error handling from connection methods

* [refactor] Data migration run

* Break push stages into methods

* Migration run refactor

- fix test
- add separate fields for logging

* fix codacy

* fix hostname password

* fix test
2017-10-05 11:15:35 +05:30
Rushabh Mehta
8682f87594 Merge branch 'master' into develop 2017-09-29 16:12:36 +05:30
Rushabh Mehta
9728e62fa6 Merge pull request #4156 from OmarJaber/patch-1
RTL direction of chart reports
2017-09-29 15:14:55 +05:30
Rushabh Mehta
0a6b637681 [fix] default email subject should be title 2017-09-29 10:05:47 +05:30
Nabin Hait
6bf332eba7 Merge branch 'master' into develop 2017-09-27 17:18:54 +05:30
Rushabh Mehta
fbf8da1d37 [minor] compileall after migrate, might solve timeouts on VM (#4197) 2017-09-27 15:31:51 +05:30
Nabin Hait
b2945fd5b5 Fixed merge conflict 2017-09-26 16:05:38 +05:30
Makarand Bauskar
af88921ec4 [minor] Fix checkbox margin in RTL (#4148) 2017-09-26 11:47:44 +05:30
Rushabh Mehta
52936f724e [fix] cleanup style for blog listings 2017-09-24 12:05:23 +05:30
pratu16x7
532e2e2dcd [navbar] layout fixes 2017-09-22 01:05:17 +05:30
Omar Jaber
16c6d64eac RTL direction reports chart problem
This will edit the style of charts in the system
2017-09-21 14:02:36 +03:00
Rushabh Mehta
d4fd3efef4 [fix] checkbox editor 2017-09-21 15:31:12 +05:30
Rushabh Mehta
82c9357b50 [fix] item selector 2017-09-21 14:55:13 +05:30
Rushabh Mehta
c86176c572 Merge pull request #4140 from mbauskar/control-code
[minor] reverted code control's background color to white
2017-09-18 15:54:42 +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
Rushabh Mehta
1de26c939c [enhance] use socket-io to upload files 2017-09-14 13:07:29 +05:30
pratu16x7
3589a0b8b1 [page] add empty state, required libs, callback 2017-09-13 09:21:11 +05:30
pratu16x7
6fb4984e41 remove cal_heatmap 2017-09-12 11:34:15 +05:30
pratu16x7
2b200bcf7f [heatmap] choose continuous for dashboard 2017-09-12 10:52:25 +05:30
pratu16x7
63824d0012 Heatmap for month domain 2017-09-11 08:53:07 +05:30
pratu16x7
8718b7702e [graphs] tooltip object 2017-09-11 08:53:06 +05:30
pratu16x7
eb45f49dad [fix] remove on focus outline 2017-09-08 03:29:45 +05:30
pratu16x7
35c09a7688 [fix] styles 2017-09-06 12:33:17 +05:30
pratu16x7
0776e79cb2 [setup] new loading state, remove setup_wizard.css 2017-09-04 10:29:14 +05:30
pratu16x7
afea2ad1b0 [progress] remove action cards 2017-08-31 11:09:25 +05:30
pratu16x7
22463683b0 [progress] remove buttons 2017-08-30 14:26:29 +05:30
pratu16x7
9d981d783b [user-progress] lightweight completed state 2017-08-29 10:52:37 +05:30
pratu16x7
ce8d3e6871 [user-progress] route post setup route 2017-08-29 10:20:30 +05:30
pratu16x7
91c2e57fdb [setup wiz] fixes 2017-08-29 10:03:06 +05:30
pratu16x7
81d2edf0df Mark as done and progress updates 2017-08-29 10:03:05 +05:30
pratu16x7
2a0901af02 [user-progress] slide action cards 2017-08-29 10:03:05 +05:30
pratu16x7
df55d9b9b9 [user-progress] make next button primary 2017-08-29 10:03:05 +05:30
pratu16x7
c17bf0a04d [slides] setup wizard refactor 2017-08-29 10:03:04 +05:30
pratu16x7
b64f31e617 [slides] fix primary button 2017-08-29 10:03:04 +05:30
pratu16x7
347cd50db8 [slides] container controls slides 2017-08-29 10:03:03 +05:30
pratu16x7
6527a17251 [user-progress] Slides as container object, dismiss button 2017-08-29 10:03:03 +05:30
pratu16x7
5f988c3d7b [user-progress] first cut 2017-08-29 10:03:03 +05:30
Rushabh Mehta
2377434d39 Merge branch 'master' into develop 2017-08-24 16:51:27 +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
Faris Ansari
edae5c484b screenshot class for email 2017-08-23 16:53:00 +05:30