Commit graph

14181 commits

Author SHA1 Message Date
Prateeksha Singh
a9783a2e98 Upgrade button in sidebar, cleanup usage page (#4227)
* upgrade button in sidebar, cleanup usage page

* [fix] check if in trial for sidebar

* make upgrade box dismissable

* Update list_sidebar.js
2017-10-05 11:22:51 +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
Nabin Hait
dfbff09b52 Merge branch 'master' into develop 2017-10-04 18:20:51 +05:30
Nabin Hait
311dff662a Merge branch 'staging' 2017-10-04 18:20:50 +05:30
Nabin Hait
7bf5b6eec2 bumped to version 9.1.0 2017-10-04 18:50:49 +06:00
Nabin Hait
fde8080e6a Merge branch 'master' into staging 2017-10-04 18:18:06 +05:30
Nabin Hait
678f29329c Merge branch 'master' into develop 2017-10-04 18:18:05 +05:30
Nabin Hait
143032065c Merge branch 'hotfix' 2017-10-04 18:18:05 +05:30
Nabin Hait
fafab5620f bumped to version 9.0.10 2017-10-04 18:48:05 +06:00
Makarand Bauskar
58fd830b92 [revert] pull emails from all incoming email accounts instead of enqueuing single email account (#4247) 2017-10-04 18:17:05 +05:30
Nabin Hait
5d3f41bb26 Merge branch 'develop' into staging 2017-10-04 18:13:46 +05:30
Nabin Hait
86e283ecdb Merge branch 'master' into staging 2017-10-04 18:12:10 +05:30
Nabin Hait
936e84f345 Merge branch 'master' into develop 2017-10-04 18:12:10 +05:30
Nabin Hait
4d38e4e435 Merge branch 'hotfix' 2017-10-04 18:12:09 +05:30
Nabin Hait
f587f3a4a9 bumped to version 9.0.9 2017-10-04 18:42:09 +06:00
Makarand Bauskar
9b32196c11 [minor] don't update the parent status if comment is added (#4241) 2017-10-04 17:59:32 +05:30
Rushabh Mehta
cea04fae17 [fix] locking for set_default (#4245) 2017-10-04 15:29:16 +05:30
Nabin Hait
4140bf809f minor fix in old patch 2017-10-04 15:19:53 +05:30
Rushabh Mehta
550acb5e1c Revert "[fix] Disabled document not validated on save/submit #10571" (#4240)
* Revert "Force uploads to be private by default (#4159)"

This reverts commit 2191a7d3a4.

* Revert "[fix] Disabled document not validated on save/submit #10571 (#4195)"

This reverts commit 13a3205277.
2017-10-04 10:55:54 +05:30
bcornwellmott
2191a7d3a4 Force uploads to be private by default (#4159)
* Make uploads private by default

* Fixed first attempt private

* Removed accidental debugger

* Added check for image

* Added public option for attaching

* Get rid of whitespace
2017-10-02 17:04:14 +05:30
Utkarsh Goswami
13a3205277 [fix] Disabled document not validated on save/submit #10571 (#4195)
* validation for disabled document

* Update utils.py
2017-10-02 16:56:59 +05:30
KanchanChauhan
8c8e9fdd98 No Tags was not counting emtpy tags (#4231) 2017-10-02 16:56:27 +05:30
Achilles Rasquinha
612b94c367 [FIX] new babel-presets (#4232)
* [FIX] babel-presets

* comment out minify

* Update build.js
2017-10-02 16:55:31 +05:30
Nabin Hait
ee70e152f0 return in set_value_if_null 2017-10-02 16:20:09 +05:30
Nabin Hait
451b48e4e2 Update document status via communication if not feed (#4234) 2017-10-02 15:55:46 +05:30
Achilles Rasquinha
7dd2c1c941 [FIX] #4223 (#4226)
* [FIX] #4223

* codacy fix

* fixed codacy

* fixed codacy
2017-10-02 13:21:48 +05:30
Nabin Hait
6099d0ac91 Merge branch 'master' into staging 2017-10-02 12:07:31 +05:30
Nabin Hait
90ddac737f Merge branch 'master' into develop 2017-10-02 12:07:31 +05:30
Nabin Hait
1c8c7cc02f Merge branch 'hotfix' 2017-10-02 12:07:30 +05:30
Nabin Hait
6fa9f81e2b bumped to version 9.0.8 2017-10-02 12:37:30 +06:00
Makarand Bauskar
e4c0cc5709 [hotfix] TypeError: Cannot read property 'id' of undefined (#4229) 2017-10-02 12:06:34 +05:30
Makarand Bauskar
3c7be2fd04 [hotfix] TypeError: Cannot read property 'id' of undefined (#4229) 2017-10-02 11:41:41 +05:30
Rushabh Mehta
404f0ab07a Merge pull request #4221 from rmehta/fix-text-editor-in-firefox
[fix] text editor in firefox
2017-10-01 22:05:47 +05:30
Rushabh Mehta
df8d6fac87 Merge pull request #4216 from mbauskar/9346
[minor] added the Created On and Last Modified On date fields in email alert's date_change
2017-10-01 22:01:41 +05:30
Rushabh Mehta
78995ceb3e [fix] text editor in firefox 2017-09-30 15:06:57 +05:30
Rushabh Mehta
0dff5607f2 [version] 9.x.x-develop 2017-09-30 11:41:43 +05:30
Nabin Hait
f6b080ba71 Don't validate links on cancellation (#4218) 2017-09-29 19:51:11 +05:30
mbauskar
05a447a349 [minor] added the Created On and Last Modified On date fields in email alert's date_change 2017-09-29 17:39:31 +05:30
Rushabh Mehta
cf090c4edd Merge branch 'master' into staging 2017-09-29 16:12:37 +05:30
Rushabh Mehta
10076fc53f Merge branch 'hotfix' 2017-09-29 16:12:36 +05:30
Rushabh Mehta
8682f87594 Merge branch 'master' into develop 2017-09-29 16:12:36 +05:30
Rushabh Mehta
6027fe67bc bumped to version 9.0.7 2017-09-29 16:42:36 +06:00
Rushabh Mehta
c06fda8de8 Merge pull request #4215 from rmehta/scroll-fix
[fix] for scrolling https://github.com/frappe/erpnext/issues/9088
2017-09-29 16:10:15 +05:30
Rushabh Mehta
5541c9e549 [fix] for scrolling https://github.com/frappe/erpnext/issues/9088 2017-09-29 15:33:58 +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
2248dbc819 Merge pull request #4165 from achillesrasquinha/develop
[MAJOR] WebCamera attachments, Desktop Wiggling, bench command, minor UX, better dev workflow, MariaDB@10.2 fix
2017-09-29 15:09:41 +05:30
Rushabh Mehta
2f1cf0f5ad Merge pull request #4188 from schilgod/addressfix
Add Email option to Address email_id field, so that Email is validated
2017-09-29 15:04:03 +05:30
Rushabh Mehta
cca0899bad Merge pull request #4214 from rmehta/validate-fix
[fix] validate links before calling controller triggers
2017-09-29 15:03:45 +05:30
Rushabh Mehta
09dcc1a8cb Merge pull request #4211 from rmehta/remove-filter-fix
[fix] remove filter
2017-09-29 15:03:37 +05:30
Rushabh Mehta
be4cbc1f4e Merge pull request #4210 from rmehta/defaut-title-in-email
[fix] default email subject should be title
2017-09-29 15:03:27 +05:30