diff --git a/Gemfile b/Gemfile index c234f80..1b17bfc 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ gem 'github-markdown' gem 'hirb' #pretty console output gem 'rb-readline', '~> 0.4.2' gem 'rest-client' -gem 'epic-editor-rails' # Gems used only for assets and not required # in production environments by default. diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js index 4b6806c..c93433c 100644 --- a/app/assets/javascripts/app.js +++ b/app/assets/javascripts/app.js @@ -21,26 +21,4 @@ $(function(){ }) }); }, 4000); - - - var editor = new EpicEditor({ - container: 'epic', - textarea: 'epic-textarea', - basePath: '/assets', - clientSideStorage: false, - theme: { - base: '/base/epiceditor.css', - preview: '/preview/github.css', - editor: '/editor/epic-light.css' - }, - button: { - bar: true - }, - autogrow: { - minHeight: 300 - } - }); - try { - editor.load(); - } catch (e) {} }); \ No newline at end of file diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3b02e62..e4d9e2f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,6 +11,5 @@ // GO AFTER THE REQUIRES BELOW. //= require jquery //= require jquery_ujs -//= require epiceditor //= require app //= require moment \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 62f8d8f..e93ffaf 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -3,7 +3,4 @@ *= require style.css *= require screen.css *= require mobi.css - */ - @import 'base/epiceditor'; - @import 'preview/github'; - @import 'editor/epic-light'; \ No newline at end of file + */ \ No newline at end of file diff --git a/app/controllers/youtube.regex b/app/controllers/youtube.regex index 855c624..e3b665d 100644 --- a/app/controllers/youtube.regex +++ b/app/controllers/youtube.regex @@ -3,4 +3,4 @@ \[yt\]\(([a-zA-Z0-9\-_]+)\) -https://www.youtube.com/embed/{id}?theme=light&iv_load_policy=3&showinfo=1&showsearch=0&rel=0&modestbranding&hd=1&autohide=1 \ No newline at end of file +https://www.youtube.com/embed/{id}?theme=light&iv_load_policy=3&showinfo=1&showsearch=0&rel=0&modestbranding&hd=1&autohide=1&html5=1 \ No newline at end of file diff --git a/app/views/blogposts/edit.html.erb b/app/views/blogposts/edit.html.erb index 3bc349c..35fa6b8 100644 --- a/app/views/blogposts/edit.html.erb +++ b/app/views/blogposts/edit.html.erb @@ -2,8 +2,7 @@

Note: You can use <%= link_to "Markdown", "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet", target: "_blank" %>!

<%= simple_form_for @post do |f|%> <%= f.input :title, :label => false %> - <%= f.hidden_field :content, id: "epic-textarea", :label => false, input_html: {class: "full-width vertical"} %> -
+ <%= f.hidden_field :content, :label => false, input_html: {class: "full-width vertical"} %> <%= f.submit "Update Post", class: "btn blue left" %> <% end %> <%= button_to "Delete post", @post, :method => "delete", :confirm => "Delete post & comments forever?", class: "btn red right" %> \ No newline at end of file diff --git a/app/views/blogposts/new.html.erb b/app/views/blogposts/new.html.erb index 877a27e..2bc971e 100644 --- a/app/views/blogposts/new.html.erb +++ b/app/views/blogposts/new.html.erb @@ -2,7 +2,6 @@

Note: You can use <%= link_to "Markdown", "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet", target: "_blank" %>!

<%= simple_form_for @post do |f|%> <%= f.input :title, placeholder: "Title" %> - <%= f.hidden_field :content, id: "epic-textarea", placeholder: "Text", input_html: {class: "full-width vertical"} %> -
+ <%= f.hidden_field :content, placeholder: "Text", input_html: {class: "full-width vertical"} %> <%= f.submit "Create Post", class: "btn blue left" %> <% end %> diff --git a/app/views/forumthreads/edit.html.erb b/app/views/forumthreads/edit.html.erb index 6059f04..8a96246 100644 --- a/app/views/forumthreads/edit.html.erb +++ b/app/views/forumthreads/edit.html.erb @@ -2,8 +2,7 @@

Note: You can use <%= link_to "Markdown", "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet", target: "_blank" %>!

<%= simple_form_for [@thread.forum, @thread] do |f|%> <%= f.input :title, label: false %> - <%= f.hidden_field :content, id: "epic-textarea", label: false, input_html: {class: "full-width vertical"} %> -
+ <%= f.hidden_field :content, label: false, input_html: {class: "full-width vertical"} %> <%= f.submit "Update thread", class: "btn blue left" %> <% end %> <%= button_to "Delete thread", [@thread.forum, @thread], :method => "delete", :confirm => "Delete thread & comments forever?", class: "btn red right" %> \ No newline at end of file diff --git a/app/views/forumthreads/new.html.erb b/app/views/forumthreads/new.html.erb index 834c782..2d515dc 100644 --- a/app/views/forumthreads/new.html.erb +++ b/app/views/forumthreads/new.html.erb @@ -16,7 +16,6 @@
<%= f.text_field :title, placeholder: "Title" %>
- <%= f.hidden_field :content, id: "epic-textarea", placeholder: "Text" %> -
+ <%= f.hidden_field :content, placeholder: "Text" %>

<%= f.submit "Create thread", class: "btn blue" %>

<% end %> \ No newline at end of file diff --git a/erd.dot b/erd.dot deleted file mode 100644 index a383a71..0000000 --- a/erd.dot +++ /dev/null @@ -1,137 +0,0 @@ -digraph Site { -rankdir = "LR"; -ranksep = "0.5"; -nodesep = "0.4"; -pad = "0.4,0.4"; -margin = "0,0"; -concentrate = "true"; -labelloc = "t"; -fontsize = "13"; -fontname = "Arial Bold"; -node[ shape = "Mrecord" , fontsize = "10" , fontname = "Arial" , margin = "0.07,0.05" , penwidth = "1.0"]; -edge[ fontname = "Arial" , fontsize = "7" , dir = "both" , arrowsize = "0.9" , penwidth = "1.0" , labelangle = "32" , labeldistance = "1.8"]; -label = "Site domain model\n\n"; -"m_ActiveRecord::SessionStore::Session" [label = < - -
ActiveRecord::SessionStore::Session
-| - - - -
data text
session_id string ∗
->]; -m_Blogpost [label = < - -
Blogpost
-| - - - -
content text ∗
title string ∗
->]; -m_Comment [label = < - -
Comment
-| - - - -
content text ∗
user_editor_id integer
->]; -m_Forum [label = < - -
Forum
-| - - - -
name string
position integer
->]; -m_Forumgroup [label = < - -
Forumgroup
-| - - - -
name string ∗
position integer ∗
->]; -m_Forumthread [label = < - -
Forumthread
-| - - - - - -
content text ∗
locked boolean
sticky boolean
title string ∗
->]; -m_RegisterToken [label = < - -
RegisterToken
-| - - - -
email string ∗
token string (6) ∗
->]; -m_Role [label = < - -
Role
-| - - - -
name string
value integer
->]; -m_Threadreply [label = < - -
Threadreply
-| - - -
content text ∗
->]; -m_User [label = < - -
User
-| - - - - - - - - - - - - - - - - - -
about text
confirmed boolean
donor boolean
email string ∗
email_token string ∗
ign string ∗
last_ip string
last_seen datetime
name string ∗
password_digest string ∗
skype string
skype_public boolean
twitter string
uuid string ∗
youtube string
youtube_channelname string
->]; - m_User -> m_Blogpost [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_User -> m_Blogpost [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_Blogpost -> m_Comment [arrowhead = "normal", arrowtail = "none", weight = "2"]; - m_User -> m_Comment [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_Forumgroup -> m_Forum [arrowhead = "normal", arrowtail = "none", weight = "2"]; - m_Role -> m_Forumgroup [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_Role -> m_Forumgroup [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_Forum -> m_Forumthread [arrowhead = "normal", arrowtail = "none", weight = "2"]; - m_Role -> m_Forum [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_Role -> m_Forum [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_User -> m_Forumthread [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_User -> m_Forumthread [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_Forumthread -> m_Threadreply [arrowhead = "normal", arrowtail = "none", weight = "2"]; - m_User -> m_Threadreply [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_User -> m_Threadreply [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_Role -> m_User [arrowhead = "normal", arrowtail = "none", weight = "2"]; - m_User -> m_Blogpost [arrowhead = "normal", arrowtail = "none", weight = "1"]; - m_User -> m_Comment [arrowhead = "normal", arrowtail = "none", weight = "1"]; -} diff --git a/erd.pdf b/erd.pdf deleted file mode 100644 index 0353358..0000000 Binary files a/erd.pdf and /dev/null differ diff --git a/erd.svg b/erd.svg deleted file mode 100644 index 601a735..0000000 --- a/erd.svg +++ /dev/null @@ -1,345 +0,0 @@ - - - - - - -Site - -Site domain model - -m_ActiveRecord::SessionStore::Session - - - - - - - - -ActiveRecord::SessionStore::Session - -created_at -datetime ∗ -data -text -id -integer ∗ -session_id -string ∗ -updated_at -datetime ∗ - - -m_Blogpost - - - - - - - - -Blogpost - -content -text ∗ -created_at -datetime ∗ -id -integer ∗ -title -string ∗ -updated_at -datetime ∗ -user_author_id -integer -user_editor_id -integer - - -m_Comment - - - - - - - - -Comment - -blogpost_id -integer -content -text ∗ -created_at -datetime ∗ -id -integer ∗ -updated_at -datetime ∗ -user_author_id -integer -user_editor_id -integer - - -m_Blogpost->m_Comment - - - - -m_Forum - - - - - - - - -Forum - -forumgroup_id -integer -id -integer ∗ -name -string -position -integer -role_read_id -integer -role_write_id -integer - - -m_Forumthread - - - - - - - - -Forumthread - -content -text ∗ -created_at -datetime ∗ -forum_id -integer -id -integer ∗ -locked -boolean -sticky -boolean -title -string ∗ -updated_at -datetime ∗ -user_author_id -integer -user_editor_id -integer - - -m_Forum->m_Forumthread - - - - -m_Forumgroup - - - - - - - - -Forumgroup - -id -integer ∗ -name -string ∗ -position -integer ∗ -role_read_id -integer -role_write_id -integer - - -m_Forumgroup->m_Forum - - - - -m_Threadreply - - - - - - - - -Threadreply - -content -text ∗ -created_at -datetime ∗ -forumthread_id -integer -id -integer ∗ -updated_at -datetime ∗ -user_author_id -integer -user_editor_id -integer - - -m_Forumthread->m_Threadreply - - - - -m_RegisterToken - - - - - - - - -RegisterToken - -email -string ∗ -token -string (6) ∗ -uuid -string ∗ - - -m_Role - - - - - - - - -Role - -id -integer ∗ -name -string -value -integer - - -m_Role->m_Forum - - - - -m_Role->m_Forumgroup - - - - -m_User - - - - - - - - -User - -about -text -confirmed -boolean -created_at -datetime ∗ -donor -boolean -email -string ∗ -email_token -string ∗ -id -integer ∗ -ign -string ∗ -last_ip -string -last_seen -datetime -name -string ∗ -password_digest -string ∗ -role_id -integer ∗ -skype -string -skype_public -boolean -twitter -string -updated_at -datetime ∗ -uuid -string ∗ -youtube -string -youtube_channelname -string - - -m_Role->m_User - - - - -m_User->m_Blogpost - - - - -m_User->m_Comment - - - - -m_User->m_Forumthread - - - - -m_User->m_Threadreply - - - - - diff --git a/jd-gui.cfg b/jd-gui.cfg deleted file mode 100644 index 1c6f369..0000000 --- a/jd-gui.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[Manifest] -Version=2 -[RecentDirectories] -LoadPath=/home/moo/.minecraft/versions/13w47e/ -SavePath=/home/moo/.minecraft/versions/13w47e/src/ -[Decompilation] -LastUri= -[GUI] -MainWindowPosition=626,132 872x666 Maximized -[RecentFiles] -Path0=/home/moo/.minecraft/versions/13w47e/13w47e.jar diff --git a/join.mc b/join.mc deleted file mode 100644 index 9449eaa..0000000 Binary files a/join.mc and /dev/null differ diff --git a/ping.mc b/ping.mc deleted file mode 100644 index be61cff..0000000 Binary files a/ping.mc and /dev/null differ diff --git a/rcon_test b/rcon_test deleted file mode 100644 index d09a583..0000000 Binary files a/rcon_test and /dev/null differ