joezsweet
299ab6198a
Cron like events scheduler ( #4339 )
...
* - trigger new "cron" event
- check cron string syntax
- added croniter to requirements
* - run scheduler ever 60 sec
- trigger all enabled events
- enqueue if now >= next time execution since last one
* Update task-runner.md
* fixed tests
* fix triggering with now = True
* modified sobstitution to cron_map
modified annually label to annual
* ability to use labels defined in cron_map in cron string definition
2017-10-27 14:48:48 +05:30
Saurabh
1cf3c33838
[fix] catch dropbox api malformed_path exception and log file path with traceback ( #4332 )
2017-10-27 14:47:10 +05:30
Saurabh
d88f3e2372
Merge branch 'master' into develop
2017-10-26 20:52:30 +05:30
Saurabh
03da960fd5
Merge branch 'hotfix'
2017-10-26 20:52:30 +05:30
Saurabh
e3c437b401
bumped to version 9.2.2
2017-10-26 21:22:30 +06:00
Saurabh
7ee345ef99
Merge pull request #4391 from rohitwaghchaure/premium_button_issue
...
[Fix] Don't show upgrade button for paid site
2017-10-26 20:50:58 +05:30
Rohit Waghchaure
c47cce1cbc
[Fix] Don't show upgrade button for paid site
2017-10-26 20:48:11 +05:30
vishalseshagiri
0529b4b85b
Trigger map refresh if map_field is not empty, fixes incorrect map centering on load ( #4387 )
2017-10-26 18:40:56 +05:30
Faris Ansari
dd5bd8ef11
[minor][fix] Image view gallery ( #4388 )
2017-10-26 18:16:50 +05:30
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
affd84c469
[formatdate] Return empty string if no date provided ( #4385 )
2017-10-26 17:35:57 +05:30
Saurabh
402bfc39ba
Merge branch 'hotfix'
2017-10-26 09:54:21 +05:30
Saurabh
7539c0f0c9
Merge branch 'master' into develop
2017-10-26 09:54:21 +05:30
Saurabh
c160d3a2ab
bumped to version 9.2.1
2017-10-26 10:24:21 +06:00
Saurabh
01c4da0710
Merge pull request #4382 from saurabh6790/setup_wix_fix
...
[HOTFIX] translate domain
2017-10-26 09:52:30 +05:30
Saurabh
c1af5db270
[fix] translate domain
2017-10-26 09:42:39 +05:30
Revant Nandgaonkar
ebf3554754
Geolocation control ( #4327 )
...
* added static map field
* leaflet draw plugin added to map control
* Editable layer working no icons
* Save and load data in form field
* images and icons working
* Locate plugin added, and loads on geolocation
* organized map control code
* loads layer as per form
* new form clears editableLayers
* update: leaflet 1.2.0 and leaflet-draw 0.4.2
* changed to ERPNext colors
* Multiple map fields and fixes
* fixes codacy suggestions
* loaded geojson data editable
* Map layers editable
* add only one layer on draw:create
* code organized with helper functions
* Replaced Leaflet Draw with Leaflet Editable
* read values from database
* layers saved in db
* Using Patched Leaflet Draw (mobile-friendly)
* Working Map field with multiple forms open
* Leaflet Draw css image path fix
* Leaflet Draw
Fixes Leaflet draw css image paths
Fixes Circle marker and Circle
* locate to geolocation or set featurecollection as center
* [fix] leaflet fitBounds padding 50,50
* [Fix] Leaflet (auto) locate
* Map field basic test
* added refresh button on map
* Mute map geojson in print format
* renamed Map field to Geolocation
* Suggested changes and fixes
* eslint disable
* csslint allow important
2017-10-25 18:30:25 +05:30
Faris Ansari
b51d9a04b1
[enhance] build only changed files, get others from cache ( #4380 )
2017-10-25 18:02:06 +05:30
Saurabh
1b3cbb9a81
[fix] if doctype is specified consider doctype in filter ( #4381 )
2017-10-25 17:24:09 +05:30
Prateeksha Singh
56e0b470d6
Merge pull request #4364 from netchampfaris/calendar-view
...
Generic Calendar View for all DocTypes
2017-10-25 15:40:20 +05:30
Achilles Rasquinha
b5c4278341
BCC in Emails ( #4377 )
...
* added blank carbon copy
* [FEAT] BCC in emails
* removed test_communication, fixed comment
* fixed codacy
2017-10-25 15:33:30 +05:30
Nabin Hait
f60967f851
Merge branch 'develop' into staging
2017-10-25 14:24:39 +05:30
Nabin Hait
6dc03128d2
Merge branch 'staging'
2017-10-25 14:01:47 +05:30
Nabin Hait
205d5f8207
Merge branch 'master' into develop
2017-10-25 14:01:47 +05:30
Nabin Hait
452266d3c2
bumped to version 9.2.0
2017-10-25 14:31:46 +06:00
Nabin Hait
627bc68cac
Merge branch 'master' into staging
2017-10-25 14:01:07 +05:30
Nabin Hait
f86f19e9aa
Merge branch 'hotfix'
2017-10-25 14:01:06 +05:30
Nabin Hait
823366e6b9
Merge branch 'master' into develop
2017-10-25 14:01:06 +05:30
Nabin Hait
897c171ecd
bumped to version 9.1.11
2017-10-25 14:31:06 +06:00
tundebabzy
09863bdf38
System Setting Password Policy Issue (frappe/erpnext#11255) ( #4353 )
...
* use get for getting key
* PEP8 changes
2017-10-25 12:37:14 +05:30
Prateeksha Singh
6f891cc3bb
make User Permissions importable ( #4367 )
2017-10-25 12:34:47 +05:30
tundebabzy
f5c66a0d38
cover NoneType use case ( #4375 )
2017-10-25 12:28:03 +05:30
Faris Ansari
4d26930bba
fix codacy
2017-10-25 12:10:05 +05:30
Faris Ansari
0176e202fa
fix codacy
2017-10-24 18:40:17 +05:30
Faris Ansari
b2a6a86e15
minor
2017-10-24 12:35:23 +05:30
Faris Ansari
bc45beb868
Show record count in list header
2017-10-23 20:10:15 +05:30
Faris Ansari
1fbc8ff448
Add Show Calendar button
2017-10-23 19:06:59 +05:30
Faris Ansari
8c291c9b20
List renderer
...
- load_last_view
- refresh calendar view on route change
2017-10-23 19:00:57 +05:30
Faris Ansari
2d156345ae
[minor] fallback for invalid start or end date
2017-10-23 18:06:05 +05:30
Faris Ansari
29e72a92f1
Add Calendar View Doctype
...
- get_events method
- show dropdown in list view
- save last calendar view
2017-10-23 17:49:14 +05:30
Faris Ansari
91861c7769
[minor]
...
- watch js files
- add frappe.db.get_list in js
2017-10-23 17:48:35 +05:30
Nabin Hait
8db6c97f8a
Merge branch 'master' into staging
2017-10-23 13:02:09 +05:30
Nabin Hait
e19fc9bd53
Merge branch 'hotfix'
2017-10-23 13:02:08 +05:30
Nabin Hait
e4ec49a603
Merge branch 'master' into develop
2017-10-23 13:02:08 +05:30
Nabin Hait
87c45d881e
bumped to version 9.1.10
2017-10-23 13:32:08 +06:00
Nabin Hait
c4adaa653a
[fix] Two factor authentication via SMS ( #4359 )
2017-10-23 13:01:30 +05:30
Faris Ansari
5c9146fe9c
[formatdate] Return empty string if no date provided ( #4356 )
2017-10-23 12:12:52 +05:30
Nabin Hait
da53939d51
Merge branch 'master' into staging
2017-10-21 11:18:53 +05:30
Nabin Hait
137e6b4652
Merge branch 'hotfix'
2017-10-21 11:18:53 +05:30
Nabin Hait
d2b5f78a8e
Merge branch 'master' into develop
2017-10-21 11:18:53 +05:30
