repo string | commit string | message string | diff string |
|---|---|---|---|
chriswong/mooshell | c28d5ab80f2d292a877ff5708429aac282a133da | no caching if DEBUG, fixes for multiple lib groups | diff --git a/templates/_js_libraries_options.html b/templates/_js_libraries_options.html
index c365dd2..695fde7 100644
--- a/templates/_js_libraries_options.html
+++ b/templates/_js_libraries_options.html
@@ -1,10 +1,10 @@
{% load mooshell_extras %}
<select name='js_lib' id='js_lib'>
{% for lib in libraries %}
<... |
chriswong/mooshell | 4dfe05dab8ba5b2d9876426a6d31bcac3b398f5c | group name obsolete | diff --git a/templatetags/mooshell_extras.py b/templatetags/mooshell_extras.py
index 0067866..92f08df 100644
--- a/templatetags/mooshell_extras.py
+++ b/templatetags/mooshell_extras.py
@@ -1,73 +1,77 @@
from django import template
from mooshell.models import JSLibraryGroup, JSLibrary, JSDependency
register = tem... |
chriswong/mooshell | 8c0b502ac0796e905e519af7a25a9520c16cad1e | caching + multiple library groups | diff --git a/context_processors.py b/context_processors.py
index 922811d..99d33d7 100644
--- a/context_processors.py
+++ b/context_processors.py
@@ -1,13 +1,14 @@
from django.conf import settings
def load_settings(request):
return {
'project_name': settings.MOOSHELL_PROJECT_NAME,
'project_status': se... |
chriswong/mooshell | b2361bd38981b690c217e0c58a936c46ddce8ea6 | editor gaps to 8px | diff --git a/media/css/style.css b/media/css/style.css
index 2a118be..b277607 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1,177 +1,174 @@
/* generic styles for mooShell functionality only */
/* generic tools */
body { font-family: Helvetica, Arial; }
/* main structure */
-#sidebar { float: l... |
chriswong/mooshell | a8512cd9016653482f896f4318caa2fe85bd2903 | Actions fix (no pairs) | diff --git a/media/js/Actions.js b/media/js/Actions.js
index 0ffd605..a6f615a 100644
--- a/media/js/Actions.js
+++ b/media/js/Actions.js
@@ -1,125 +1,125 @@
/*
* Define actions on the run/save/clean buttons
*/
var MooShellActions = new Class({
Implements: [Options, Events],
options: {
// onRun: $empty,
... |
chriswong/mooshell | d8d7a12c235ef2e51e4414ff27c7ba89a2f328ec | different layout (columns instead of rows) google analytics if not in debug | diff --git a/context_processors.py b/context_processors.py
index f5e2d4e..922811d 100644
--- a/context_processors.py
+++ b/context_processors.py
@@ -1,12 +1,13 @@
from django.conf import settings
def load_settings(request):
return {
'project_name': settings.MOOSHELL_PROJECT_NAME,
'project_status': se... |
chriswong/mooshell | e2d880e64df0ce971c9e4adb807f3b755207e99d | urls with username fixed | diff --git a/urls.py b/urls.py
index 836dc64..20bbecc 100644
--- a/urls.py
+++ b/urls.py
@@ -1,53 +1,53 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^codemirror/(?P<path>.*)$', 'codemirr... |
chriswong/mooshell | e3ad51fe138adcb8b20feab75c8ce96d11e5e195 | Added a few modifications to the views. The MooShell Frame is no longer using Fireworks source file. | diff --git a/media/css/light.css b/media/css/light.css
index 6fa7448..8f513c2 100644
--- a/media/css/light.css
+++ b/media/css/light.css
@@ -1,72 +1,73 @@
/* colors for mooShell functionality only */
body { background: #efefef; }
#sidebar { color: #444; background-color: #fff; }
#sidebar #branding { color: #... |
chriswong/mooshell | 605dafab7e2688ae83ca5b1cc505a7e70ffd9289 | Fixed the action-bar. Updated the sprites (light theme) file | diff --git a/media/img/sprites-source.png b/media/img/sprites-source.png
new file mode 100644
index 0000000..39e5acc
Binary files /dev/null and b/media/img/sprites-source.png differ
|
chriswong/mooshell | 20a51d334fb03a090111c4b0ad76b87fc5f23ec7 | add ability to switch of a JSDependency if no longer needed. It will stay in database as it will be needed for shells which used it | diff --git a/media/js/Settings.js b/media/js/Settings.js
index 904ea7d..2690c9a 100644
--- a/media/js/Settings.js
+++ b/media/js/Settings.js
@@ -1,35 +1,35 @@
/*
* Settings loader
*/
var MooShellSettings = new Class({
Implements: [Options],
options: {
library_id: 'js_library',
dependency_id: 'js_depen... |
chriswong/mooshell | 586a54e8b47022e5d30e960755868147cea2d7d6 | clientcide lib included | diff --git a/media/js/lib/clientcide-2.2.0-nc.js b/media/js/lib/clientcide-2.2.0-nc.js
new file mode 100644
index 0000000..de97176
--- /dev/null
+++ b/media/js/lib/clientcide-2.2.0-nc.js
@@ -0,0 +1,7396 @@
+/* Clientcide Copyright (c) 2006-2009, http://www.clientcide.com/wiki/cnet-libraries#license*/
+
+//Contents: Cli... |
chriswong/mooshell | f2782abca0a38b7eda07a6196a5538ce2427f0d4 | mooshell settings styling slightly changed | diff --git a/media/css/style.css b/media/css/style.css
index 366eceb..f015941 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -1,133 +1,137 @@
/* generic styles for mooShell functionality only */
/* generic tools */
body { font-family: Helvetica, Arial; }
/* main structure */
#sidebar { float: l... |
chriswong/mooshell | 04e5b5b2eaf3a3d449b1a7dee1e50c2052ad3638 | 404 fix and iframe size | diff --git a/media/css/embedded.css b/media/css/embedded.css
index fd133a4..4f90870 100644
--- a/media/css/embedded.css
+++ b/media/css/embedded.css
@@ -1,136 +1,136 @@
body {
font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
font-size: .7em;
margin: 0;
padding: 0;
height: 100%;
}
body, ul, ol,... |
chriswong/mooshell | 9a3024ec588fb9a753982dfd0ab665492ac128d0 | embedded | diff --git a/media/css/embedded.css b/media/css/embedded.css
new file mode 100644
index 0000000..fd133a4
--- /dev/null
+++ b/media/css/embedded.css
@@ -0,0 +1,136 @@
+body {
+ font-family: "Lucida Grande", Helvetica, Arial, sans-serif;
+ font-size: .7em;
+ margin: 0;
+ padding: 0;
+ height: 100%;
+}
+
+body, ul, ol, li... |
chriswong/mooshell | 010127217ac32e832039a83f49883e8cf2567cc3 | error pages fixed | diff --git a/templates/404.html b/templates/404.html
index 1a350ca..9461b63 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,147 +1,147 @@
<!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.w3.org/1999/xhtml... |
chriswong/mooshell | 2c0606536c6b0b5f00d241be56ebc682f13d96cc | Views for authors refactored | diff --git a/urls.py b/urls.py
index 7836da3..d44910b 100644
--- a/urls.py
+++ b/urls.py
@@ -1,47 +1,53 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^codemirror/(?P<path>.*)$', 'codemirr... |
chriswong/mooshell | 18f65cd12ce71eff83c895c05d19fa141ab62f55 | fix in the fix | diff --git a/urls.py b/urls.py
index b64e274..7836da3 100644
--- a/urls.py
+++ b/urls.py
@@ -1,47 +1,47 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^codemirror/(?P<path>.*)$', 'codemirr... |
chriswong/mooshell | d8b6421335d50ecc1fa2b33d3d053aec0c7ac1f6 | API fix for versions and users | diff --git a/urls.py b/urls.py
index e718c3f..b64e274 100644
--- a/urls.py
+++ b/urls.py
@@ -1,38 +1,47 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('mooshell.views',
url(r'^mooshellmedia/(?P<path>.*)$', 'serve_static', name='mooshell_media'),
url(r'^codemirror/(?P<path>.*)$', 'codemirr... |
chriswong/mooshell | c82e322c3c6f49a7d2284e4d6832a43bfa77eaab | search in the shells | diff --git a/admin.py b/admin.py
index 397f808..d4a76e4 100644
--- a/admin.py
+++ b/admin.py
@@ -1,32 +1,32 @@
from django.contrib import admin
from models import JSLibraryGroup, JSLibraryWrap, JSLibrary, JSDependency, Pastie, Shell
class JSLibraryGroupAdmin(admin.ModelAdmin):
pass
admin.site.register(JSLibr... |
ogijun/mixiapp_base | b4dff2a84311e21890c9626940ff618d18e3730b | Fix CRLF | diff --git a/README b/README
index d571017..fc6b6ab 100644
--- a/README
+++ b/README
@@ -1,34 +1,34 @@
-= mixiapp_base
-
-Ruby on Rails plugin for Mixi OpenSocial Gadget based on peeled-unshiu mixi plugin
-(http://wiki.unshiu.jp/)
-
-Sorry, but this document is not completed.
-
-== Installation
-
- git clone g... |
ogijun/mixiapp_base | 64e65f6cb03d130e67e2639fc252c0c121a2b9ee | Stopped to use paginating_find. | diff --git a/app/helpers/gadget_helper.rb b/app/helpers/gadget_helper.rb
index 565de68..df2af2a 100644
--- a/app/helpers/gadget_helper.rb
+++ b/app/helpers/gadget_helper.rb
@@ -1,242 +1,200 @@
module GadgetHelper
unless const_defined? :JQUERY_VAR
JQUERY_VAR = '$'
end
def link_to_update(name, options ... |
ogijun/mixiapp_base | 03870d803927fcc4e752946aaa8bc1a5511aba46 | Removed locaale related files. | diff --git a/config/initializers/asset_host.rb b/config/initializers/asset_host.rb
index 8a9ccbf..473762a 100644
--- a/config/initializers/asset_host.rb
+++ b/config/initializers/asset_host.rb
@@ -1 +1 @@
-ActionController::Base.asset_host = "http://"+configatron.application_domain
\ No newline at end of file
+ActionCo... |
ogijun/mixiapp_base | b8f8ebe594077f72ae306e5b45b9e7349778b1c1 | Use Configraton instead of AppResource class. | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d10ded6..d20566d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,122 +1,122 @@
# Filters added to this controller apply to all controllers in the applica... |
ogijun/mixiapp_base | 9506f961c144c0ff401dba4922f63be77bff812e | Changed db to sqlite3. | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aec6d12
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+log
+db/*.sqlite3
diff --git a/config/database.yml b/config/database.yml
index 26ca0e2..025d62a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,48 +1,22 @@
-# MySQL. Version... |
ogijun/mixiapp_base | a4a1ade7ac1805f2df413beea233c21993bfda45 | Stopped to use gettext. | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3c243b2..d10ded6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,122 +1,122 @@
# Filters added to this controller apply to all controllers in the applica... |
ogijun/mixiapp_base | f4ec4d8d211ddd052dc09178e5b3484f098147b8 | ver.1.0.2 fix bug | diff --git a/log/development.log b/log/development.log
new file mode 100644
index 0000000..e69de29
|
ogijun/mixiapp_base | 0b7ba48b01b7ce10106ced72b7f92461b55342b4 | ver.1.0.2 fix bug | diff --git a/README b/README
old mode 100644
new mode 100755
index 37ec8ea..d571017
--- a/README
+++ b/README
@@ -1,243 +1,34 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This... |
ogijun/mixiapp_base | 535de799b7e13835daad92e7864d3f2b05f6ea54 | ver.1.1.0 fix opensocial(add options) | diff --git a/lib/mixi_api.rb b/lib/mixi_api.rb
index a2c03c5..4f3cb45 100755
--- a/lib/mixi_api.rb
+++ b/lib/mixi_api.rb
@@ -1,125 +1,125 @@
class MixiApi
def initialize(requester)
container = {
:endpoint => AppResources[:api_endpoint],
:content_type => 'application/json',
:rest ... |
ogijun/mixiapp_base | 54713ca64f7549405158006c82526b889a371869 | ver.1.0.1 add url param opensocial_viewer_id for access log | diff --git a/log/development.log b/log/development.log
index ccc990f..f316200 100644
--- a/log/development.log
+++ b/log/development.log
@@ -7144,512 +7144,687 @@ Processing GadgetController#register_friends (for 192.168.11.100 at 2009-11-09 1
[4;36;1mSQL (0.3ms)[0m [0;1mCOMMIT[0m
[4;35;1mUser Load (0.6ms)... |
ogijun/mixiapp_base | 4168ddc5f9adea4302b58bb9ed709fdc76076208 | ver.0.1.1 add link_to_navigate :session | diff --git a/app/controllers/gadget_controller.rb b/app/controllers/gadget_controller.rb
index 550e8ce..74d03ed 100755
--- a/app/controllers/gadget_controller.rb
+++ b/app/controllers/gadget_controller.rb
@@ -1,71 +1,68 @@
require 'json'
class GadgetController < ApplicationController
protect_from_forgery :except... |
MaKla/bacalc | 509edf0d87ab9bad7db9350db037118f1f5642c8 | fixed an error in Makefile -> qt gui | diff --git a/Makefile b/Makefile
index 655f431..4b7d459 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,37 @@
UNAME := $(shell uname)
all: bin_folder tui gui server
bin_folder:
mkdir -p bin
tui:
cd src/tui; \
make
mv src/tui/tui bin/tui
gui:
cd src/gui; \
qmake -makefile; \
+ make clean;... |
MaKla/bacalc | caf293241e5e23d95e761cc7614306b08a7e0071 | added 'make zip' command in Makefile | diff --git a/Makefile b/Makefile
index 9e3ffa7..655f431 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,36 @@
UNAME := $(shell uname)
all: bin_folder tui gui server
bin_folder:
mkdir -p bin
tui:
cd src/tui; \
make
mv src/tui/tui bin/tui
gui:
cd src/gui; \
qmake -makefile; \
make
ifeq ... |
MaKla/bacalc | 52eb484d5544b34dec0fe998a0bad1425978ae65 | fixed connection bug in tui | diff --git a/src/server/server.cpp b/src/server/server.cpp
index 84eeabd..a82faee 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -1,109 +1,132 @@
#ifndef SERVER_TCP_SOURCE
#define SERVER_TCP_SOURCE
#include <arpa/inet.h>
#include <string.h>
#include <unistd.h>
#include <sstream>
#include <iost... |
MaKla/bacalc | dc8725cc0db6351fe964389810abad050e3e3749 | - added communication cap in tui | diff --git a/src/tui/Calculator.cpp b/src/tui/Calculator.cpp
index f6158f1..f514022 100644
--- a/src/tui/Calculator.cpp
+++ b/src/tui/Calculator.cpp
@@ -1,56 +1,62 @@
#include <iostream>
#include "parser.cpp"
#include "client.cpp"
#include <stdio.h>
#include <stdlib.h>
void input() {
string inputFormula;
Pa... |
MaKla/bacalc | a929404bea281c20f126d685dc706d65315c71ef | - git messed the code up -.- | diff --git a/src/validator/parser.cpp b/src/validator/parser.cpp
index 82a601f..44ea5cb 100644
--- a/src/validator/parser.cpp
+++ b/src/validator/parser.cpp
@@ -1,249 +1,212 @@
/*
* Parser.cpp
* test
*
* Created by Martin Roebert on 18.01.10.
* Copyright 2010 Martin Roebert. All rights reserved.
*
*/
... |
MaKla/bacalc | 76e1b9ac0ac7e109a51c02b76de13a55a9277a9a | Made Makefile Macos compatible | diff --git a/Makefile b/Makefile
index 35fa7e8..9e3ffa7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,33 @@
-all: tui gui server
+UNAME := $(shell uname)
+all: bin_folder tui gui server
+
+bin_folder:
+ mkdir -p bin
tui:
cd src/tui; \
make
mv src/tui/tui bin/tui
gui:
cd src/gui; \
qmake -make... |
MaKla/bacalc | fe9b5145683954a1c66a46709c064c848c126541 | - 2 brackets were missing :) | diff --git a/src/validator/parser.cpp b/src/validator/parser.cpp
index 8c73f6f..82a601f 100644
--- a/src/validator/parser.cpp
+++ b/src/validator/parser.cpp
@@ -1,166 +1,249 @@
/*
* Parser.cpp
* test
*
* Created by Martin Roebert on 18.01.10.
* Copyright 2010 Martin Roebert. All rights reserved.
*
*/
... |
MaKla/bacalc | add5f3174ab17465b45657fb97e2b4d7ae04a3e0 | Prettified version | diff --git a/src/client/client.cpp b/src/client/client.cpp
index b2ed1fc..295a296 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,99 +1,90 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iost... |
MaKla/bacalc | ec121f6127e90358f6447ec856c7c60d21756c82 | Working revision for presentation | diff --git a/Makefile b/Makefile
index 8c79788..35fa7e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,24 @@
all: tui gui server
tui:
cd src/tui; \
- make; \
- mv tui ../bin
+ make
+ mv src/tui/tui bin/tui
gui:
cd src/gui; \
qmake -makefile; \
make
mv src/gui/QTCalc bin/gui
server:
cd sr... |
MaKla/bacalc | a436e227552f316b163890f41a10ed18bf43d68a | - added points | diff --git a/src/validator/parser.cpp b/src/validator/parser.cpp
index 9e448d7..e7eed6c 100644
--- a/src/validator/parser.cpp
+++ b/src/validator/parser.cpp
@@ -1,157 +1,203 @@
/*
* Parser.cpp
* test
*
* Created by Martin Roebert on 18.01.10.
* Copyright 2010 Martin Roebert. All rights reserved.
*
*/... |
MaKla/bacalc | c36cb05a614013232514af7bc0fa675885119a6c | fixed gui bug - result wasn't presented in the text field | diff --git a/src/gui/calculator.cpp b/src/gui/calculator.cpp
index b2b3f80..33e629a 100644
--- a/src/gui/calculator.cpp
+++ b/src/gui/calculator.cpp
@@ -1,159 +1,170 @@
#include "calculator.h"
#include "ui_calculator.h"
#include "parser.cpp"
#include "client.cpp"
#include <sstream>
QString host;
int port;
QSt... |
MaKla/bacalc | 2d6e3fef94bb0027f1e529513895b3f578815a3c | addes some gitignore filees | diff --git a/src/gui/.gitignore b/src/gui/.gitignore
new file mode 100644
index 0000000..5747565
--- /dev/null
+++ b/src/gui/.gitignore
@@ -0,0 +1,4 @@
+QTCalc
+Makefile*
+moc_calculator.cpp
+ui_calculator.h
|
MaKla/bacalc | 338d294ba0cb24962aebfc84ccf0cfee905dbeda | fixed bug in validator | diff --git a/src/client/client.cpp b/src/client/client.cpp
index 2eab536..b2ed1fc 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,99 +1,99 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iost... |
MaKla/bacalc | 7da92b19a799976821e75c686ab7d20d764b9236 | End of day and nothing is working, wait for next commit tomorrow | diff --git a/Makefile b/Makefile
index 9e146a2..8c79788 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,24 @@
all: tui gui server
tui:
- g++ src/tui/Calculator.cpp -o bin/tui
+ cd src/tui; \
+ make; \
+ mv tui ../bin
gui:
cd src/gui; \
qmake -makefile; \
make
mv src/gui/QTCalc bin/gui
server:... |
MaKla/bacalc | 40e6aa92cfc92ee125aa54290b7c24e0b474630e | server is now continous listening to different client connections | diff --git a/src/gui/calculator.cpp b/src/gui/calculator.cpp
index f4d03c1..f31d62d 100644
--- a/src/gui/calculator.cpp
+++ b/src/gui/calculator.cpp
@@ -1,144 +1,150 @@
#include "calculator.h"
#include "ui_calculator.h"
#include "Parser.cpp"
#include "../client/client.cpp"
-QString *host;
-int *port;
+QString hos... |
MaKla/bacalc | 78c9ada6728b229e29a5cffdc2b8ca0f10a8a1fe | fixed a buffer overflow of the socket client | diff --git a/src/client/client.cpp b/src/client/client.cpp
index b0717a3..0d10918 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,91 +1,98 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iostre... |
MaKla/bacalc | b7ea096cbf2dd092a588c491f312c3a100776e3e | Finished GUI | diff --git a/src/gui/calculator.cpp b/src/gui/calculator.cpp
index f88ba0b..5a56964 100644
--- a/src/gui/calculator.cpp
+++ b/src/gui/calculator.cpp
@@ -1,128 +1,139 @@
#include "calculator.h"
#include "ui_calculator.h"
#include "Parser.cpp"
#include "../client/client.cpp"
-QString host;
-int port;
+QString *host... |
MaKla/bacalc | 34b4c891893486447ca496ea406dbf355f62fc68 | - added server/ip input | diff --git a/src/tui/Calculator.cpp b/src/tui/Calculator.cpp
index 4bf7075..414e964 100644
--- a/src/tui/Calculator.cpp
+++ b/src/tui/Calculator.cpp
@@ -1,50 +1,64 @@
#include <iostream>
#include "Parser.cpp"
#include <../client/client.cpp>
/*
#include <QObject>
#include <QApplication>
#include <QTcpSocket>
#in... |
MaKla/bacalc | e8188bf907ae829fed5e6f43839549de7cbca495 | changed the gui a little bit; checking the connection in gui is now working | diff --git a/src/client/client.cpp b/src/client/client.cpp
index 0b8a31e..b0717a3 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,90 +1,91 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iostre... |
MaKla/bacalc | 96c1f1c0ff649bf461dfc46ebb719eb2a51856b4 | added 'check connection' functionality to gui | diff --git a/src/gui/QTCalc.pro b/src/gui/QTCalc.pro
index 866f5a1..71d1b5a 100644
--- a/src/gui/QTCalc.pro
+++ b/src/gui/QTCalc.pro
@@ -1,10 +1,11 @@
# -------------------------------------------------
# Project created by QtCreator 2010-01-19T12:03:39
# -------------------------------------------------
TARGET = Q... |
MaKla/bacalc | 240377d2a20eff8508b63a4016688522aff4e7bf | added comment for roebi | diff --git a/src/tui/Calculator.cpp b/src/tui/Calculator.cpp
index 2f493b2..4bf7075 100644
--- a/src/tui/Calculator.cpp
+++ b/src/tui/Calculator.cpp
@@ -1,47 +1,50 @@
#include <iostream>
#include "Parser.cpp"
#include <../client/client.cpp>
/*
#include <QObject>
#include <QApplication>
#include <QTcpSocket>
#in... |
MaKla/bacalc | 4284ed6d881336b49f5d2d866ded1509885fbb82 | tui uses now the server for calculations | diff --git a/src/client/client.cpp b/src/client/client.cpp
index 56ab69c..0b8a31e 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,90 +1,90 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iostre... |
MaKla/bacalc | bf36c2bbfc37ae1fcb9da43993201ac2f62d6ba5 | replaced the old qt-based client and server with the new ones | diff --git a/src/client/client.cpp b/src/client/client.cpp
index 3bb01f4..56ab69c 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,32 +1,90 @@
-#include "client.h"
-#include <QHostAddress>
+#ifndef CLIENT_TCP_SOURCE
+#define CLIENT_TCP_SOURCE
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <st... |
MaKla/bacalc | 85bd7763f53732eaf07ae68e5fbb3bc18de6e225 | sourced out calculation part of the client in own function | diff --git a/src/v4/client2.cpp b/src/v4/client2.cpp
index a5e41f0..3608cf3 100644
--- a/src/v4/client2.cpp
+++ b/src/v4/client2.cpp
@@ -1,84 +1,89 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iostream>
+#includ... |
MaKla/bacalc | a6137564e587e86486f7e9db59ba2e99036442b6 | sourced out calculation part of the client in own function | diff --git a/src/v4/client2.cpp b/src/v4/client2.cpp
index f68c106..a5e41f0 100644
--- a/src/v4/client2.cpp
+++ b/src/v4/client2.cpp
@@ -1,83 +1,84 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <iostream>
using... |
MaKla/bacalc | 70e3dd170081e69c103c2f7c8530f5f18edd91c4 | added some client debug code | diff --git a/src/v4/client2.cpp b/src/v4/client2.cpp
index e00d249..f68c106 100644
--- a/src/v4/client2.cpp
+++ b/src/v4/client2.cpp
@@ -1,71 +1,83 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <iostream>
-char*... |
MaKla/bacalc | cdcf5bfeabb1ef8df30f17e9bdcf03cb4237eb4c | server answers now the correct result, yehaa | diff --git a/src/v4/client2.cpp b/src/v4/client2.cpp
index f2f4a93..e00d249 100644
--- a/src/v4/client2.cpp
+++ b/src/v4/client2.cpp
@@ -1,71 +1,71 @@
#ifndef CLIENT_TCP_SOURCE
#define CLIENT_TCP_SOURCE
#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
char* path = "../server/se... |
MaKla/bacalc | 3580e54cb971f6da82e3c7c6b8fd3fe3243d8730 | server can now calculate, but not anwser | diff --git a/src/v4/server2.cpp b/src/v4/server2.cpp
index 9e8100c..fb864e2 100644
--- a/src/v4/server2.cpp
+++ b/src/v4/server2.cpp
@@ -1,114 +1,114 @@
#ifndef SERVER_TCP_SOURCE
#define SERVER_TCP_SOURCE
#include <arpa/inet.h>
#include <string.h>
#include <unistd.h>
#include <sstream>
#include <iostream>
#incl... |
MaKla/bacalc | 80156b29bd8913bd9af578e63dfba4eea89a5296 | server can now calculate, but not anwser | diff --git a/src/v4/server2.cpp b/src/v4/server2.cpp
index e44c1d4..9e8100c 100644
--- a/src/v4/server2.cpp
+++ b/src/v4/server2.cpp
@@ -1,105 +1,114 @@
#ifndef SERVER_TCP_SOURCE
#define SERVER_TCP_SOURCE
#include <arpa/inet.h>
#include <string.h>
#include <unistd.h>
#include <sstream>
#include <iostream>
+#incl... |
MaKla/bacalc | d67b90c53eb0a75facdb4e4538ad9c64aa7a2dc2 | made the server a little bit object oriented | diff --git a/src/v4/server2.cpp b/src/v4/server2.cpp
index 1c58b8c..e44c1d4 100644
--- a/src/v4/server2.cpp
+++ b/src/v4/server2.cpp
@@ -1,77 +1,105 @@
#ifndef SERVER_TCP_SOURCE
#define SERVER_TCP_SOURCE
#include <arpa/inet.h>
#include <string.h>
#include <unistd.h>
+#include <sstream>
#include <iostream>
cons... |
MaKla/bacalc | 7fa022139d960bf23298c88afaadf0f76fd53ec6 | added some debug code to server | diff --git a/src/v4/server2.cpp b/src/v4/server2.cpp
index 1960345..a3311c3 100644
--- a/src/v4/server2.cpp
+++ b/src/v4/server2.cpp
@@ -1,47 +1,72 @@
#ifndef SERVER_TCP_SOURCE
#define SERVER_TCP_SOURCE
#include <arpa/inet.h>
#include <string.h>
#include <unistd.h>
+#include <iostream>
const char* address = "12... |
MaKla/bacalc | c67105d8865236741c6c39b3c377d16fa8ebfd8a | made server address and port const | diff --git a/src/v4/server2.cpp b/src/v4/server2.cpp
index 589b563..1960345 100644
--- a/src/v4/server2.cpp
+++ b/src/v4/server2.cpp
@@ -1,44 +1,47 @@
#ifndef SERVER_TCP_SOURCE
#define SERVER_TCP_SOURCE
#include <arpa/inet.h>
#include <string.h>
#include <unistd.h>
+const char* address = "127.0.0.1";
+const int ... |
MaKla/bacalc | fe3b3277f366aa5ca2b286e8a84ae5435c4ec71b | added socket test | diff --git a/src/client/client.cpp b/src/client/client.cpp
index 4bf94a0..3bb01f4 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,28 +1,32 @@
-
#include "client.h"
#include <QHostAddress>
#include <iostream>
+using namespace std;
+
Client::Client(QObject* parent): QObject(parent)
{
connec... |
MaKla/bacalc | 6d51087658c94487fd85c537dffd2a610d1768e6 | first (non-working) client implementation | diff --git a/src/client/client.cpp b/src/client/client.cpp
new file mode 100644
index 0000000..4bf94a0
--- /dev/null
+++ b/src/client/client.cpp
@@ -0,0 +1,28 @@
+
+#include "client.h"
+#include <QHostAddress>
+#include <iostream>
+
+Client::Client(QObject* parent): QObject(parent)
+{
+ connect(&client, SIGNAL(connect... |
MaKla/bacalc | 6d8c376d3926f67211356f347ea85a52fb7378cf | Restructured whole project and added Makefile | diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9e146a2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,22 @@
+
+all: tui gui server
+
+
+tui:
+ g++ src/tui/Calculator.cpp -o bin/tui
+
+gui:
+ cd src/gui; \
+ qmake -makefile; \
+ make
+ mv src/gui/QTCalc bin/gui
+
+server:
+ cd src/server; \
+ qmake -m... |
MaKla/bacalc | 24e5927ed5587bed462b88b016f14ea0c0d21c60 | Server is now QT-based | diff --git a/src/client.cpp b/src/client.cpp
index 77bac64..ffcf4ba 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1,67 +1,67 @@
#include <iostream>
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
using namespace std;
const int port = 20... |
MaKla/bacalc | 9823cb4c59f7da7f7f6b9a2cad4a17b82e17212d | Version with validation | diff --git a/src/QT/QTCalc/Makefile b/src/QT/QTCalc/Makefile
index 892f155..ed93d34 100644
--- a/src/QT/QTCalc/Makefile
+++ b/src/QT/QTCalc/Makefile
@@ -1,143 +1,143 @@
#############################################################################
# Makefile for building: QTCalc
-# Generated by qmake (2.01a) (Qt 4.6.0... |
MaKla/bacalc | 138d6596a8fab0301998eef6eb951fee71b3f87a | QTGUi Calculator new version in different folder | diff --git a/src/QT/GUI/Calculator/Calculator.pro b/src/QT/GUI/Calculator/Calculator.pro
deleted file mode 100644
index 3709019..0000000
--- a/src/QT/GUI/Calculator/Calculator.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2010-01-17T16:10:37
-#... |
MaKla/bacalc | 4b8b3bc4291922c0f8f3aba4a2af5e0a5637799b | - corrected instantiation | diff --git a/src/Calculator.cpp b/src/Calculator.cpp
index 8b9bcc4..edd9798 100644
--- a/src/Calculator.cpp
+++ b/src/Calculator.cpp
@@ -1,16 +1,34 @@
#include <iostream>
-#include "Parser.h"
+#include "Parser.cpp"
-using namespace std;
+
+void input(){
+ {
+ string inputFormula;
+ Parser* p = new Parser();
+ cou... |
MaKla/bacalc | 40ce1d6e5d91f045bc0bef64803f2f5a81698e40 | - formula parser - tui caluclator | diff --git a/src/Calculator.cpp b/src/Calculator.cpp
new file mode 100644
index 0000000..8b9bcc4
--- /dev/null
+++ b/src/Calculator.cpp
@@ -0,0 +1,16 @@
+#include <iostream>
+#include "Parser.h"
+
+using namespace std;
+
+int main(){
+ std::string inputFormula;
+ Parser p;
+ cout << "Bitte Formel eingeben: ";
+ getline... |
MaKla/bacalc | 20a15adec21b663496f53444e3748d91adba51c1 | added client | diff --git a/src/client.cpp b/src/client.cpp
new file mode 100644
index 0000000..5cf803d
--- /dev/null
+++ b/src/client.cpp
@@ -0,0 +1,63 @@
+#include <iostream>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <errno.h>
+
+using namespace std;
+
+const int por... |
MaKla/bacalc | 75afd15f30a363948c82b13d2e0a47b3670a7ad5 | added first runnig tcp-server | diff --git a/src/server.cpp b/src/server.cpp
new file mode 100644
index 0000000..090cbd0
--- /dev/null
+++ b/src/server.cpp
@@ -0,0 +1,50 @@
+
+#include <iostream>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+
+using namespace std;
+
+const int port = 2000;
+const... |
addsrubpro/i_app | bdbe194174938475c5bc1cbb564fda41bf772a11 | Changed the .gems file back | diff --git a/.gems b/.gems
index 6d1796b..52b8c83 100644
--- a/.gems
+++ b/.gems
@@ -1,15 +1 @@
-rails --version 2.3.8
-actionmailer --version 2.3.8
-actionpack --version 2.3.8
-activerecord --version 2.3.8
-activeresource --version 2.3.8
-activesupport --version 2.3.8
-configuration --version 1.1.0
-heroku --version 1... |
addsrubpro/i_app | e1d2bc3e4f344a00a1acc10a8a39f1bf5e8db6cb | Specified ALL gems in the .gems file because migration to Bamboo | diff --git a/.gems b/.gems
index 52b8c83..6d1796b 100644
--- a/.gems
+++ b/.gems
@@ -1 +1,15 @@
-rails --version 2.3.8
\ No newline at end of file
+rails --version 2.3.8
+actionmailer --version 2.3.8
+actionpack --version 2.3.8
+activerecord --version 2.3.8
+activeresource --version 2.3.8
+activesupport --version 2.3.8... |
addsrubpro/i_app | 67a88a6cafe04e6107cdc2b1c019bee6c58124ed | Added a .gems file to use Rails 2.3.8 | diff --git a/.gems b/.gems
new file mode 100644
index 0000000..52b8c83
--- /dev/null
+++ b/.gems
@@ -0,0 +1 @@
+rails --version 2.3.8
\ No newline at end of file
|
addsrubpro/i_app | 862246d8ddfca71e004421c5e639a5888141232c | Changes on README file | diff --git a/README.markdown b/README.markdown
index 6554f0b..b826712 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,4 +1,4 @@
-# Ruby on Rails Tutorial: first application
-This is the first application for
+# Ruby on Rails: application
+This is an application for
[*Ruby on Rails*]
by [xyz]
\ No newline at ... |
addsrubpro/i_app | d2104907f53e7cb1923281213cd491d6531ea88d | Improved file README | diff --git a/README.markdown b/README.markdown
index 8a99a1c..6554f0b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,252 +1,4 @@
-{\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 NimbusMonL-Regu;}{\f1\fnil\fcharset0 Courier New;}}
-{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1031\f0\fs18 # Ruby... |
addsrubpro/i_app | f804010039cc08383fa003e358cdd40838ff83ba | Improved the README file | diff --git a/README b/README
deleted file mode 100644
index 37ec8ea..0000000
--- a/README
+++ /dev/null
@@ -1,243 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This patter... |
BigBlueHat/BlueInk | d02376bbdc945dc129f978572e81242ce8e452c3 | Add rewrites for sub-sitemaps | diff --git a/_design/blueink/rewrites.json b/_design/blueink/rewrites.json
index 5126b08..61d2d3c 100644
--- a/_design/blueink/rewrites.json
+++ b/_design/blueink/rewrites.json
@@ -1,117 +1,155 @@
[
{
"from": "_session",
"to": "../../../_session"
},
{
"from" : "style/*",
"to" : "style/*"
... |
BigBlueHat/BlueInk | ce7330bfdb3f743e604770a21ed60e13e54866f3 | Add parent page selection; Fix hidden page bug | diff --git a/_design/blueink/lists/sitemap.js b/_design/blueink/lists/sitemap.js
index 7e3dd76..c1c9484 100644
--- a/_design/blueink/lists/sitemap.js
+++ b/_design/blueink/lists/sitemap.js
@@ -1,49 +1,53 @@
function(head, req) {
provides('json',
function() {
var row;
var urls = [];
var url... |
BigBlueHat/BlueInk | 959d59fe230caa5bef928f6fdf7bb2f354887856 | Fix missing children in sitemap error | diff --git a/_design/blueink/lists/page.js b/_design/blueink/lists/page.js
index 339d657..f116b82 100644
--- a/_design/blueink/lists/page.js
+++ b/_design/blueink/lists/page.js
@@ -1,284 +1,284 @@
function(head, req) {
function getOutput(as) {
var ddoc = this;
var templates = {};
var Handlebars = req... |
BigBlueHat/BlueInk | 4036c8e17e14fe081dd7d553096ed2a80431140e | Bring over hide_page_from_nav | diff --git a/_design/blueink/lists/sitemap.js b/_design/blueink/lists/sitemap.js
index 215e2ca..7e3dd76 100644
--- a/_design/blueink/lists/sitemap.js
+++ b/_design/blueink/lists/sitemap.js
@@ -1,47 +1,49 @@
function(head, req) {
provides('json',
function() {
var row;
var urls = [];
var url... |
BigBlueHat/BlueInk | 360ae30ce56b657490140e63a374e3666f96982a | Make redirect pages editable & work on absolutes | diff --git a/_design/blueink/lists/page.js b/_design/blueink/lists/page.js
index f21c5da..339d657 100644
--- a/_design/blueink/lists/page.js
+++ b/_design/blueink/lists/page.js
@@ -1,276 +1,284 @@
function(head, req) {
function getOutput(as) {
var ddoc = this;
var templates = {};
var Handlebars = req... |
BigBlueHat/BlueInk | 3ca2826181620547d6081a6b2891786ef0da45b8 | Fix JSON output for pages | diff --git a/_design/blueink/lists/page.js b/_design/blueink/lists/page.js
index f477f5e..f21c5da 100644
--- a/_design/blueink/lists/page.js
+++ b/_design/blueink/lists/page.js
@@ -1,272 +1,276 @@
function(head, req) {
function getOutput(as) {
var ddoc = this;
var templates = {};
var Handlebars = req... |
BigBlueHat/BlueInk | 0aa72f81360131de6f98e094e7a9a5d4b36a4cd9 | Fix show only children for navigation items | diff --git a/_design/blueink/lists/page.js b/_design/blueink/lists/page.js
index f331fd5..f477f5e 100644
--- a/_design/blueink/lists/page.js
+++ b/_design/blueink/lists/page.js
@@ -1,266 +1,272 @@
function(head, req) {
function getOutput(as) {
var ddoc = this;
var templates = {};
var Handlebars = req... |
BigBlueHat/BlueInk | b9a63c38288c574cab872effb611e09c6cbe12ed | Add very early template editor | diff --git a/_docs/type~template/_id b/_docs/type~template/_id
new file mode 100644
index 0000000..eb29763
--- /dev/null
+++ b/_docs/type~template/_id
@@ -0,0 +1 @@
+type~template
diff --git a/_docs/type~template/editor.html b/_docs/type~template/editor.html
new file mode 100644
index 0000000..19e5b65
--- /dev/null
+++... |
BigBlueHat/BlueInk | c7bc5277396a89a2645ab1db61b417e375db7ee4 | Fix redirect page handling | diff --git a/_design/blueink/lists/page.js b/_design/blueink/lists/page.js
index 4ecdce6..f331fd5 100644
--- a/_design/blueink/lists/page.js
+++ b/_design/blueink/lists/page.js
@@ -1,256 +1,266 @@
function(head, req) {
function getOutput(as) {
var ddoc = this;
var templates = {};
var Handlebars = req... |
BigBlueHat/BlueInk | c38a8bef2165820700a6addf617f0565290ab892 | Fix preview of pages with / in their URLs | diff --git a/src/menu-items/index.js b/src/menu-items/index.js
index 09f231a..177f27f 100644
--- a/src/menu-items/index.js
+++ b/src/menu-items/index.js
@@ -1,162 +1,162 @@
var ajax = require('pouchdb/extras/ajax');
module.exports = {
replace: true,
template: require('./template.html'),
paramAttributes: ['... |
BigBlueHat/BlueInk | 5f8ebf18cbeeeafb6f88c1598c369bdfc9ca4d6a | Revert "Drop database name deduction; use _blueink rewrite" | diff --git a/src/main.js b/src/main.js
index de7a65a..cb37b93 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,434 +1,435 @@
require('insert-css')(require('./main.css'));
var BlueInk = require('vue');
// TODO: in use by arbitrarily loaded type components...can we avoid it?
window.BlueInk = BlueInk;
BlueInk.confi... |
BigBlueHat/BlueInk | 46ded8bc53121d13e36532689a988e18fb4c5fd5 | Add missing tm to BlueInk name | diff --git a/README.md b/README.md
index 66018d3..9b45e62 100644
--- a/README.md
+++ b/README.md
@@ -1,58 +1,58 @@
-# BlueInk
+# BlueInk
[](http://github.com/BigBlueHat/BlueInk)
[](http://github.com/BigBlueHat/BlueInk)
[](http://github.com/BigBlueHat/BlueInk)
+[(require('./index.css'));
var URI = require('urijs');
window.URI = URI;
module.exports = {
replace: true,
template: ... |
BigBlueHat/BlueInk | 0c74b6c9b72bf5a8d744cc735b66f8ec1fdee1c8 | Fix sitemap calcuation when sitemap is new | diff --git a/src/main.js b/src/main.js
index cb06bb4..de7a65a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,426 +1,434 @@
require('insert-css')(require('./main.css'));
var BlueInk = require('vue');
// TODO: in use by arbitrarily loaded type components...can we avoid it?
window.BlueInk = BlueInk;
BlueInk.confi... |
BigBlueHat/BlueInk | 525029739166a2e7b7d34f375588fd3300b7b599 | Drop database name deduction; use _blueink rewrite | diff --git a/src/main.js b/src/main.js
index 3258f9b..cb06bb4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,427 +1,426 @@
require('insert-css')(require('./main.css'));
var BlueInk = require('vue');
// TODO: in use by arbitrarily loaded type components...can we avoid it?
window.BlueInk = BlueInk;
BlueInk.confi... |
BigBlueHat/BlueInk | 6330060ef7efa5e0d704bbe19164e6ce596f0edd | Add _session to rewrites for authentication | diff --git a/_design/blueink/rewrites.json b/_design/blueink/rewrites.json
index d48e0c8..5126b08 100644
--- a/_design/blueink/rewrites.json
+++ b/_design/blueink/rewrites.json
@@ -1,113 +1,117 @@
[
+ {
+ "from": "_session",
+ "to": "../../../_session"
+ },
{
"from" : "style/*",
"to" : "style/*"
... |
BigBlueHat/BlueInk | de3b7821ef366f099abf6a4f467ab61c5b9c157c | Simplify editDoc code post refactor | diff --git a/src/main.js b/src/main.js
index 7e8bb5e..3258f9b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,429 +1,427 @@
require('insert-css')(require('./main.css'));
var BlueInk = require('vue');
// TODO: in use by arbitrarily loaded type components...can we avoid it?
window.BlueInk = BlueInk;
BlueInk.confi... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.