Commit graph

8587 commits

Author SHA1 Message Date
Anand Doshi
c4cb6171df Merge pull request #1442 from ashishacharya/sm-docs
Sm docs
2015-12-01 15:27:29 +05:30
Ashish Acharya
c651ed05fa Sync images 2015-12-01 12:33:47 +05:30
Ashish Acharya
88495dd9a9 Home nav-bar color fix, breadcrumbs positioned above H1
To do:
- Home navigation bar CSS is in the docs_home.html — figure out how to
change this from docs.less instead
- “Improve this page” has been hacked with negative top-margin to align
it with “Next:… ->” link. Move this before the next link in content and
style accordingly.
2015-12-01 12:07:23 +05:30
Rushabh Mehta
3f883eea1c Merge pull request #1217 from MaxMorais/develop
3 Silly small fixes for fields
2015-12-01 10:50:15 +05:30
Ashish Acharya
5d3ab20218 Icons for breadcrumbs, edit, next. Updated developer docs. 2015-11-30 21:03:32 +05:30
Ashish Acharya
18dd901f9a Content pages styling for typography + WIP
Need to figure out:
- How to detect home page and change header styling
- Where breadcrumbs are included in the layout
- Where “Improve this Page” is included and how to get it in line with
the “Next” link (in docs)
2015-11-30 20:21:19 +05:30
Ashish Acharya
fb1caa0727 Fixed documentation page width & docs index 2015-11-30 17:26:17 +05:30
Rushabh Mehta
e8e3de811e Merge pull request #1440 from rmehta/setup-wizard-fixes
[fix] system settings saving in frappe
2015-11-30 17:16:52 +05:30
Rushabh Mehta
21ee0142ce [minor] quote form link in email 2015-11-30 17:02:56 +05:30
Ashish Acharya
61a9e1dcec Header background and footer 2015-11-30 16:07:56 +05:30
Rushabh Mehta
658b19990d [fix] system settings saving in frappe 2015-11-30 15:11:57 +05:30
Rushabh Mehta
8c5c6bad14 [minor] added throw option to frappe.has_permission 2015-11-30 15:10:24 +05:30
Rushabh Mehta
7a338ca869 Merge pull request #1438 from ccfiel/patch-7
typo error
2015-11-30 14:21:12 +05:30
Rushabh Mehta
d2aac3657d Merge pull request #1432 from saurabh6790/app_listing
erpnext_shopify app in app listing
2015-11-30 14:20:56 +05:30
Rushabh Mehta
f98af8a036 Merge branch 'develop' 2015-11-30 12:22:17 +05:30
Rushabh Mehta
05151e0434 bumped to version 6.10.4 2015-11-30 12:52:17 +06:00
Rushabh Mehta
c54d65d575 [hot] [typo] 2015-11-30 12:21:45 +05:30
Rushabh Mehta
d2097b5d3e Merge branch 'develop' 2015-11-30 12:02:07 +05:30
Rushabh Mehta
30486ca9a6 bumped to version 6.10.3 2015-11-30 12:32:07 +06:00
Rushabh Mehta
3313622e1c [minor] translation fix 2015-11-30 11:29:57 +05:30
Rushabh Mehta
cfb8c9cab3 [minor] validate file is attached 2015-11-30 10:50:45 +05:30
Rushabh Mehta
d0baea0d4b [fix] remove not-implemented feature convert_to in Communication 2015-11-30 10:31:01 +05:30
Anand Doshi
2498df464d Merge branch 'develop' 2015-11-27 14:58:36 +05:30
Anand Doshi
4ac2030573 bumped to version 6.10.2 2015-11-27 15:28:36 +06:00
Anand Doshi
f535d6306e Merge pull request #1437 from rmehta/upload-grid
[minor] date formatting for bulk grid upload
2015-11-27 14:46:05 +05:30
Rushabh Mehta
a549bffac2 [minor] date formatting for bulk grid upload 2015-11-27 11:59:41 +05:30
Saurabh
eec665a96e [fixes] app email id 2015-11-27 11:33:18 +05:30
Saurabh
7fe443498f [app-list] erpnext_shopify in app listing 2015-11-27 11:33:18 +05:30
Ashish Acharya
481c441f53 Anti-alias all text 2015-11-26 21:51:59 +05:30
Ashish Acharya
30e7dac067 Wrapping other home sections in a container 2015-11-26 21:48:21 +05:30
Ashish Acharya
3713ef5baa Styling for homepage splash 2015-11-26 21:32:22 +05:30
Ashish Acharya
59e80b70a0 Separating out navbar from content*
*To accommodate splash mostly
2015-11-26 20:58:45 +05:30
Ashish Acharya
2c9748b09a Some global styling 2015-11-26 20:52:22 +05:30
Ashish Acharya
67ae33f999 Adding base styling for home splash 2015-11-26 20:50:51 +05:30
Ashish Acharya
8693623a88 Removing fixed width constraint from base template 2015-11-26 20:48:43 +05:30
Ashish Acharya
3a65d7a1ff Base Code 2015-11-26 20:46:18 +05:30
Anand Doshi
bcc6de2bda Merge branch 'develop' 2015-11-26 18:11:19 +05:30
Anand Doshi
2e01b030de bumped to version 6.10.1 2015-11-26 18:41:19 +06:00
Anand Doshi
175ed78f8a [hotfix] catch exception during thumbnail generation 2015-11-26 18:09:21 +05:30
Rushabh Mehta
0917ed9cb0 [minor] date picker fixes, t=today, fixes #3830, #4380 2015-11-26 15:41:24 +05:30
Rushabh Mehta
46d9ac0977 [minor] [fix] website.js 2015-11-26 15:39:59 +05:30
Anand Doshi
bab459a4e0 Merge pull request #1422 from anandpdoshi/fix/catch-pop3-exceptions
Catch 2 exceptions in pop3 receive
2015-11-26 14:14:16 +05:30
Anand Doshi
32b9cfc31b Merge pull request #1436 from rmehta/email-alert-comment
[enhancement] ability to add comments in email alerts
2015-11-26 13:15:57 +05:30
Anand Doshi
6177d09b18 [fix] In pop3 receive, catch authentication and timeout errors while connecting, disable incoming emails and assign the email account to system managers 2015-11-26 13:12:33 +05:30
Rushabh Mehta
097eb0a4b5 [enhancement] ability to add comments in email alerts 2015-11-26 13:07:32 +05:30
Anand Doshi
f53b6e4b21 Merge branch 'develop' 2015-11-26 12:41:06 +05:30
Anand Doshi
4ad5a022ba bumped to version 6.10.0 2015-11-26 13:11:06 +06:00
Anand Doshi
6ca836001e [translations] 2015-11-26 12:40:26 +05:30
Rushabh Mehta
7594d13479 [minor] [typo] heading 3 typo in rich text editor 2015-11-26 12:19:21 +05:30
Anand Doshi
1347a0eed5 Merge pull request #1435 from rmehta/catch-thumbnail-error
[minor] catch missing file error and just show message while making thumbnail
2015-11-26 11:04:12 +05:30