summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-28 14:17:52 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-28 14:17:52 +0100
commit8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch)
tree1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /app/assets
parent39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff)
parent600574759573e48da9f5f82d4ff8a863b6830c95 (diff)
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/images/docu/user_interface.pngbin0 -> 137824 bytes
-rw-r--r--app/assets/images/rails.pngbin6646 -> 0 bytes
-rw-r--r--app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen.pngbin0 -> 239283 bytes
-rw-r--r--app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.movbin0 -> 1357712 bytes
-rw-r--r--app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.mp4bin0 -> 2091614 bytes
-rw-r--r--app/assets/images/screenshots/set_provisioning_url_snom.pngbin0 -> 183927 bytes
-rw-r--r--app/assets/javascripts/gemeinschaft.js.coffee4
-rw-r--r--app/assets/stylesheets/gemeinschaft-generic.css.scss1
8 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/images/docu/user_interface.png b/app/assets/images/docu/user_interface.png
new file mode 100644
index 0000000..92fc6a9
--- /dev/null
+++ b/app/assets/images/docu/user_interface.png
Binary files differ
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04..0000000
--- a/app/assets/images/rails.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen.png b/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen.png
new file mode 100644
index 0000000..cb5ce79
--- /dev/null
+++ b/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen.png
Binary files differ
diff --git a/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.mov b/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.mov
new file mode 100644
index 0000000..51366d1
--- /dev/null
+++ b/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.mov
Binary files differ
diff --git a/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.mp4 b/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.mp4
new file mode 100644
index 0000000..1e39b97
--- /dev/null
+++ b/app/assets/images/screencasts/de/firmen_sip_account_und_telefon_anlegen/firmen_sip_account_und_telefon_anlegen.mp4
Binary files differ
diff --git a/app/assets/images/screenshots/set_provisioning_url_snom.png b/app/assets/images/screenshots/set_provisioning_url_snom.png
new file mode 100644
index 0000000..66495af
--- /dev/null
+++ b/app/assets/images/screenshots/set_provisioning_url_snom.png
Binary files differ
diff --git a/app/assets/javascripts/gemeinschaft.js.coffee b/app/assets/javascripts/gemeinschaft.js.coffee
new file mode 100644
index 0000000..c9404a8
--- /dev/null
+++ b/app/assets/javascripts/gemeinschaft.js.coffee
@@ -0,0 +1,4 @@
+jQuery ->
+ $("a[rel=popover]").popover()
+ $(".tooltip").tooltip()
+ $("a[rel=tooltip]").tooltip() \ No newline at end of file
diff --git a/app/assets/stylesheets/gemeinschaft-generic.css.scss b/app/assets/stylesheets/gemeinschaft-generic.css.scss
index 296b242..e594d67 100644
--- a/app/assets/stylesheets/gemeinschaft-generic.css.scss
+++ b/app/assets/stylesheets/gemeinschaft-generic.css.scss
@@ -11,3 +11,4 @@ body {
padding-top: 0px;
}
}
+