[SUCS Devel] [Git][sucssite/sucs-site][master] 2 commits: Added ckeditor stable as a submodule to htdocs/js/ckeditor

[Imran Hussain]

Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
657d2b85 by Robert Scott James at 2015-09-15T18:55:22Z
Added ckeditor stable as a submodule to htdocs/js/ckeditor
Added a gitignore so that the files generated by the setup script don't
get added to the repo in future.
Also included the the cached template folder 'template_c' so that
doesn't get included either

 Changes to be committed:
	new file:   .gitignore
	new file:   .gitmodules
	new file:   htdocs/js/ckeditor

- - - - -
e516326e by Imran Hussain at 2015-09-16T07:23:30Z
Merge branch 'master' into 'master'

ckeditor is now included as a submodule

Added ckeditor stable as a submodule to htdocs/js/ckeditor
Added a gitignore so that the files generated by the setup script don't get added to the repo in future.
Also included the the cached template folder 'template_c' so that doesn't get included either

 Changes to be committed:
* new file:   .gitignore
* new file:   .gitmodules
* new file:   htdocs/js/ckeditor

See merge request !3

- - - - -


3 changed files:

- + .gitignore
- + .gitmodules
- + htdocs/js/ckeditor


Changes:

=====================================
.gitignore
=====================================
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+# Some of the files that are generated by the setup script don't want to be version controlled.
+# To that end I have added this .gitignore file to ignore the following files and folders
+
+# This is the generated .htaccess
+htdocs/.htaccess
+
+# Generated settings.php file
+settings.php
+
+# Compiled templates_c
+templates_c/


=====================================
.gitmodules
=====================================
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "htdocs/js/ckeditor"]
+	path = htdocs/js/ckeditor
+	url = git://github.com/ckeditor/ckeditor-releases.git


=====================================
htdocs/js/ckeditor
=====================================
--- /dev/null
+++ b/htdocs/js/ckeditor
@@ -0,0 +1 @@
+Subproject commit a93cb51eb1fc85a13892706dd61eccfd4c999947



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/a4206f63445405303f0f93b3f7f59f19f80ee979...e516326e2c95a2f4686f8c0427db0382ddb7fcb3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20150916/ea9a62f2/attachment.html>