Merge branch 'master' of http://git.sourcecode.co.th/apichatt/smartrmscalendar

Apichat.Tum
2 parents 1244ae71 b50709d9
Showing 4 changed files with 32 additions and 1 deletions Show diff stats
.idea/modules.xml
.idea/smartrmscalendar.iml
common/models/events.js
common/models/events.json
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/smart-rms-calendar.iml" filepath="$PROJECT_DIR$/.idea/smart-rms-calendar.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/smartrmscalendar.iml" filepath="$PROJECT_DIR$/.idea/smartrmscalendar.iml" />
     </modules>
   </component>
 </project>
 \ No newline at end of file
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
 \ No newline at end of file
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function(Events) {
+
+};
@@ -0,0 +1,14 @@
+{
+  "name": "events",
+  "plural": "events",
+  "base": "PersistedModel",
+  "idInjection": true,
+  "options": {
+    "validateUpsert": true
+  },
+  "properties": {},
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}
...	...	@@ -2,7 +2,7 @@
2	2	<project version="4">
3	3	<component name="ProjectModuleManager">
4	4	<modules>
5		- <module fileurl="file://$PROJECT_DIR$/.idea/smart-rms-calendar.iml" filepath="$PROJECT_DIR$/.idea/smart-rms-calendar.iml" />
	5	+ <module fileurl="file://$PROJECT_DIR$/.idea/smartrmscalendar.iml" filepath="$PROJECT_DIR$/.idea/smartrmscalendar.iml" />
6	6	</modules>
7	7	</component>
8	8	</project>
9	9	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,12 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<module type="WEB_MODULE" version="4">
	3	+ <component name="NewModuleRootManager">
	4	+ <content url="file://$MODULE_DIR$">
	5	+ <excludeFolder url="file://$MODULE_DIR$/.tmp" />
	6	+ <excludeFolder url="file://$MODULE_DIR$/temp" />
	7	+ <excludeFolder url="file://$MODULE_DIR$/tmp" />
	8	+ </content>
	9	+ <orderEntry type="inheritedJdk" />
	10	+ <orderEntry type="sourceFolder" forTests="false" />
	11	+ </component>
	12	+</module>
0	13	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,5 @@
	1	+'use strict';
	2	+
	3	+module.exports = function(Events) {
	4	+
	5	+};
...	...
...	...	@@ -0,0 +1,14 @@
	1	+{
	2	+ "name": "events",
	3	+ "plural": "events",
	4	+ "base": "PersistedModel",
	5	+ "idInjection": true,
	6	+ "options": {
	7	+ "validateUpsert": true
	8	+ },
	9	+ "properties": {},
	10	+ "validations": [],
	11	+ "relations": {},
	12	+ "acls": [],
	13	+ "methods": {}
	14	+}
...	...