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

15069 commits

This branch
This branch
All branches
Author SHA1 Message Date
ci2014
a40c8dd3bb Allow users to define default language for print format (#4777) 
* Update print_format.json

* Update print.js

* Update print.js

* Update form.js

* Set default lang when print_format lang not found
 2018-02-13 13:33:52 +05:30
Achilles Rasquinha
8112bbe2a9
Merge pull request #4998 from achillesrasquinha/py3-fixes 
Python 3 Fixes [Merge ASAP]
 2018-02-13 12:40:12 +05:30
Achilles Rasquinha
4433250cda Python 3 fixes 2018-02-13 12:27:02 +05:30
Shridhar Patil
abaa7d4e18 If user has active session, redirect to desk (#4661) 
* Redirect to desk if user has active session

* Removed un used imports

* if website user redirect to /me

* Update login.py
 2018-02-13 11:19:43 +05:30
Britlog
ec52cb4744 Price rounding Half Up (#4904) 2018-02-13 11:03:03 +05:30
Revant Nandgaonkar
856cbfa675 Attach file via ReST API (POST) (#4965) 
* Attach file via ReST API (POST)

* [Fix] import save_file

* request body as param, validate request method

* explicit naming - decode_base64
 2018-02-12 17:06:58 +05:30
Faris Ansari
2bc7ff437e
Listview fixes (#4997) 2018-02-12 14:35:38 +05:30
Nabin Hait
70d4a2f24e Trim filer values 2018-02-09 14:52:07 +05:30
Achilles Rasquinha
ab3e0db288
Merge pull request #4988 from achillesrasquinha/worker-quiet 
Optional to make worker quiet
 2018-02-09 10:31:21 +05:30
Achilles Rasquinha
255e88d297 Ensure worker is quiet during development 2018-02-08 23:58:55 +05:30
Saurabh
e5c3cc43ac Merge branch 'master' into develop 2018-02-08 15:28:44 +05:30
Saurabh
bc40ed5a87 Merge branch 'hotfix' 2018-02-08 15:28:44 +05:30
Saurabh
3c59f8f422 bumped to version 10.0.22 2018-02-08 15:58:44 +06:00
Faris Ansari
ebbc28ce4d
[hotfix] Fallback for indicator_formatter doc (#4985) 2018-02-08 13:09:54 +05:30
Prateeksha Singh
ac5e44d6d8
Merge pull request #4984 from netchampfaris/hotfix-set_indicator_formatter 
[hotfix] Fallback for indicator_formatter doc
 2018-02-08 13:00:01 +05:30
Faris Ansari
f388868261 [hotfix] Fallback for indicator_formatter doc 2018-02-08 12:55:29 +05:30
Prateeksha Singh
1d5a257d70
Merge pull request #4983 from pratu16x7/baselist-tweaks 
[baselist] add custom_filter_configs
 2018-02-08 12:16:12 +05:30
Prateeksha Singh
7a29765288 [baselist] add custom_filter_configs 2018-02-08 12:14:39 +05:30
Achilles Rasquinha
3dc04c3d07
Merge pull request #4982 from achillesrasquinha/py3-fix-2 
Fix importlib error
 2018-02-08 12:05:05 +05:30
Achilles Rasquinha
30726f6706 Fix importlib error 2018-02-08 11:40:12 +05:30
Raghavendra Kamath
88a8fa053b Update README to add new logo (#4979) 
* Update readme to add new frappe logo

* Change Height to adjust new logo
 2018-02-07 16:46:06 +05:30
Nabin Hait
d66e3c50c2 Merge branch 'master' into develop 2018-02-07 16:03:29 +05:30
Nabin Hait
408c2f8c61 Merge branch 'hotfix' 2018-02-07 16:03:28 +05:30
Nabin Hait
b2a7b3f614 bumped to version 10.0.21 2018-02-07 16:33:28 +06:00
Faris Ansari
d85676b9ad Gantt RTL fix (#4975) 2018-02-07 14:59:28 +05:30
Raghavendra Kamath
6f99a24a2c correct the meta block portion (#4978) 2018-02-07 14:59:07 +05:30
Achilles Rasquinha
60bedad29a
Merge pull request #4977 from achillesrasquinha/mycli 
removed mysql, use mariadb instead, committed ghost css
 2018-02-07 14:45:54 +05:30
Achilles Rasquinha
2ce2ba690b removed mysql, use mariadb instead, committed ghost css 2018-02-07 14:17:40 +05:30
Faris Ansari
1c24dae099
[hotfix] Docname as int (#4976) 
* [hotfix] Docname passed as number

* typo
 2018-02-07 12:29:10 +05:30
KanchanChauhan
43cdb2104d Define Icon and color in doctype (#4909) 2018-02-07 11:04:36 +05:30
rohitwaghchaure
2625cefe89 [Fix] Link formatter, Indicator not showing in the item link field for stock entry (#4966) 
* [Fix] Link formatter, Indicator not showing in the item link field for stock entry

* Handle empty df
 2018-02-06 15:25:53 +05:30
Shreya Shah
5f6477ae7a [Fix] Visibility of close icon (#4969) 
* fix visibility of close button

* add margin to close icon
 2018-02-06 10:41:50 +05:30
Achilles Rasquinha
d66cf3d7da
Merge pull request #4970 from frappe/raghukamath-patch-1 
Remove the blogpost cover image max-width
 2018-02-05 18:24:29 +05:30
Raghavendra Kamath
d87d2eb71f
Remove the blogpost image width 
This PR removes the width set for the blogpost cover image, because in case of long titles the title will have bigger length than the image
 2018-02-05 18:08:52 +05:30
Prateeksha Singh
03720775d0
Merge pull request #4967 from manassolanki/fix-data-column 
fix the overflow in the controls
 2018-02-05 12:01:50 +05:30
nick9822
6e6c48e01b Set Is Private as per file attribute (#4964) 2018-02-05 11:59:45 +05:30
Manas Solanki
07181b37d7 fix the overflow in the controls 2018-02-05 11:56:41 +05:30
Nabin Hait
e3de8c10ef Fixed merge conflict 2018-02-03 09:04:25 +05:30
Nabin Hait
9ce93b6a8e Merge branch 'hotfix' 2018-02-03 09:02:54 +05:30
Nabin Hait
5321db785c bumped to version 10.0.20 2018-02-03 09:32:54 +06:00
Zarrar
bd88965e20 class added wrongly (#4961) 2018-02-03 09:00:21 +05:30
Manas Solanki
76262c4657 don't show import button if import is in progress (#4960) 2018-02-02 17:06:18 +05:30
Nabin Hait
119f284225
Validation for file header (#4959) 2018-02-02 15:34:05 +05:30
Manas Solanki
267d16575c throw message for the bad add fetch (#4939) 
* throw message for the bad add fetch

* wrong fieldname in the error message of add fetch configuration
 2018-02-02 11:32:57 +05:30
Nabin Hait
04cb1d0833 Don't hide checkboxes in grid row after submission (#4951) 2018-02-02 11:30:07 +05:30
Nabin Hait
ed717cc86b Fixed timeline message (#4953) 2018-02-02 11:29:47 +05:30
Ameya Shenoy
8ea8027093 modified address and contact js (#4862) 
* modified aaddress and contact js

- temporary fix to handle route_history if docname is naming_series with a '/' in the name- permanant fix would be to modify route options
- PR linked to frappe/erpnext#12215

* considered cases with more '/'s in doc name
 2018-01-31 18:51:58 +05:30
Raghavendra Kamath
c561bf97d7 Add social media meta tags in blog post page (#4948) 
* make changes in the blog templates

* Add the inline styles to website.less
I also tweaked the design a bit, added h1 for header and increased the spacing a bit.

* Remove inline style and add css to less file

also added some spacing to make the blogpost look good by default.

* make the headings bold

* Add meta tags for social media in blog post page
 2018-01-31 18:35:48 +05:30
Nabin Hait
3a34055700 Fixed merge conflict 2018-01-31 17:29:24 +05:30
Nabin Hait
565ca00795 Merge branch 'hotfix' 2018-01-31 17:23:43 +05:30