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

16541 commits

This branch
This branch
All branches
Author SHA1 Message Date
Faris Ansari
ef67b9265b
Merge pull request #6034 from codingCoffee/render_image 
webform: render image in web form using setTimeout
 2018-08-31 11:55:35 +05:30
Faris Ansari
a583691d4e fix(report view): Handle non-existing fields (#6036) 2018-08-31 10:52:54 +05:30
Ameya Shenoy
a302501752
webform: render image in web form using setTimeout 2018-08-30 14:03:47 +00:00
Rushabh Mehta
624703d1b9 minor: mapping now takes optional args 2018-08-30 18:23:06 +05:30
Rushabh Mehta
00fc9c9b1c fix(fetch): fetch_from will always update after save 2018-08-30 12:16:10 +05:30
Rushabh Mehta
9bd5587583 readme: codetriage badge 2018-08-30 10:35:19 +05:30
Rushabh Mehta
22934b4e8c fix(translate): #5906 via CodeTriage 2018-08-30 10:27:52 +05:30
Rushabh Mehta
5944ba312a ux(quick-entry): allow any length 2018-08-30 09:22:26 +05:30
Rushabh Mehta
a19f7beb39 ux: mandatory red in data import, export 2018-08-29 17:30:27 +05:30
Rushabh Mehta
a9f32f292c default(perms): add default import, export perms 2018-08-29 17:09:35 +05:30
Faris Ansari
adfc4d726f fix(css): Commonify awesomplete styles (#6029) 2018-08-29 16:12:32 +05:30
Zarrar
41d1446c04 functions already added in delivery_triip.py (#6027) 2018-08-29 16:05:47 +05:30
Faris Ansari
6b508cf809 fix: Number format (#6028) 2018-08-29 15:47:19 +05:30
Rushabh Mehta
394f451b6c ux(assignment): allow assignment without any value 2018-08-29 14:58:06 +05:30
Nabin Hait
886a41d0ce Fixed merge conflict 2018-08-29 13:08:04 +05:30
Nabin Hait
3265916640 Merge branch 'hotfix' 2018-08-29 12:46:10 +05:30
Nabin Hait
8100327b51 bumped to version 10.1.46 2018-08-29 13:16:09 +06:00
Nabin Hait
ca1946152d
Update email_alert.py 2018-08-29 12:45:01 +05:30
Charles-Henri Decultot
0292a39d21 Make description translatable (#6024) 2018-08-29 12:44:58 +05:30
Faris Ansari
86ff0851a0 style: fix linting issues (#6026) 2018-08-29 12:43:57 +05:30
Prateeksha Singh
2b672d2ee7 Add Vue Support (#6025) 
* [frappe][build] Add Vue

* chore(rollup): add node_modules path for all apps

- also remove rollup-plugin-alias

* feat: Add EventEmitter

Usage:

```
frappe.utils.make_event_emitter(obj);

obj.trigger('event');
obj.on('event', fn);
```

* chore: Update rollup

* fix: add comment_when to frappe.datetime

* feat: Add img-loading class

* feat: Add .vue files for translation extraction

* [frappe][build] Add Vue

* chore(rollup): add node_modules path for all apps

- also remove rollup-plugin-alias

* feat: Add EventEmitter

Usage:

```
frappe.utils.make_event_emitter(obj);

obj.trigger('event');
obj.on('event', fn);
```

* chore: Update rollup

* fix: add comment_when to frappe.datetime

* feat: Add img-loading class
 2018-08-29 12:03:27 +05:30
Faris Ansari
c564b4b00a
Merge pull request #6023 from netchampfaris/async-keyword-fix 
fix(async): Pass async param using dict
 2018-08-28 18:50:24 +05:30
Faris Ansari
3838247f4d
Merge branch 'develop' into async-keyword-fix 2018-08-28 18:47:17 +05:30
Faris Ansari
116a0bc99c fix(async): Pass async param using dict 2018-08-28 18:45:56 +05:30
Ameya Shenoy
682c8cd4c6
Merge pull request #6022 from codingCoffee/rq 
rq: lock version 0.12.0
 2018-08-28 11:15:42 +00:00
Ameya Shenoy
f379e2fe7f
rq: lock version 0.12.0 2018-08-28 11:04:50 +00:00
Nabin Hait
d8b3fcb347 [fix] Rename property setter for fetch_from 2018-08-28 16:15:19 +05:30
Aditya Hase
f3b959b1fe frappe: refactor async to realtime (#6015) 
* frappe: refactor async to realtime

* frappe: refactor async to is_async
 2018-08-28 15:31:20 +05:30
Rushabh Mehta
7362a0151f
ux(timeline): different background for comment (#6021) 2018-08-28 15:29:27 +05:30
Saurabh
e88cbee727 add missing methods from google_maps to google_maps_settings (#6020) 2018-08-28 15:23:05 +05:30
Rushabh Mehta
d3be20047d ux(filters): dont validate in list filters 2018-08-28 14:57:21 +05:30
Saurabh
b8923b0c08
Merge pull request #6014 from saurabh6790/v11_patch_fixes 
[fix] v11 patch fixes
 2018-08-27 18:17:49 +05:30
Saurabh
99b102dc25 [fix] v11 patch fixes 2018-08-27 18:13:46 +05:30
Ameya Shenoy
6cf350bcdc
Merge pull request #6013 from codingCoffee/gridjs 
grid_list: fixed event binding on paging
 2018-08-27 11:11:23 +00:00
Ameya Shenoy
6ebc9581fc
grid_list: fixed event binding on paging 2018-08-27 11:04:19 +00:00
Ameya Shenoy
fcb28d36ee Reverting file permissions (#6012) 2018-08-27 16:20:37 +05:30
Rushabh Mehta
ad9ce8a3a3 fix(test): test_scheduler.py 2018-08-27 11:20:25 +05:30
Valmik
9f61c47bc1 Rename google maps doctype, add helper methods (#6001) 
* rename google maps doctype, add helper methods

* fixed patch to use correct check
 2018-08-27 11:13:44 +05:30
Faris Ansari
0ad9b4b910
Merge pull request #6010 from pratu16x7/show_alert 
[alerts] add data-actions in show_alert()
 2018-08-26 11:50:41 +05:30
Prateeksha Singh
7448ea1938 [alerts] add data-actions in show_alert() 2018-08-26 09:41:00 +05:30
Charles-Henri Decultot
dab491e55f Doctype links in foreign language (#5745) 
* Doctype search in foreign language

* List comprehension slightly faster

* Remove obsolete comment

* Remove trailing whitespace

* Test case for address and contact query

* Refactor search and add tests

* Travis test debug

* Remove debug print

* Search limit removal for untranslated docs and tests refactor

* Remove old comments

* Test modification for Travis

* remove unused import

* Correct Role doctype
 2018-08-24 15:23:20 +05:30
Charles-Henri Decultot
6bb36a8c0e Possibility to set custom calendar options (#5957) 
* Possibility to set custom calendar options

* Codacy corrections

* Codacy correction

* Codacy corrections

* Set now indicator as default

* Weekend options as a button

* Codacy corrections

* Move preferences to localStorage

* Codacy corrections

* Update calendar.js
 2018-08-24 15:22:40 +05:30
Zarrar
565c4b24d4 [Enhance] Data Import (#5962) 
* fix checkbox toggling for mandatory option

* update / insert functionality added

* minor changes for naming_series and with_data_download

* changes related to insert record

* show name field as mandatory for update records

* codacy fix

* add parent field to file incase of importing only child table for new records

* test case fixes for Data Import

* added select option instead of checkbox for inert/update

* make action field mandatory
 2018-08-24 15:18:20 +05:30
Neil Trini Lasrado
aef4e03b3d Use email title hook to fetch subject in Welcome Emails sent to new users (#5984) 
* Fix email title hook

* Welcome email code cleanup
 2018-08-24 15:15:48 +05:30
Faris Ansari
aeed1979f6 Portal list filters (#6007) 
* Add list filters in portal

* Show label on input
 2018-08-24 15:14:31 +05:30
Ameya Shenoy
c60e976fdc
Merge pull request #5992 from codingCoffee/print 
[feature] print multiple docs from multiple doctypes
 2018-08-24 08:26:15 +00:00
Ameya Shenoy
8776376c13
multi fixes 
- [fix] removed _ as a variable since it is used in translations
- linting fixes
- added error logging for permission errors
 2018-08-23 10:47:01 +00:00
Rushabh Mehta
b672cba9dc
enhance(control): eval expression in numeric fields (#5995) 
* enhance(control): eval expression in numeric fields

* fix(control): handle bad expression
 2018-08-23 16:01:05 +05:30
Shreya Shah
503da4d7d7 Modify smallest currency fraction for USD (#6000) 2018-08-23 16:00:43 +05:30
Himanshu Mishra
c5323fd536 [fix]: decorate get_sidebar_stats with frappe.read_only (#6003) 2018-08-23 15:54:34 +05:30