Andreas Stephanides
629c7941cf
glock
2014-10-16 21:44:29 +02:00
Andreas Stephanides
6a4d2ff536
meta tags neuigkeit
2014-10-04 09:49:19 +02:00
b409244246
gemlock
2014-08-11 14:39:27 +05:30
397721f89e
Merge branch 'master' of https://github.com/fetsite/fetsite
...
Conflicts:
app/views/themen/_form.html.erb
2014-07-09 20:18:07 +02:00
b1c46a3dc3
error fixes
2014-06-14 14:16:16 +02:00
d24e127b90
mergeconflict Gemfilelock
2014-06-12 11:18:22 +02:00
67ccecaf51
#143
...
#143 fixed
themen fixed
2014-06-10 18:47:16 +05:30
Andreas Stephanides
e56c1c3ce4
gemfile-lock ignore
2014-04-11 13:04:11 +02:00
9dd2576701
Merge commit '0beda737a3e080f116ff8c3b053304b1fed51d9b'
2014-03-31 17:41:44 +02:00
Andreas Stephanides
f533adc956
gemfilelock
2014-03-29 12:43:51 +01:00
34f296e6c3
gl
2014-03-28 14:10:49 +01:00
Andreas Stephanides
dfe06c5495
remotipart removed
2014-03-16 11:20:04 +01:00
14b42ef33a
Merge branch 'master' of https://github.com/fetsite/fetsite
...
Conflicts:
Gemfile.lock
2014-02-22 19:27:08 +01:00
35941f0f72
fixes for new server
2014-02-22 19:00:03 +01:00
Andreas Stephanides
fce30918a9
Merge branch 'master' of github.com:fetsite/fetsite
...
Conflicts:
Gemfile.lock
2014-02-20 10:52:49 +01:00
Andreas Stephanides
16102fbef6
gemlock
2014-02-20 10:50:50 +01:00
Andreas Stephanides
98d3032850
Merge branch 'master' of https://github.com/fetsite/fetsite
...
Conflicts:
app/assets/javascripts/application.js
2014-02-09 23:07:38 +01:00
Andreas Stephanides
b86d3aca23
Themen und themes_for_rails neues design
...
Neues design mit theme=2003 ansehen
2014-01-08 20:23:58 +01:00
Andreas Stephanides
658811903b
Merge branch 'master' of github.com:fetsite/fetsite
...
Conflicts:
Gemfile.lock
2013-11-12 20:25:48 +01:00
Andreas Stephanides
127d3e51f0
gl
2013-11-12 20:23:26 +01:00
Andreas Stephanides
0bb8460ca4
info ...
2013-11-11 20:42:07 +01:00
Andreas Stephanides
ae99841306
Merge branch 'master' of https://github.com/fetsite/fetsite
...
Conflicts:
Gemfile.lock
2013-11-11 20:04:08 +01:00
Andreas Stephanides
f3288d5b69
production environment compile online
2013-11-11 20:03:00 +01:00
Thomas Blazek
6f92241840
lva->typ_name gibt typ + ' ' + name zurück
2013-11-06 12:31:14 +01:00
Andreas Stephanides
fb48878b5e
Merge branch 'master' of http://github.com/andreassteph/fetsite
2013-10-28 11:25:50 +01:00
Andreas Stephanides
637fe7dc9f
G
2013-10-28 11:25:29 +01:00
Andreas Stephanides
1d16b2f87a
gem seed_dump
2013-10-27 17:12:50 +01:00
Andreas Stephanides
7e5b8b187e
gemfile
2013-10-26 12:49:53 +02:00
Andreas Stephanides
1f906cfbfc
formtastic gem
2013-09-01 15:13:09 +02:00
Andreas Stephanides
3c755d09db
datepicker tryout
2013-08-28 16:47:33 +02:00
Andreas Stephanides
c592bf9d97
Omniauth + Omniauthfacebook
...
für
2013-08-25 13:08:39 +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
fd4cd17b53
merge conflict behoben
2013-08-11 10:50:33 +02:00
92f1797dfb
rspec install
...
Install Rspec FacoryGirl
2013-07-26 00:41:21 +02:00
Thomas Blazek
fcbe330ea4
Gem update
2013-07-25 16:54:17 +02:00
Andreas Stephanides
0216dbdaae
Dokumentation hinzugefügt
...
annotation gem installiert und Dokumentation in app/doc eingefügt
2013-07-23 13:50:03 +02:00
Thomas Blazek
cc002d4291
Init
2013-07-22 15:49:19 +02:00
Andreas Stephanides
607d408bc6
Deactivate Wiki Gem
2013-07-17 18:19:47 +02:00
Andreas Stephanides
cdf7acd426
Wiki Erstentwurf,
...
gollum installiert und Aktiviert,
noch nicht fertig!
Neuigkeiten / Rubriken Verwaltung verbessert
+ Neue Neuigkeiten einfügen,
+ Liste der Neuigkeiten einer Kategorie
+ html für Neuigkeiten
2013-03-02 14:09:12 +01:00
Andreas Stephanides
3d60580332
remove GIT part 1
2013-02-17 12:16:44 +01:00
Andreas Stephanides
19b4ed31f4
Beispiele hinzugefügt
2013-02-15 10:48:52 +01:00
andreas
23ba5ca03a
Bug fix in Studie new View
2013-02-12 17:49:12 +01:00
Andreas Stephanides
3d11400d5e
GitHub Account angelegt
2013-02-12 02:05:12 +01:00
