Commit graph

787 commits

Author SHA1 Message Date
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
Ameya Shenoy
f513739d1a
Merge branch 'master' into staging-fixes 2018-11-28 07:53:35 +00:00
Ameya Shenoy
9e8ce181ee
css: v10 built css 2018-11-15 19:15:23 +00:00
Mohamed_Alsum
893b7e0980 remove duplicate error mgs on submit web_form (#5972)
* remove dublicate error mgs on submit web_form

* show side-bar in RTL lang
2018-08-20 10:39:54 +05:30
Prateeksha Singh
0d8b9c8653 Revert "Modules dropdown" (#5855)
* Revert "bench use <site> should check if the  site exists (#5849)"

This reverts commit 630858eb96.

* Revert "Add option to convert password to use ASCII instead of Unicode when needed by smtp server config (#5793)"

This reverts commit 191684f6a5.

* Revert "Token based authentication (#5752)"

This reverts commit abd3333bae.

* Revert "[minor] test fix"

This reverts commit b6ba3915a6.

* Revert "allow null when time field is not required (#5832)"

This reverts commit 803f6b0c7b.

* Revert "remove duplicate field entry for fieldname two_factor_authentication (#5846)"

This reverts commit 6a06e65d20.

* Revert "Query Report (#5845)"

This reverts commit f870a0bd25.

* Revert "Modules dropdown (#5767)"

This reverts commit 6f908b3443.
2018-07-23 15:34:34 +05:30
Prateeksha Singh
6f908b3443 Modules dropdown (#5767)
* [modules-dropdown] init

* [modules-sidebar] setup structure

* [modules-sidebar] add chunks to group

* [modules-dropdown] ellipsis

* [move] help menu to explore menu

* merge help column to modules

* [modules-dropdown] get explore links from hooks

* [add] explore_link secondary

* [modules-dropdown] Places list

* [modules-dropdown] deprecate desk link, make icon dropdown

* [modules-dropdown] collapsible help menu

* [remove] global navbar icon style

* [boot] define core modules, use in dropdown

* [modules-dropdown] code style fixes
2018-07-19 18:06:37 +05:30
Faris Ansari
f4313f6b12
Remove !important rules so that custom css in Print Format can override (#5762) 2018-07-02 11:34:08 +05:30
Saurabh
1865d543b1 Merge branch 'master' into develop 2018-05-31 17:21:13 +05:30
Ameya Shenoy
9249828235 [css] uncommited files additions (#5620) 2018-05-30 11:10:32 +05:30
Ameya Shenoy
949ec96fbc
Merge branch 'master' into develop 2018-05-24 08:43:19 +00:00
rohitwaghchaure
3138234ae2 [Fix] Hyperlink showing in the pdf print (#5590) 2018-05-23 11:27:35 +05:30
Nabin Hait
e3682cec22 Fixed merge conflict 2018-05-05 12:12:28 +05:30
Nabin Hait
03264d5d6a minor fix 2018-05-03 10:45:18 +05:30
Rushabh Mehta
4fb47cf434 [chat] hide logs 2018-04-04 12:58:10 +05:30
frappe-pr-bot
f123eae4ca [Translation] Updated Translations 2018-04-03 15:48:59 +02:00
Achilles Rasquinha
9442f14fe9
Merge pull request #5242 from achillesrasquinha/website-chat
🎉 🎉 🎉Website Chat + Desktop Chat View + Attachments and Media
2018-03-29 17:22:51 +05:30
Nabin Hait
cc251a0869 Fixed merge conflict 2018-03-29 13:52:00 +05:30
Shreya Shah
19a8ef39c1 fix-checkbox-margin (#5288) 2018-03-29 11:52:29 +05:30
Achilles Rasquinha
a9c1117f2e Add chat token 2018-03-26 23:50:04 +05:30
frappe-pr-bot
ffea35a1f2 [Translation] Updated Translations 2018-03-26 12:01:27 +02:00
Faris Ansari
b383e2235f
DataTable in GridReport (#5234)
* DataTable in GridReport

* Remove query_report_old

* Remove SlickGrid library 💃
2018-03-21 12:36:55 +05:30
Faris Ansari
2322010aa6
Remove !important rules so that custom css in Print Format can override (#5235) 2018-03-21 12:35:00 +05:30
Achilles Rasquinha
611a74445e fixed bytesio object generation for python 2 and 3 for excel, wtf email 2018-03-20 01:07:17 +05:30
Achilles Rasquinha
22a318a9ff fixed throttling 2018-03-19 19:10:57 +05:30
Zlash65
49a073a102 revert css changes for email 2018-03-19 13:14:33 +05:30
Faris Ansari
3ba121f82a
[email] Add margin for heading (#5193) 2018-03-13 18:21:30 +05:30
Dhaifallah Alwadani
3d4a4428f6 Improve RTL header and sidebar for mobile view (#5082)
Fix the order of items in the header.
The sidebar will slide from the right.
2018-03-13 11:43:06 +05:30
Nabin Hait
1e55b7cc68 Fixed merge conflict 2018-03-09 16:37:43 +05:30
Prateeksha Singh
b4beb986e4 [fix] checkbox alignment fixes frappe/erpnext#12727 (#5138) 2018-03-08 14:19:28 +05:30
Kenneth Sequeira
8fb49fcac0 Responsive iframe (#5005)
* testing resposive iframe

* changes to website.css + website.less
2018-02-15 15:29:54 +05:30
Faris Ansari
2bc7ff437e
Listview fixes (#4997) 2018-02-12 14:35:38 +05:30
Nabin Hait
d66e3c50c2 Merge branch 'master' into develop 2018-02-07 16:03:29 +05:30
Faris Ansari
d85676b9ad Gantt RTL fix (#4975) 2018-02-07 14:59:28 +05:30
Achilles Rasquinha
2ce2ba690b removed mysql, use mariadb instead, committed ghost css 2018-02-07 14:17:40 +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
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
Manas Solanki
07181b37d7 fix the overflow in the controls 2018-02-05 11:56:41 +05:30
Ameya Shenoy
de6fc02509 indentation fix 43941d4 (#4944) 2018-01-31 13:10:11 +05:30
Raghavendra Kamath
7a679a99e0 Cleanup the default blog list and blog post styles (#4914)
* 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
2018-01-31 11:02:35 +05:30
Achilles Rasquinha
4604e20c60 Fixed vertical spacing 2018-01-25 14:57:08 +05:30
Achilles Rasquinha
a4c0d6dfbb chat fixes 2018-01-25 10:33:51 +05:30
Achilles Rasquinha
4443dfc75c Added Push notifications, spaces-to-tabs, fixed textarea issue 2018-01-24 19:38:31 +05:30
Achilles Rasquinha
7add0b32a8 Fixed Padding Issue 2018-01-24 16:54:27 +05:30
Achilles Rasquinha
7225b28b54 Fixed positioning issue for Firefox 2018-01-24 16:47:03 +05:30
Faris Ansari
1b0fb0bd9f
[fix] Results height in search dialog (#4903) 2018-01-24 11:31:15 +05:30
Achilles Rasquinha
17d334a5ff chat-list-notifications 2018-01-23 12:21:30 +05:30
Achilles Rasquinha
3f8bf0b5a9 added background image 2018-01-23 10:06:10 +05:30
Achilles Rasquinha
aa58f515a9 Groupable 2018-01-22 23:26:03 +05:30
Achilles Rasquinha
04091a6d83 Fixed Chat Footer Margin 2018-01-22 22:41:22 +05:30