Commit Graph

501 Commits

Author SHA1 Message Date
Kenneth Sequeira
cad7b3fbfd Merge pull request #243 from erpnext/kennethsequeira-patch-8
Minor embed fix
2018-07-15 13:25:59 +05:30
Kenneth Sequeira
e76ae51734 Minor embed fix 2018-07-15 13:25:39 +05:30
Nabin Hait
8929045d34 Merge pull request #238 from creamdory/erpnext_#13925
Amend SO and PO Documentations
2018-07-13 17:39:44 +05:30
Faris Ansari
74c30f7ece Merge pull request #242 from erpnext/conference-ticket-form
Add Tshirt size field in ticket form
2018-07-12 16:40:39 +05:30
Faris Ansari
41d8340a84 Add Tshirt size field in ticket form 2018-07-12 16:25:21 +05:30
Prateeksha Singh
3a77f59a0e Merge pull request #241 from pratu16x7/membership-form
[fix] membership form fields
2018-07-12 11:11:04 +05:30
Prateeksha Singh
9100b60234 [fix] membership form fields 2018-07-11 11:41:45 +05:30
Rushabh Mehta
1997859fe7 [link] 2018-07-10 22:50:16 +05:30
Rushabh Mehta
36eb33706c [link 2018-07-10 22:47:00 +05:30
Rushabh Mehta
3b6c0971ff [email] style 2018-07-10 19:07:25 +05:30
Rushabh Mehta
6e1cb13c06 login not required for confernece 2018-07-10 15:29:15 +05:30
Rushabh Mehta
878357222d conference ticketing 2018-07-10 15:15:25 +05:30
Rushabh Mehta
0104ec2f3d conference fixes 2018-07-10 14:30:39 +05:30
Doridel Cahanap
d9e102434d Amend SO and PO Documentations 2018-07-10 14:56:20 +08:00
Kenneth Sequeira
8e80363941 Merge pull request #237 from erpnext/kennethsequeira-patch-6
Minor fix for Embedded YouTube Video
2018-07-09 12:44:25 +05:30
Kenneth Sequeira
c28ee90330 Minor fix for Embedded YouTube Video 2018-07-09 12:42:12 +05:30
Nabin Hait
093c1ab0cd Merge pull request #210 from asbasawaraj/sponsors_section
Added sponsorship details to conference page
2018-07-06 13:25:39 +05:30
Nabin Hait
345a63dc50 Merge pull request #223 from umairsy/jun-docs
employee onboarding and separation
2018-07-06 13:15:12 +05:30
Nabin Hait
07214a2588 Update deferred-revenue.md 2018-07-06 13:14:50 +05:30
Nabin Hait
5a1150d50c Merge pull request #224 from erpnext/kennethsequeira-patch-4
Fixed email typo in the last line
2018-07-06 12:35:35 +05:30
Nabin Hait
1222fe6351 Merge pull request #226 from ESS-LLP/master
v11 docs - Human Resources
2018-07-06 12:35:17 +05:30
Nabin Hait
ae43302a70 Merge pull request #233 from felixvarghese/master
documentation for LDAP connection using StartTLS
2018-07-06 12:34:29 +05:30
Nabin Hait
0324b12026 Merge pull request #227 from mhbu50/patch-1
Update print-settings.md
2018-07-06 12:34:11 +05:30
Nabin Hait
835cc58486 Merge pull request #234 from shreyashah115/typo
Fix typo
2018-07-06 12:33:46 +05:30
Prateeksha Singh
d8282d8bbb Merge pull request #235 from pratu16x7/triggers-temp-fix
[fix][temp] set membership triggers with a delay
2018-07-06 11:46:47 +05:30
Prateeksha Singh
39eaddcfc7 [fix][temp] set membership triggers with a delay 2018-07-06 11:45:44 +05:30
Shreya
45db135b4c Fix typo 2018-07-06 10:41:53 +05:30
felixvarghese
66f7a39817 documentation for LDAP connection using StartTLS 2018-07-05 21:23:38 +05:30
Kenneth Sequeira
d92f5f0ad1 Merge pull request #229 from erpnext/kennethsequeira-patch-report-build
Fix Video embed link
2018-07-03 20:38:36 +05:30
Kenneth Sequeira
be75cce082 Merge pull request #230 from erpnext/kennethsequeira-patch-5
Added Spacing between Video and Header
2018-07-03 19:46:08 +05:30
Kenneth Sequeira
d7d4f57bb1 Added Spacing between Video and Header 2018-07-03 19:44:50 +05:30
Kenneth Sequeira
5cc6d1bc23 Fix Video embed link
Fixing the video embed link for Custom Report Builder.

Earlier it was just a blank space having the container.

Now:
2018-07-03 17:21:24 +05:30
Faris Ansari
04e4464064 Merge pull request #219 from pratu16x7/reuse-sidebar
Use _sidebar.json of parent if not found, remove redundant jsons
2018-07-03 15:11:39 +05:30
Prateeksha Singh
ce7736da3c [requirements] remove frappe_theme 2018-07-03 13:21:58 +05:30
Prateeksha Singh
bd7d2c552f Merge pull request #228 from pratu16x7/job-portal-webform
[portal][urgent] summernote issue
2018-07-02 12:31:14 +05:30
Prateeksha Singh
b81187fb73 [portal][fix] job decription summernote 2018-07-02 12:29:04 +05:30
Mohammed R Abukhamseen
45a0151046 Update print-settings.md
Network Printer
2018-07-02 02:24:37 +03:00
anoop
a50234fe41 v11 docs, index updated, added links to payroll, tax and leave pages in human-resource-setup to keep it short 2018-07-01 17:32:24 +05:30
anoop
2a96f4321b v11 docs updated 2018-07-01 17:04:56 +05:30
anoop
b39a47bd11 v11 docs additional salary, retention bonus, benefit application, claim, tax declaration and proof, tax setup 2018-07-01 12:08:36 +05:30
anoop
6375b4ce56 v11 salary and payroll docs 2018-07-01 12:05:47 +05:30
anoop
3cf6354304 v11 leaves documentation 2018-07-01 11:23:56 +05:30
Kenneth Sequeira
a24ad217a4 Fixed email typo in the last line
foundation@erpnext,org -> foundation@erpnext.org
2018-06-30 19:31:14 +05:30
Umair Sayed
a6b627cb86 deferred revenue and other docs 2018-06-30 01:21:29 +05:30
Umair Sayed
70f77877e1 employee onboarding and separation 2018-06-28 18:30:20 +05:30
anoop
785cce5c1f file name corrected 2018-06-28 18:09:48 +05:30
anoop
f57307de67 mention about employee history 2018-06-28 18:08:51 +05:30
Rushabh Mehta
99e7dc6616 Merge pull request #222 from shreyashah115/fix-image
Fix image link
2018-06-27 16:22:10 +05:30
Prateeksha Singh
b263df056d [portal][hooks] add look_for_sidebar_json hook 2018-06-27 15:58:20 +05:30
Shreya
3766238e81 Fix image link 2018-06-26 17:56:00 +05:30