repo string | commit string | message string | diff string |
|---|---|---|---|
croxis/CityMania | 5d0bce58569a0705a3ee0b3216bebf42ce2011fd | Small fixes. Seperated camera to own file | diff --git a/client/camera.py b/client/camera.py
new file mode 100644
index 0000000..076fa47
--- /dev/null
+++ b/client/camera.py
@@ -0,0 +1,292 @@
+from panda3d.core import Vec3,Vec2
+from direct.showbase import DirectObject
+from direct.task import Task
+import math
+
+import gui
+picker = gui.getPicker()
+
+class Ca... |
croxis/CityMania | c7428e66f22f396873def1024da049c3cf24ef8c | Prototype 5. Bug fixes, new camera control, and new gui | diff --git a/client/boxes.py b/client/boxes.py
new file mode 100644
index 0000000..d68845f
--- /dev/null
+++ b/client/boxes.py
@@ -0,0 +1,383 @@
+
+"""
+boxes.py
+
+A partial implementation of the theory of packing boxes (for laying out
+objects in two dimensions, although it could easily be extended to 3D)
+from GTK+... |
croxis/CityMania | deb2f51692cf34e50ad2bb1a26c925f195d395cc | Improved camera controls | diff --git a/client/gui.py b/client/gui.py
index 9ddecc1..8a36868 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -1,638 +1,648 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import *
from direct.showbase import DirectObject
from direct.gui.DirectGui im... |
croxis/CityMania | 15b32853f8a71da9e088ca840d4d4c415241f07b | Fixed crashing bus for non admin user entering city. | diff --git a/server/region.py b/server/region.py
index 1abebdf..53a3e92 100644
--- a/server/region.py
+++ b/server/region.py
@@ -1,216 +1,216 @@
# -*- coding: utf-8 -*-
"""
region.py
Class for server region, esentially the master model
"""
import engine
import city
import Image
import base64, math
import Stri... |
croxis/CityMania | c49e458788be14c0e0819cddf83544f8d98d7003 | Prototype 4 quick camera hackjob | diff --git a/client/gui.py b/client/gui.py
index 8c0a3ad..9ddecc1 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -1,638 +1,638 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import *
from direct.showbase import DirectObject
from direct.gui.DirectGui im... |
croxis/CityMania | 68b1c40363912c6cd75dba7ebc5ede981bef4184 | Prototype 4 | diff --git a/CityMania.e4p b/CityMania.e4p
index 9fb3b82..c7a97db 100644
--- a/CityMania.e4p
+++ b/CityMania.e4p
@@ -1,174 +1,180 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-4.6.dtd">
<!-- eric4 project file for project CityMania -->
-<!-- Saved: 2010-01-23, 19:28:28 -->
+<!-- Saved: ... |
croxis/CityMania | 2d885c508158a2ad462f980103e43a105993345e | Fixed xy inverse bug. Thank god | diff --git a/client/environment.py b/client/environment.py
index 0d923a0..1aa77f7 100644
--- a/client/environment.py
+++ b/client/environment.py
@@ -1,412 +1,426 @@
# -*- coding: utf-8 -*-
'''environment.py
Classes responsible for environment such as terrain, lighting, skyboxes, etc.
'''
from direct.showbase impor... |
croxis/CityMania | 9e4bb3ac03a1ba0ca287593ee2e31b028f0db695 | Server bug fixes. | diff --git a/Protocol/protocol.proto b/Protocol/protocol.proto
index 407a1de..b6f4a50 100644
--- a/Protocol/protocol.proto
+++ b/Protocol/protocol.proto
@@ -1,128 +1,130 @@
// Protocols common to both client and server
// Base container which stores all messages
message Container {
optional Chat chat = 1;
... |
croxis/CityMania | 5402ce4bb04677bad0b9576ce489dfe1672ef95f | Added server loggging. Refractored user login and logout. Kick and disconnect clients who log in with same username and password. | diff --git a/Protocol/protocol.proto b/Protocol/protocol.proto
index 14495e3..407a1de 100644
--- a/Protocol/protocol.proto
+++ b/Protocol/protocol.proto
@@ -1,127 +1,128 @@
// Protocols common to both client and server
// Base container which stores all messages
message Container {
optional Chat chat = 1;
... |
croxis/CityMania | 15f2b190b3c375805551cde792b803404a183144 | Prototype III.I - Fixed city label bug and hsould not always be viewable | diff --git a/client/environment.py b/client/environment.py
index 6540ab5..2de46d6 100644
--- a/client/environment.py
+++ b/client/environment.py
@@ -1,413 +1,414 @@
# -*- coding: utf-8 -*-
'''environment.py
Classes responsible for environment such as terrain, lighting, skyboxes, etc.
'''
from direct.showbase impor... |
croxis/CityMania | a3b5bf7b618e6ced06446bd9a484532609b5e3b3 | Fixed escape to cancel city bug. | diff --git a/client/environment.py b/client/environment.py
index e47e8bb..6540ab5 100644
--- a/client/environment.py
+++ b/client/environment.py
@@ -1,415 +1,413 @@
# -*- coding: utf-8 -*-
'''environment.py
Classes responsible for environment such as terrain, lighting, skyboxes, etc.
'''
from direct.showbase impor... |
croxis/CityMania | edbfcc80dc70f80586ee3265ba5ca66a23abbaae | Optimized collision ray picker and water geometry. | diff --git a/client/environment.py b/client/environment.py
index 907f53f..e47e8bb 100644
--- a/client/environment.py
+++ b/client/environment.py
@@ -1,385 +1,415 @@
# -*- coding: utf-8 -*-
'''environment.py
Classes responsible for environment such as terrain, lighting, skyboxes, etc.
'''
from direct.showbase impor... |
croxis/CityMania | 9ee990a75807870c1da66484a3229daa6fcf2c99 | Misk bug fixes for Prototype III | diff --git a/client/environment.py b/client/environment.py
index 668c0ac..907f53f 100644
--- a/client/environment.py
+++ b/client/environment.py
@@ -1,383 +1,385 @@
# -*- coding: utf-8 -*-
'''environment.py
Classes responsible for environment such as terrain, lighting, skyboxes, etc.
'''
from direct.showbase impor... |
croxis/CityMania | f9902e5fad19218a70003a85fc085f447ddc7ae5 | Prototype 4 | diff --git a/client/environment.py b/client/environment.py
index 9e2bd85..668c0ac 100644
--- a/client/environment.py
+++ b/client/environment.py
@@ -1,366 +1,383 @@
# -*- coding: utf-8 -*-
'''environment.py
Classes responsible for environment such as terrain, lighting, skyboxes, etc.
'''
from direct.showbase impor... |
croxis/CityMania | 8acd5dc04c4ce170d1a89ddfdc3fd829a47fc5c9 | New terrain manager. Final update before prototype cleanup. | diff --git a/Protocol/protocol.proto b/Protocol/protocol.proto
index 080316f..14495e3 100644
--- a/Protocol/protocol.proto
+++ b/Protocol/protocol.proto
@@ -1,125 +1,127 @@
// Protocols common to both client and server
// Base container which stores all messages
message Container {
optional Chat chat = 1;
... |
croxis/CityMania | 1a12906f78de7b8268e91a35e900ddf3df8a877f | mor ebleh | diff --git a/Protocol/protocol.proto b/Protocol/protocol.proto
index 4c93ff9..080316f 100644
--- a/Protocol/protocol.proto
+++ b/Protocol/protocol.proto
@@ -1,123 +1,125 @@
// Protocols common to both client and server
// Base container which stores all messages
message Container {
optional Chat chat = 1;
... |
croxis/CityMania | 3546581b8d92d23a26f5db9239bc9b39b57fa887 | more bug fixes | diff --git a/client/protocol_pb2.py b/client/protocol_pb2.py
deleted file mode 100644
index 1365e7a..0000000
--- a/client/protocol_pb2.py
+++ /dev/null
@@ -1,726 +0,0 @@
-# Generated by the protocol buffer compiler. DO NOT EDIT!
-
-from google.protobuf import descriptor
-from google.protobuf import message
-from googl... |
croxis/CityMania | c3017e5e61714b5fb8e8d181ccd51294f7dfb2dc | Fixed camera panning | diff --git a/client/gui.py b/client/gui.py
index a921c31..0d1218c 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -1,681 +1,683 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import CollisionTraverser,CollisionHandlerQueue,CollisionNode,CollisionRay,GeomN... |
croxis/CityMania | d719f6c08f0ea4c3cbe538f492e9d07a435a9c7a | Various fixes. | diff --git a/client/gui.py b/client/gui.py
index d176513..a921c31 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -1,719 +1,681 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import CollisionTraverser,CollisionHandlerQueue,CollisionNode,CollisionRay,GeomN... |
croxis/CityMania | f5ded041e16e9fbf8f83209002c7780bc0d1ba7c | Added camera panning | diff --git a/client/gui.py b/client/gui.py
index 14904ff..d176513 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -1,781 +1,719 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import CollisionTraverser,CollisionHandlerQueue,CollisionNode,CollisionRay,GeomN... |
croxis/CityMania | 240a68a30b9be65c84b7755fae7ce0faf6c2b04c | Finished city labling | diff --git a/client/gui.py b/client/gui.py
index 0c2a8a8..14904ff 100644
--- a/client/gui.py
+++ b/client/gui.py
@@ -1,750 +1,781 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import CollisionTraverser,CollisionHandlerQueue,CollisionNode,CollisionRay,GeomN... |
croxis/CityMania | a1b0de39009850511113df9e4281b6e637892efd | Added water and skydome | diff --git a/client/Models/dome2.egg b/client/Models/dome2.egg
new file mode 100644
index 0000000..6a0e1fb
--- /dev/null
+++ b/client/Models/dome2.egg
@@ -0,0 +1,6409 @@
+<CoordinateSystem> { Z-Up }
+
+<Comment> {
+ "bam2egg sky.bam skydome2.egg"
+}
+<VertexPool> vpool {
+ <Vertex> 0 {
+ 0 0 -1
+ <Norma... |
croxis/CityMania | 8c023736dd1fe37df3b9ece231a055f89a546078 | 512 region map. Added city labels WIP. | diff --git a/client/directWindow.py b/client/directWindow.py
index 50aae16..2abd35d 100644
--- a/client/directWindow.py
+++ b/client/directWindow.py
@@ -1,313 +1,334 @@
from pandac.PandaModules import TextNode, Vec3
from direct.gui.DirectGui import DirectFrame,DirectButton,DirectScrolledFrame,DGG
-import direct.dir... |
croxis/CityMania | 2151aef053f6d5954b2ad77f989dcab45badbecd | Temporary fix | diff --git a/server/server.py b/server/server.py
index 9cbc9c9..36e89d4 100644
--- a/server/server.py
+++ b/server/server.py
@@ -1,187 +1,190 @@
# -*- coding: utf-8 -*-
"""
City Mania
version: You have to start somewhere right?
"""
import engine
import region
import sys
sys.path.append("..")
import common.p... |
croxis/CityMania | 5988b8af5a8d31f591c3a023133ffdb59bde65ab | Updating server | diff --git a/server/engine.py b/server/engine.py
index 3357ee8..2c86bbb 100644
--- a/server/engine.py
+++ b/server/engine.py
@@ -1,114 +1,115 @@
# -*- coding: utf-8 -*-
-
"""
CityMania Engine
Contains message system, task manager, and the like
"""
+import time
class EventManager(object):
def __init__ (sel... |
croxis/CityMania | ff3702c65466b3d55506ec5e8a956eadb5d1387e | forgot the maps | diff --git a/server/Maps/TestRegion/heightmap.png b/server/Maps/TestRegion/heightmap.png
new file mode 100644
index 0000000..f64e838
Binary files /dev/null and b/server/Maps/TestRegion/heightmap.png differ
|
croxis/CityMania | c2fd2fbf41e88fbbf39cb5b70f37218431862d86 | forgot the new common files | diff --git a/common/__init__.py b/common/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/common/protocol_pb2.py b/common/protocol_pb2.py
index 7f5df42..1365e7a 100644
--- a/common/protocol_pb2.py
+++ b/common/protocol_pb2.py
@@ -1,718 +1,726 @@
# Generated by the protocol buffer compiler. DO NOT ... |
croxis/CityMania | ce10534a3319c5325507d2462db09e73b3932607 | Various bug fixes | diff --git a/CityMania.sln b/CityMania.sln
deleted file mode 100644
index 50c7b41..0000000
--- a/CityMania.sln
+++ /dev/null
@@ -1,35 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C# Express 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CityMania", "CityMania\CityMania.cspr... |
croxis/CityMania | 8c19ce86d957b22dfefe59752fec7ec606cfcada | Prototype 2. City founding. | diff --git a/CityMania.e4p b/CityMania.e4p
index 9f6ce50..9fb3b82 100644
--- a/CityMania.e4p
+++ b/CityMania.e4p
@@ -1,54 +1,174 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-4.6.dtd">
<!-- eric4 project file for project CityMania -->
-<!-- Saved: 2010-01-19, 10:55:44 -->
+<!-- Saved: 2... |
croxis/CityMania | 6219a6c612db8e1056ed944f1b509a7de1d9bec8 | Broken update, just committing lots of goodies | diff --git a/CityMania.e4p b/CityMania.e4p
new file mode 100644
index 0000000..9f6ce50
--- /dev/null
+++ b/CityMania.e4p
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Project SYSTEM "Project-4.6.dtd">
+<!-- eric4 project file for project CityMania -->
+<!-- Saved: 2010-01-19, 10:55:44 -->
+<!-- Co... |
croxis/CityMania | f23a1248a1cf501f16454169755d135a453fcb9f | Lots of changes addition. Client,s erver, and common code locations added. | diff --git a/LinuxClient/Textures/XcityTex.png b/LinuxClient/Textures/XcityTex.png
deleted file mode 100644
index 6d75d35..0000000
Binary files a/LinuxClient/Textures/XcityTex.png and /dev/null differ
diff --git a/LinuxClient/Textures/noise.png b/LinuxClient/Textures/noise.png
deleted file mode 100644
index dbd92cc..00... |
croxis/CityMania | 521f328673f63eb5667f0f9c3060befb93e2962f | Added ability to found cities. UI needs a lot of love. | diff --git a/LinuxClient/Textures/tile2.png b/LinuxClient/Textures/tile2.png
new file mode 100644
index 0000000..bf05264
Binary files /dev/null and b/LinuxClient/Textures/tile2.png differ
diff --git a/LinuxClient/gui.py b/LinuxClient/gui.py
index 2e4f174..749e36c 100644
--- a/LinuxClient/gui.py
+++ b/LinuxClient/gui.py... |
croxis/CityMania | 0924a346e40275083e873cbc333e88989ba02258 | Terrain prototype | diff --git a/LinuxClient/Shaders/terraintexture.sha b/LinuxClient/Shaders/terraintexture.sha
index 2daa83b..8e94722 100644
--- a/LinuxClient/Shaders/terraintexture.sha
+++ b/LinuxClient/Shaders/terraintexture.sha
@@ -1,61 +1,63 @@
//Cg
//
//Cg profile arbvp1 arbfp1
+//from http://www.panda3d.org/phpbb2/viewtopic.p... |
croxis/CityMania | 8263b21d81016f31eed2fe7aedbd9ca98a268575 | Final commit for Panda 1.6.x series. | diff --git a/LinuxClient/gui.py b/LinuxClient/gui.py
index c1a9f5d..0e12e2c 100644
--- a/LinuxClient/gui.py
+++ b/LinuxClient/gui.py
@@ -1,503 +1,538 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import CollisionTraverser,CollisionHandlerQueue,CollisionN... |
croxis/CityMania | 870647c9d9e5c6bb3fb5d0d41c766f7a4f710c1f | Added new terrain generator. Adjustments will be needed | diff --git a/LinuxClient/Shaders/terraintexture.sha b/LinuxClient/Shaders/terraintexture.sha
new file mode 100644
index 0000000..2daa83b
--- /dev/null
+++ b/LinuxClient/Shaders/terraintexture.sha
@@ -0,0 +1,61 @@
+//Cg
+//
+//Cg profile arbvp1 arbfp1
+
+void vshader( in float4 vtx_position : POSITION,
+ i... |
croxis/CityMania | a5fb8b7d360fd57bc5b08191417411f0cc1e1cb8 | Latest update before vacation | diff --git a/LinuxClient/gui.py b/LinuxClient/gui.py
index 170e82e..c1a9f5d 100644
--- a/LinuxClient/gui.py
+++ b/LinuxClient/gui.py
@@ -1,464 +1,503 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
-from pandac.PandaModules import CollisionTraverser,CollisionHandlerQueue,CollisionN... |
croxis/CityMania | 493ee2f806fe26695757104ec4f20f6b9bcf5411 | Linuxclient now accepts large protocol messages. Uses and end string key to improve netcode robustness. Now to find a way on getting map binary strings onto screen. | diff --git a/LinuxClient/gui.py b/LinuxClient/gui.py
index 3a8eac9..170e82e 100644
--- a/LinuxClient/gui.py
+++ b/LinuxClient/gui.py
@@ -1,464 +1,464 @@
# -*- coding: utf-8 -*-
'''
Classes and functions for the user interface
'''
from pandac.PandaModules import CollisionTraverser,CollisionHandlerQueue,CollisionN... |
croxis/CityMania | b932be9b33078cec9e9d5a94ddce32f2606dc7b7 | Major overhaul. Removed server to seperate repo. Added Panda3d client. Tested login system. Untested map request. | diff --git a/CityManiaServer/chat.py b/CityManiaServer/chat.py
deleted file mode 100644
index c3cd8cd..0000000
--- a/CityManiaServer/chat.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Chat server engine and interpriter
-TODO: impliment IRC protocol
-"""
-import engine
-import protocol_pb2 as proto
-... |
croxis/CityMania | 7cb8eac0f62e97ee0e7a725657e46f16721599ea | Rudimentry chat added. Moved user admin to CommandProcessor. Will reject packets from clients who failed to log in. | diff --git a/CityManiaServer/chat.py b/CityManiaServer/chat.py
index e5a9528..c3cd8cd 100644
--- a/CityManiaServer/chat.py
+++ b/CityManiaServer/chat.py
@@ -1,72 +1,121 @@
# -*- coding: utf-8 -*-
"""
Chat server engine and interpriter
TODO: impliment IRC protocol
"""
import engine
+import protocol_pb2 as proto
... |
croxis/CityMania | db3382ee4dc1ce7258c65942fef544481614b17a | I lied, I finished added basic config.bmp support. | diff --git a/CityManiaServer/region.py b/CityManiaServer/region.py
index 759602a..0b4fe47 100644
--- a/CityManiaServer/region.py
+++ b/CityManiaServer/region.py
@@ -1,123 +1,128 @@
# -*- coding: utf-8 -*-
"""
region.py
Class for region, esentially the master model
"""
import engine
import protocol_pb2 as proto
... |
croxis/CityMania | 3a89b77300ba2c3454ec2487b52cf2fe5976b7cb | Added some chat capaity and starts of region building. Might stop because apparently I am doing it all wrong | diff --git a/CityManiaServer/chat.py b/CityManiaServer/chat.py
new file mode 100644
index 0000000..e5a9528
--- /dev/null
+++ b/CityManiaServer/chat.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+"""
+Chat server engine and interpriter
+TODO: impliment IRC protocol
+"""
+import engine
+
+class ChatServer(engine.Entity):
... |
croxis/CityMania | be04e8f2508b3c291f7eec6359be835f3d2c5ed6 | Added initial region generation capacity | diff --git a/CityManiaServer/city.py b/CityManiaServer/city.py
new file mode 100644
index 0000000..5f2a2ae
--- /dev/null
+++ b/CityManiaServer/city.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+"""
+City class! Woot woot
+"""
+import engine
+
+class City(engine.Entity):
+ """
+ This is the City class, the center ... |
croxis/CityMania | c92061d85dda450dd4e980fc0a8c0688da9df780 | Network communication functional. Fixed bugs. | diff --git a/CityManiaServer/client.py b/CityManiaServer/client.py
index 75b601d..918907f 100644
--- a/CityManiaServer/client.py
+++ b/CityManiaServer/client.py
@@ -1,76 +1,77 @@
# -*- coding: utf-8 -*-
"""
Test client for network protocols
"""
import engine
# Networking
import threading, socket
class Serv... |
croxis/CityMania | 25be9f091c0038ecbe889a7338f741444ae5d74f | Moved things around a bit to make Protocol, Client(s) and server indipendent | diff --git a/CityManiaServer/client.py b/CityManiaServer/client.py
new file mode 100644
index 0000000..75b601d
--- /dev/null
+++ b/CityManiaServer/client.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+"""
+Test client for network protocols
+"""
+import engine
+
+# Networking
+import threading, socket
+
+class ServerSoc... |
croxis/CityMania | 8ed444f7cee9c1a9834171b630fbd267e5074ab5 | Small proto source location change. Added python protocol compiler. Added some protocols. | diff --git a/CityMania/Protocol/compilePython.sh b/CityMania/Protocol/compilePython.sh
new file mode 100644
index 0000000..d3e6bdc
--- /dev/null
+++ b/CityMania/Protocol/compilePython.sh
@@ -0,0 +1,2 @@
+
+protoc --proto_path=/. --python_out=/. protocol.proto
\ No newline at end of file
diff --git a/CityMania/Protocol... |
croxis/CityMania | 7dd1081fbfa3b9e78d0a972ba69676b4cf02ebe2 | Began region class | diff --git a/CityMania/Server/region.py b/CityMania/Server/region.py
new file mode 100644
index 0000000..094cabc
--- /dev/null
+++ b/CityMania/Server/region.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+"""
+region.py
+Class for region, esentially the master model
+"""
+from server import Entity
+class Region(Entity):
... |
croxis/CityMania | c446b2b6c2b41b7e9cbd59761596106ea02a57d5 | Done! Ready to build communication protocol and simulation. | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9c95182
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+CityMania/Bin
+CityMania/Obj
+Debug
diff --git a/CityMania Design Document.pdf b/CityMania Design Document.pdf
new file mode 100644
index 0000000..dd676c7
Binary files /dev/null and b/CityMan... |
chriswong/mooshell | 0300d237978ba65f2b3f9c20acb2eb56a5a83717 | show lib options depends on the settings | diff --git a/context_processors.py b/context_processors.py
index 90faf7a..a2f9b23 100644
--- a/context_processors.py
+++ b/context_processors.py
@@ -1,16 +1,17 @@
from django.conf import settings
def load_settings(request):
return {
'project_name': settings.MOOSHELL_PROJECT_NAME,
'project_status': se... |
chriswong/mooshell | 1b8359239ae302edb6c5a0decd8a17ec5837f6ee | library tag attributes and body tag may be edited | diff --git a/context_processors.py b/context_processors.py
index 1dbd39b..90faf7a 100644
--- a/context_processors.py
+++ b/context_processors.py
@@ -1,16 +1,16 @@
from django.conf import settings
def load_settings(request):
return {
'project_name': settings.MOOSHELL_PROJECT_NAME,
'project_status': se... |
chriswong/mooshell | 0883e621b0907aac491f7e20d167aa14cc950675 | all static files are using urls.py | diff --git a/templates/embedded.html b/templates/embedded.html
index c93d862..99b59e6 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,140 +1,140 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 2696c01af089b8ac3517c9a1bd9608f4bd83c94c | title fix | diff --git a/templates/_mooshell_settings.html b/templates/_mooshell_settings.html
index 729aeca..7b49935 100644
--- a/templates/_mooshell_settings.html
+++ b/templates/_mooshell_settings.html
@@ -1,33 +1,36 @@
{% load mooshell_extras %}
{% if edit_title %}
<div class='text'><p>
Title:<br/>
{{ pastieform.title }... |
chriswong/mooshell | 398b4191ff3e2bd4074ab29b04802763c0b42a47 | title and description functionality, about moved to Credits | diff --git a/media/css/light.css b/media/css/light.css
index 3c4edf7..d5d6b3b 100644
--- a/media/css/light.css
+++ b/media/css/light.css
@@ -1,73 +1,82 @@
/* colors for mooShell functionality only */
body { background: #efefef; }
#sidebar { color: #444; background-color: #fff; }
#sidebar #branding { color: #... |
chriswong/mooshell | 132df0ffedda883375f7b320d5341ba475170367 | Few style adjustments | diff --git a/media/css/style.css b/media/css/style.css
index df4720e..84b11c3 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1,177 +1,203 @@
/* generic styles for mooShell functionality only */
/* generic tools */
body { font-family: Helvetica, Arial; }
/* main structure */
#sidebar { width: 2... |
chriswong/mooshell | 635c7cc616cc369f1a2efd3bdfe923a783fd9d3e | all tabs and skin settings may be set via GET variables | diff --git a/views.py b/views.py
index 4131e6e..24b20fe 100644
--- a/views.py
+++ b/views.py
@@ -1,315 +1,316 @@
import os.path
import random
import time
from django.shortcuts import render_to_response, get_object_or_404
from django.views import static
from django.conf import settings
from django.http impor... |
chriswong/mooshell | 8da3f970e586491ce4004b4678f545b4372408d0 | URL (/u/ is also working) | diff --git a/urls.py b/urls.py
index 45c8f72..fe84085 100644
--- a/urls.py
+++ b/urls.py
@@ -1,78 +1,87 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^css/(?P<path>.*)$', 'serve_static'... |
chriswong/mooshell | 5a512cd2f2404645ba81806df66f487c38220247 | URL fix | diff --git a/media/css/style.css b/media/css/style.css
index 9b72ef8..df4720e 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1,176 +1,177 @@
/* generic styles for mooShell functionality only */
/* generic tools */
body { font-family: Helvetica, Arial; }
/* main structure */
#sidebar { width: 2... |
chriswong/mooshell | 8fa8811cf433c5a42770eaf5b83f6c6b2297d75b | use pastie url after new version, fixed urls with version | diff --git a/media/js/Actions.js b/media/js/Actions.js
index 34f6e57..a36ff42 100644
--- a/media/js/Actions.js
+++ b/media/js/Actions.js
@@ -1,150 +1,150 @@
/*
* Define actions on the run/save/clean buttons
*/
var MooShellActions = new Class({
Implements: [Options, Events],
options: {
// onRun: $empty,
... |
chriswong/mooshell | f6ead71f4e6eb36d2294ccd3bf5e00feb526f5da | removed shared data as errorin url if versions used | diff --git a/templates/_mooshell_share.html b/templates/_mooshell_share.html
index c33b7aa..d021949 100644
--- a/templates/_mooshell_share.html
+++ b/templates/_mooshell_share.html
@@ -1,23 +1,23 @@
-{% if example_url %}
+{% if False %}{#example_url %}#}
{% load mooshell_extras %}
<div class='text' id='share_links'... |
chriswong/mooshell | 837cd5ebc629bf62bf129a260ac189c01d4a555b | url removed an option to not provide a slash after version | diff --git a/urls.py b/urls.py
index 41da16f..f6a304f 100644
--- a/urls.py
+++ b/urls.py
@@ -1,80 +1,78 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^css/(?P<path>.*)$', 'serve_static'... |
chriswong/mooshell | 657aae5f4dfdc95137b6ed7672878597b0b14306 | /u/[user]/[slug] url change | diff --git a/urls.py b/urls.py
index bf9cebc..41da16f 100644
--- a/urls.py
+++ b/urls.py
@@ -1,80 +1,80 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^css/(?P<path>.*)$', 'serve_static'... |
chriswong/mooshell | d86f813e75dae892cded6c5563e39b221d056123 | sharing out of accordion | diff --git a/templates/_mooshell_share.html b/templates/_mooshell_share.html
index a490213..c33b7aa 100644
--- a/templates/_mooshell_share.html
+++ b/templates/_mooshell_share.html
@@ -1,21 +1,23 @@
{% if example_url %}
{% load mooshell_extras %}
- <h3 class='toggler' id='share_toggler'>Share</h3>
- <div class='elem... |
chriswong/mooshell | a6b03a7b54eb11219b9b362a7ab7d1258fd07c53 | GET skin and tabs dependency removed - caching for these was off, it is now on | diff --git a/templates/embedded.html b/templates/embedded.html
index 98e818b..c93d862 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,140 +1,140 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | aa874c8a5bd775cfe89455b895853c65f0f799c3 | share link fix | diff --git a/templates/_mooshell_share.html b/templates/_mooshell_share.html
index 9afed8e..a490213 100644
--- a/templates/_mooshell_share.html
+++ b/templates/_mooshell_share.html
@@ -1,21 +1,21 @@
{% if example_url %}
{% load mooshell_extras %}
<h3 class='toggler' id='share_toggler'>Share</h3>
<div class='elem... |
chriswong/mooshell | 9292350fa31b7d10d11492445d862826f3c419f0 | sidebar float fix | diff --git a/media/css/style.css b/media/css/style.css
index da80be0..9b72ef8 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1,176 +1,176 @@
/* generic styles for mooShell functionality only */
/* generic tools */
body { font-family: Helvetica, Arial; }
/* main structure */
-#sidebar { float: l... |
chriswong/mooshell | 41184d153985dc34f3c2476d4bc3d6fe0ca857b7 | {slug}/{version}/show url fix | diff --git a/urls.py b/urls.py
index 4a5bd96..754778c 100644
--- a/urls.py
+++ b/urls.py
@@ -1,59 +1,59 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^css/(?P<path>.*)$', 'serve_static'... |
chriswong/mooshell | c23cea2f601f02efe1538b7374803761580ba06a | slight JS changes | diff --git a/templates/embedded.html b/templates/embedded.html
index 996aee3..98e818b 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,140 +1,140 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 03ca506f42a3df25eddb125c4bd1828aaeadf0bc | label dependency choice | diff --git a/templates/_js_dependencies_choice.html b/templates/_js_dependencies_choice.html
index 27b1049..4a9f23e 100644
--- a/templates/_js_dependencies_choice.html
+++ b/templates/_js_dependencies_choice.html
@@ -1,3 +1,3 @@
{% for dep in dependencies %}
- <li><input type='checkbox' id='dep_{{ dep.id }}' name='js_... |
chriswong/mooshell | cfbb626f94d8a4b59a4596e93c975a2853f0c65e | console removed | diff --git a/templates/embedded.html b/templates/embedded.html
index 704dfef..996aee3 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,141 +1,140 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | ced97c51599e2e24f546cfd12c3006c6b20c2661 | play button switches to result tab | diff --git a/templates/embedded.html b/templates/embedded.html
index 8fa96f6..704dfef 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,128 +1,141 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 55a7d48adf152a5b9d57ba23bbf8ff2f1a0b0df8 | Actions links in embedded version do not contain href='#' anymore | diff --git a/media/css/embedded-light.css b/media/css/embedded-light.css
index 864bc70..afb63b9 100644
--- a/media/css/embedded-light.css
+++ b/media/css/embedded-light.css
@@ -1,147 +1,148 @@
body {
font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
font-size: .7em;
margin: 0;
padding: 0;
}
body,... |
chriswong/mooshell | 9c46dc09c14ffbddf70ca0d9e6b5217fb818aca2 | Moving URL input firld to the newly created share Sidebar section. | diff --git a/media/css/style.css b/media/css/style.css
index 1c243c3..da80be0 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1,174 +1,176 @@
/* generic styles for mooShell functionality only */
/* generic tools */
body { font-family: Helvetica, Arial; }
/* main structure */
#sidebar { float: l... |
chriswong/mooshell | 85ca3f47ccbe14e92ad45f001a8a632224ac1713 | Fixed formatting in JS files- this should fix IE issues' | diff --git a/media/js/Actions.js b/media/js/Actions.js
index 48c6b55..34f6e57 100644
--- a/media/js/Actions.js
+++ b/media/js/Actions.js
@@ -1,150 +1,150 @@
/*
* Define actions on the run/save/clean buttons
*/
var MooShellActions = new Class({
Implements: [Options, Events],
options: {
// onRun: $empty,
... |
chriswong/mooshell | 4ddd0c018ffb578615cf1b9f55943cea2eecacce | Slightly altered CSS | diff --git a/media/css/embedded-mootools.css b/media/css/embedded-mootools.css
index 45dc0ce..478d8cc 100644
--- a/media/css/embedded-mootools.css
+++ b/media/css/embedded-mootools.css
@@ -1,149 +1,153 @@
body {
font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
font-size: .7em;
margin: 0;
padding: 0;... |
chriswong/mooshell | 61e017f5bcdb6b8c037553367179777d4d86c53d | jitter less visible | diff --git a/templates/embedded.html b/templates/embedded.html
index 54ef2eb..ce48694 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,128 +1,128 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 3428219018b2490ba27707ada1a3dd2175b53fc2 | firebug removed | diff --git a/templates/embedded.html b/templates/embedded.html
index c66abcd..54ef2eb 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,129 +1,128 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | d41e52bc52aa1a1dfccd0da7bbe1aba7f6bd385c | fix height of syntax highlighted element - recur | diff --git a/templates/embedded.html b/templates/embedded.html
index e1cfde0..c66abcd 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,125 +1,129 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 561f30c4abd2d9fd48b24d86dbd3162a49a02ad2 | fix height of syntax highlighted element | diff --git a/templates/embedded.html b/templates/embedded.html
index 87b313c..e1cfde0 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,108 +1,125 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 13655c98ac22d181749a1b39a15d4fa3a863de89 | Fixed a bug with syntaxt-highlighting within the embeddable | diff --git a/templates/embedded.html b/templates/embedded.html
index 203a70c..df59334 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,108 +1,108 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 9b2ce5de167d4a3b8b74ed5a68aa2967e5d548de | Lighter url fix | diff --git a/templates/embedded.html b/templates/embedded.html
index 203a70c..5c042e5 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,108 +1,108 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://w... |
chriswong/mooshell | 0c597dddf6e8e0355e169820a4e398bba55b22cb | result branding - mootools | diff --git a/media/css/result-mootools.css b/media/css/result-mootools.css
index 544bd32..18c3481 100644
--- a/media/css/result-mootools.css
+++ b/media/css/result-mootools.css
@@ -1 +1,37 @@
-body { background: white; }
+body {
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: .9em;
+ padding: 0;
+ ... |
chriswong/mooshell | f217000f7dc2ad7b4566eacf85bc64c20b0b6aab | skin used in edit mode | diff --git a/templates/pastie_edit.html b/templates/pastie_edit.html
index 149aca0..0c835f0 100644
--- a/templates/pastie_edit.html
+++ b/templates/pastie_edit.html
@@ -1,99 +1,100 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmln... |
chriswong/mooshell | 3492f9a84763d84ce4e2ec5ab479912451194406 | increased cache time | diff --git a/views.py b/views.py
index 9753ff0..b779344 100644
--- a/views.py
+++ b/views.py
@@ -1,306 +1,306 @@
import os.path
import random
import time
from django.shortcuts import render_to_response, get_object_or_404
from django.views import static
from django.conf import settings
from django.http impor... |
chriswong/mooshell | d5824f9458cdf4065e3a90fd81c92509e5888fb2 | fixes for IE and ability to use shells as resources | diff --git a/templates/pastie_edit.html b/templates/pastie_edit.html
index 933dfa9..149aca0 100644
--- a/templates/pastie_edit.html
+++ b/templates/pastie_edit.html
@@ -1,97 +1,99 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns... |
chriswong/mooshell | 4c2e0c22e06966e0acd7af256d94141e9f4dfd12 | nodelay in html/json echo | diff --git a/urls.py b/urls.py
index c7b44a0..4a5bd96 100644
--- a/urls.py
+++ b/urls.py
@@ -1,57 +1,59 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^css/(?P<path>.*)$', 'serve_static'... |
chriswong/mooshell | 22938c49e8507aa23700c4fee97f5127fcbe065d | copy change | diff --git a/templates/_mooshell_about.html b/templates/_mooshell_about.html
index 3301fca..0cb245a 100644
--- a/templates/_mooshell_about.html
+++ b/templates/_mooshell_about.html
@@ -1,29 +1,33 @@
<h3 id='about_toggler' class='toggler'>About</h3>
<div class='element'>
- <p>This project is under heavy development. P... |
chriswong/mooshell | 7943ab7246b7c1ca9655de10746823d25309bf7a | Altered MooShell logo | diff --git a/media/css/embedded-light.css b/media/css/embedded-light.css
index 9842df0..864bc70 100644
--- a/media/css/embedded-light.css
+++ b/media/css/embedded-light.css
@@ -1,147 +1,147 @@
body {
font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
font-size: .7em;
margin: 0;
padding: 0;
}
body,... |
chriswong/mooshell | dfede867810ef684ffb26ad6eb94367a980c8c43 | Altered MooShell logo | diff --git a/media/img/mooshell-frame.sprite.png b/media/img/mooshell-frame.sprite.png
index 4ee4ace..f9842f5 100644
Binary files a/media/img/mooshell-frame.sprite.png and b/media/img/mooshell-frame.sprite.png differ
|
chriswong/mooshell | 34639b0cdec477e066d513bb9fbe4214504ef18c | Reworking the Embeddable | diff --git a/media/css/embedded-light.css b/media/css/embedded-light.css
index d8e7346..9842df0 100644
--- a/media/css/embedded-light.css
+++ b/media/css/embedded-light.css
@@ -1,136 +1,147 @@
body {
font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
font-size: .7em;
margin: 0;
padding: 0;
- /*height:... |
chriswong/mooshell | d62cbc4ee48d6ea020dfc2a02a09d3bdcfc47bb0 | ability to use third party templates and static files | diff --git a/settings.py b/settings.py
index bb55588..679b7ff 100644
--- a/settings.py
+++ b/settings.py
@@ -1,40 +1,41 @@
# default settings (usually overwritten in machine_settings.py)
# LAYOUT
MOOSHELL_CROSS_LAYOUT = "Cross"
MOOSHELL_TABS_LAYOUT = "Tabs"
MOOSHELL_SlIDES_LAYOUT = "Slides"
MOOSHELL_DEFAULT_SKI... |
chriswong/mooshell | 2696bfd7269574cdf2df2fd0c2a8e53958e44e53 | API for embedded - tags | diff --git a/settings.py b/settings.py
index 263b4cf..bb55588 100644
--- a/settings.py
+++ b/settings.py
@@ -1,36 +1,40 @@
# default settings (usually overwritten in machine_settings.py)
# LAYOUT
MOOSHELL_CROSS_LAYOUT = "Cross"
MOOSHELL_TABS_LAYOUT = "Tabs"
MOOSHELL_SlIDES_LAYOUT = "Slides"
MOOSHELL_DEFAULT_SKI... |
chriswong/mooshell | ddcddeba70b43b0f3a89dceb75c05a5112cbc4f2 | remove console logs from embedded version | diff --git a/templates/embedded.html b/templates/embedded.html
index 413eceb..0ee03f8 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,96 +1,96 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www... |
chriswong/mooshell | 5830c9f3ce62260de9aa9ca5d5102deb7506d002 | skinnable embedded and height of the embedded tabs fix | diff --git a/templates/embedded.html b/templates/embedded.html
index 31dc6a6..413eceb 100644
--- a/templates/embedded.html
+++ b/templates/embedded.html
@@ -1,95 +1,96 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www... |
chriswong/mooshell | fb0feb85398a21b7e7775f3c299fd29d6e7c7293 | shells are skinnable | diff --git a/media/css/embedded.css b/media/css/embedded-light.css
similarity index 95%
rename from media/css/embedded.css
rename to media/css/embedded-light.css
index 4f90870..d8e7346 100644
--- a/media/css/embedded.css
+++ b/media/css/embedded-light.css
@@ -1,136 +1,136 @@
body {
font-family: "Lucida Grande", Helv... |
chriswong/mooshell | d10525844412d0cfb670677ff35671fbe2d7dee3 | Fix not resizing after accordion switched | diff --git a/media/js/LayoutCM.js b/media/js/LayoutCM.js
index 632e4bd..541b10b 100644
--- a/media/js/LayoutCM.js
+++ b/media/js/LayoutCM.js
@@ -1,173 +1,174 @@
/*
Layout using CodeMirror
*/
Element.implement({
getInnerWidth: function() {
return this.getSize().x -
this.getStyle('padding-left').toIn... |
chriswong/mooshell | 96272a9d09a5e7d4443ef9213b8d0d3274d9753b | some comments in settings | diff --git a/machine_settings-default.py b/machine_settings-default.py
index de35392..e69de29 100644
--- a/machine_settings-default.py
+++ b/machine_settings-default.py
@@ -1,19 +0,0 @@
-
-MOOSHELL_SEO_TITLE_TAIL = " | to test your JavaScript code"
-MOOSHELL_SEO_TITLE_HEAD = ""
-
-MOOSHELL_TITLE_SEPARATOR = " | "
-
-MO... |
chriswong/mooshell | c25540b3236ab0ff5c9755ab8ad637f1f0cba723 | multiple libs as optgroup | diff --git a/models.py b/models.py
index c72eba7..ca10a29 100644
--- a/models.py
+++ b/models.py
@@ -1,292 +1,292 @@
from datetime import date, timedelta, datetime
from django.db import models
from django.db.models.signals import pre_save, post_save
from django.contrib.auth.models import User
from django.conf im... |
chriswong/mooshell | fa39a48d848b1aefcc5e00210c89c77cb6437eb1 | do not show google verification if none given | diff --git a/templates/pastie_edit.html b/templates/pastie_edit.html
index 0239c06..7298606 100644
--- a/templates/pastie_edit.html
+++ b/templates/pastie_edit.html
@@ -1,96 +1,96 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns... |
chriswong/mooshell | 11e18bca686eb55887816c30b82753deaf59a10a | working with google analytics and webmaster tools | diff --git a/context_processors.py b/context_processors.py
index 99d33d7..1dbd39b 100644
--- a/context_processors.py
+++ b/context_processors.py
@@ -1,14 +1,16 @@
from django.conf import settings
def load_settings(request):
return {
'project_name': settings.MOOSHELL_PROJECT_NAME,
'project_status': se... |
chriswong/mooshell | b731501b38cddae10e416da600c154dc3d8cd5c1 | wrappers with textfield instead of char | diff --git a/models.py b/models.py
index 6c28051..c72eba7 100644
--- a/models.py
+++ b/models.py
@@ -1,292 +1,292 @@
from datetime import date, timedelta, datetime
from django.db import models
from django.db.models.signals import pre_save, post_save
from django.contrib.auth.models import User
from django.conf im... |
chriswong/mooshell | 4ba34db3876b042bb1b2b4fe49388ca2d437b974 | library groups template | diff --git a/templates/_js_library_groups.html b/templates/_js_library_groups.html
new file mode 100644
index 0000000..3264469
--- /dev/null
+++ b/templates/_js_library_groups.html
@@ -0,0 +1,7 @@
+{% load mooshell_extras %}
+<select name='library_group' id='library_group'>
+ {% for group in groups %}
+ <option value=... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.