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

17595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faris Ansari
17e2ea2cc5 fix: Cleanup Blog, List, Comment templates for Bootstrap 4 
- Bootstrap 4 class migration
 2019-01-15 09:54:05 +05:30
Faris Ansari
ecbbbd52c2 fix: styling 2019-01-09 18:35:49 +05:30
Faris Ansari
4097359ced fix: Remove ajax loader from msg_dialog 2019-01-09 18:35:43 +05:30
Faris Ansari
388169104a fix: Support disabled options in Select 2019-01-08 17:04:03 +05:30
Faris Ansari
7d3cc3f9c1 fix: styling for header actions 2019-01-08 17:03:38 +05:30
Faris Ansari
a171aa33f8 fix: Modal primary button 2019-01-02 23:10:37 +05:30
Faris Ansari
49cd2c5987 feat: Customize bootstrap using css variables (wip) 2019-01-01 18:47:41 +05:30
Faris Ansari
8641383ed1 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-26 19:51:35 +05:30
Suraj Shetty
fe49117c92
fix: issue related to quotes (#6682) 2018-12-26 19:36:13 +05:30
Frappe Bot
fec8631fe5 Merge branch 'staging' into develop 2018-12-26 12:58:04 +00:00
Frappe Bot
55576bc939 Merge branch 'staging-fixes' into staging 2018-12-26 12:58:04 +00:00
Frappe Bot
039f0b406a bumped to version 11.0.3-beta.42 2018-12-26 12:58:04 +00:00
Saurabh
a0d212988b
Merge pull request #6681 from frappe/fix-remove_skip_for_doctype_patch 
Convert dict_keys to list
 2018-12-26 18:26:24 +05:30
Suraj Shetty
bd8c3140cb
Convert dict_keys to list 2018-12-26 18:24:06 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Frappe Bot
cc7eacdaf1 Merge branch 'staging-fixes' into staging 2018-12-26 11:53:47 +00:00
Frappe Bot
1ba53ca957 bumped to version 11.0.3-beta.41 2018-12-26 11:53:47 +00:00
rohitwaghchaure
ef5791a11e
Merge pull request #6397 from surajshetty3416/staging-fixes 
Permission refactor and bug fixes
 2018-12-26 12:01:20 +05:30
Suraj Shetty
1e23e98a54 Catch KeyError in liked_with to fix failing patch 
https://travis-ci.com/frappe/erpnext/jobs/167043420
 2018-12-26 11:06:23 +05:30
Chinmay Pai
3dc57118ea fix(data-import): Import data in batches (#6673) 
* data_import: import data in a batch

data import for a lot of items (more than 200,000?) is not really appreciated by mariadb, so instead we import data in batches.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix: Fetch batch size from site_config
 2018-12-25 15:10:51 +05:30
Suraj Shetty
94a5c9417c Skip codacy warning 2018-12-25 13:27:40 +05:30
Suraj Shetty
3213393727 Display fieldname on which restriction is applied for clarity 2018-12-25 13:16:54 +05:30
Suraj Shetty
87fa40eadf Merge branch 'staging-fixes' of github.com:surajshetty3416/frappe into staging-fixes 2018-12-25 12:23:38 +05:30
Suraj Shetty
574b970afd Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-25 12:23:00 +05:30
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647) 
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
 2018-12-24 15:17:38 +05:30
pipech
4ee79078f2 fixed Cannot set Desktop Icon (#6666) 2018-12-24 14:58:31 +05:30
Zarrar
2075b2e16a add route to home in menu option (#6668) 2018-12-24 14:57:39 +05:30
rohitwaghchaure
574446e092 [Fix] Notification count not showing for the doctypes like purchase order, sales invoice (#6657) 2018-12-24 13:10:58 +05:30
Deepesh Garg
ed80e9dff1 [Fix]Quick entry with geolocation field issue fix (#6662) 
* Quick entry with geolocation field issue fix

* Codacy issue fix
 2018-12-24 13:06:30 +05:30
Faris Ansari
1d461ab5cc fix: Update datatable to 1.7.2 (#6665) 2018-12-24 13:05:58 +05:30
Rushabh Mehta
fafabac492 fix(test): test_report.py 2018-12-23 19:26:23 +05:30
Suraj Shetty
c03ba9b16a
Merge branch 'staging-fixes' into staging-fixes 2018-12-23 18:19:14 +05:30
Rushabh Mehta
5d658f251d fix(style): show some margin on headings for quill editor 2018-12-23 17:55:22 +05:30
Faris Ansari
d81797c7dd fix: Remove QUnit boilerplate (#6655) 2018-12-21 13:23:16 +05:30
Frappe Bot
8c58fdc71c Merge branch 'staging' into develop 2018-12-21 05:45:41 +00:00
Frappe Bot
de6b5f686c Merge branch 'staging-fixes' into staging 2018-12-21 05:45:40 +00:00
Frappe Bot
4b336622ae bumped to version 11.0.3-beta.40 2018-12-21 05:45:40 +00:00
Deepesh Garg
72e1ccc8f9 Changed modified timing to pickup changes (#6649) 
* Changed modified timing to pickup changes

* Update address.json
 2018-12-21 11:05:20 +05:30
Saurabh
1ae86ff43f
Merge pull request #6653 from adityahase/fix-travis-test-report 
fix(test): Add accidentally removed lines
 2018-12-20 15:16:33 +05:30
Aditya Hase
dcb1c1170b fix(test): Add accidentally removed lines 
During release v10.1.68 these two lines were accidentally removed,
add them back.
 2018-12-20 14:28:19 +05:30
Suraj Shetty
81911b9373
Merge branch 'staging-fixes' into staging-fixes 2018-12-20 12:27:06 +05:30
Suraj Shetty
432d22ba76 Add get_permitted_documents function 2018-12-19 19:59:58 +05:30
Frappe Bot
d2c652ef3a Merge branch 'staging' into develop 2018-12-19 06:30:46 +00:00
Frappe Bot
41b6ef94f5 Merge branch 'staging-fixes' into staging 2018-12-19 06:28:00 +00:00
Frappe Bot
c824248c58 bumped to version 11.0.3-beta.39 2018-12-19 06:28:00 +00:00
Frappe Bot
395972bf0b Merge branch 'master' into staging-fixes 2018-12-19 06:26:37 +00:00
Frappe Bot
cd50fecea0 Merge branch 'hotfix' 2018-12-19 06:19:04 +00:00
Frappe Bot
d63570059d bumped to version 10.1.68 2018-12-19 06:19:04 +00:00
Ameya Shenoy
48b6364941
Merge pull request #6648 from saurabh6790/paypal_subscription_date_fix 
[fix] setup subscription datetime in utc format
 2018-12-19 11:15:17 +05:30
Suraj Shetty
b2656af6aa Capitalize social factory class to support recent routing changes (#6646) 2018-12-19 09:39:12 +05:30