bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
1,687 Commits 5 Branches 3 Tags
c7267f92999a0b61809ab29a628355c494cc1224
Commit Graph

162 Commits

Author SHA1 Message Date
Andreas Stephanides
5f2aa37c7c fetprofile list 2013-09-10 17:47:25 +02:00
Andreas Stephanides
2cff08fd6c Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-09-10 11:27:30 +02:00
Andreas Stephanides
7057d4d573 fet logo 2013-09-10 11:01:02 +02:00
HausdorffHimself
0e12cec427 CHANGE: New visualisation of Gallery 2013-09-10 01:55:47 +02:00
Andreas Stephanides
a60bdf5149 design und struktur (container - unnötige entfernt) 2013-09-07 12:37:16 +02:00
Andreas Stephanides
1c44ddc2ba Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-09-06 18:26:58 +02:00
HausdorffHimself
de48cccdbc CHANGE: Mouseover für Themengruppe 2013-09-06 18:26:33 +02:00
Andreas Stephanides
bb4b24d9cb styling zeugs 2013-09-06 18:04:57 +02:00
Andreas Stephanides
12f426235f design-tests1 2013-09-06 00:33:12 +02:00
Thomas Blazek
918a3c9360 Merge branch 'master' of github.com:fetsite/fetsite 
Conflicts:
	app/views/galleries/index.html.erb
 2013-08-27 21:27:05 +02:00
Andreas Stephanides
a38eec97a5 links überarbeitet 2013-08-27 20:44:03 +02:00
Thomas Blazek
8dd2252954 design 2013-08-27 19:39:00 +02:00
HausdorffHimself
58a5802dac Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-27 18:37:09 +02:00
HausdorffHimself
338f3a0a06 CHANGE: Attachment-Einbindung in TinyMCE mit Thumbnails und eigenem Partial-View 2013-08-27 18:35:50 +02:00
HausdorffHimself
b42e490f7f FIX: downcase in JS 2013-08-27 18:34:02 +02:00
Thomas Blazek
ac254ffbc2 Show CSS verändert 2013-08-27 08:42:12 +02:00
Thomas Blazek
5b316f8780 css fuer gallery viewer 2013-08-27 00:32:53 +02:00
Thomas Blazek
93667d4cea Beispiel überarbeitungen 2013-08-25 15:16:19 +02:00
HausdorffHimself
b92cbfab8a CHANGE: Attachment in TinyMCE: Default ist Link 2013-08-24 17:16:55 +02:00
HausdorffHimself
94614b1d5b ADD: Dateieinbindung in TinyMCE für Attachments 2013-08-24 04:07:33 +02:00
Thomas Blazek
a2f3608d8f Jquery-upload 2013-08-22 00:08:06 +02:00
Thomas Blazek
c2647a1d08 broken gallery 2013-08-21 18:27:47 +02:00
Thomas Blazek
18dfe60309 Designänderungen 2013-08-19 23:38:34 +02:00
HausdorffHimself
e7a7be8333 CHANGE: keine borders für Themen 2013-08-19 18:51:23 +02:00
Thomas Blazek
1db27955de Merge branch 'master' of https://github.com/andreassteph/fetsite 
Conflicts:
	config/routes.rb
 2013-08-19 15:47:12 +02:00
Thomas Blazek
f58c359d36 Introducing Lecturers 2013-08-19 15:43:54 +02:00
Thomas Blazek
52f7e0b9ba designänderung 2013-08-19 15:43:30 +02:00
Andreas Stephanides
4c48a4b769 fetzneditions 2013-08-19 15:42:08 +02:00
Andreas Stephanides
34b602e126 a lot of new models ... 
Fotogallary, gremien, fetprofil,
 2013-08-19 15:39:56 +02:00
Thomas Blazek
28d5f8b96a semester tweaks 2013-08-19 09:11:45 +02:00
Thomas Blazek
ecb0275c44 nav divider css eingebaut 2013-08-14 22:37:53 +02:00
HausdorffHimself
c7d63c4c19 Merge branch 'master' of https://github.com/fetsite/fetsite 
Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb
 2013-08-13 19:05:26 +02:00
HausdorffHimself
c73984e81d ADD: JavaScript zur Angleichung der Höhe innerhalb einer "row-fluid" 2013-08-13 18:34:05 +02:00
HausdorffHimself
e055b60a53 ADD: Informationsseite: 
Models für Themengruppen/Themen/FAQs/Attachments
Views für Themengruppen/Themen
 2013-08-13 18:31:22 +02:00
HausdorffHimself
a2b35d3d60 ADD: jquery-ui 2013-08-13 18:29:06 +02:00
Thomas Blazek
989f0c2c54 Responsive Menubar springt direkt auf 100% Kopfzeile um 
Kann einfach rückgängig gemacht werden, indem in bootstrap-
responsive.scss die earlymax-classe bearbeitet/gelöscht wird.
 2013-08-13 00:07:29 +02:00
Thomas Blazek
96753c3fef Merge branch 'master' of https://github.com/andreassteph/fetsite into calendar 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
 2013-08-12 13:44:47 +02:00
Thomas Blazek
2d82aa79f6 Merge branch 'master' into calendar 2013-08-12 13:31:47 +02:00
Thomas Blazek
7a452fa9c1 Formtastic css, Lva-typ änderungen 2013-08-12 11:58:27 +02:00
Andreas Stephanides
4aca98c0f5 Merge remote-tracking branch 'thomasb/master' 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
 2013-08-12 11:11:59 +02:00
Andreas Stephanides
7bdd3b1959 Bootstrap wieder zurück korrigiert 2013-08-11 17:06:22 +02:00
Thomas Blazek
af2406b4a1 Merge branch 'master' into calendar 
Conflicts:
	app/views/lvas/show.html.erb
	db/schema.rb
 2013-08-11 11:44:58 +02:00
Thomas Blazek
90b8aff78d lva view tweaks 2013-08-11 11:34:20 +02:00
Thomas Blazek
fd4cd17b53 merge conflict behoben 2013-08-11 10:50:33 +02:00
Thomas Blazek
88ba8fa1c2 Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
 2013-08-11 10:34:03 +02:00
Andreas Stephanides
a5a02e065a Calendar Klasse überarbeitet Views,gefixt, Pictures hinzugefügt 2013-08-11 01:17:37 +02:00
Thomas Blazek
8229570ec7 css änderungen 2013-08-11 00:34:49 +02:00
Thomas Blazek
57a7e49a34 CSS changes 2013-08-10 22:47:32 +02:00
Thomas Blazek
a6b4501d2d Form designs 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
 2013-08-10 14:26:44 +02:00
Thomas Blazek
86913257af Layout changes 2013-08-10 02:03:45 +02:00