andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
365 Commits 7 Branches 0 Tags
b0c3c5a08c0bfd7d5566f30755efb44656e9908a
Commit Graph

365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Stephanides
b0c3c5a08c Merge branch 'master' of github.com:fetsite/fetsite into fetsite 2013-08-25 13:54:50 +02:00
Andreas Stephanides
3db5d65ad7 omniauth_secrets added 2013-08-25 13:53:31 +02:00
Andreas Stephanides
3fd47351d9 comment out dummy devise provider 2013-08-25 13:11:40 +02:00
Andreas Stephanides
1fb193ee2b ignore omniauth_secrets and dummy initialize in devise.rb 2013-08-25 13:11:06 +02:00
Andreas Stephanides
c592bf9d97 Omniauth + Omniauthfacebook 
für
 2013-08-25 13:08:39 +02:00
Andreas Stephanides
79e4b71df3 membership form fix 2013-08-25 13:07:38 +02:00
Andreas Stephanides
953c330f2f max-width neuigkeiten startseite 2013-08-24 11:17:29 +02:00
Andreas Stephanides
892cf84593 FIX <> neuigkeit vertauscht 2013-08-24 06:33:56 +02:00
andreassteph
00ba285497 Merge pull request #24 from HausdorffHimself/master 
Attachments plus erste Version einer Dateineinbindung in TinyMCE
 2013-08-23 21:17:24 -07:00
HausdorffHimself
d8d5bc3fe9 Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-24 04:17:03 +02:00
HausdorffHimself
77e3b81d67 ADD: TinyMCE-Plugin ADVImage 2013-08-24 04:13:52 +02:00
HausdorffHimself
546aecb7d6 MIGRATE attachments 2013-08-24 04:08:53 +02:00
HausdorffHimself
94614b1d5b ADD: Dateieinbindung in TinyMCE für Attachments 2013-08-24 04:07:33 +02:00
Andreas Stephanides
d928330189 neuigeiten startseite 2013-08-23 18:28:38 +02:00
Andreas Stephanides
5f9c7776e8 delete button neuigkeit 2013-08-23 18:13:10 +02:00
Andreas Stephanides
a807922c1d Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-23 17:57:47 +02:00
Andreas Stephanides
7a8ca34a31 neuigkeit tweak 2013-08-23 17:56:56 +02:00
Thomas Blazek
069cd4b763 locale und design 2013-08-23 17:24:15 +02:00
Andreas Stephanides
2548ddb9ab fix neuigkeit 2013-08-23 16:07:13 +02:00
Andreas Stephanides
ee7f06cb23 tipfehler 2013-08-23 14:48:48 +02:00
Andreas Stephanides
5c91a746e3 neuigkeit fix2 2013-08-23 14:41:35 +02:00
Andreas Stephanides
5a29fdc891 addpicture neuigkeit 2013-08-23 14:38:24 +02:00
Andreas Stephanides
1721dabe19 neuigkeit FIX 2013-08-23 14:37:57 +02:00
Andreas Stephanides
032504d0e3 Merge branch 'master' of https://github.com/HausdorffHimself/fetsite 2013-08-23 14:30:31 +02:00
Andreas Stephanides
0ca18d1f84 add picture to neuigkeit 2013-08-23 14:30:01 +02:00
Andreas Stephanides
41433c20f9 public neuigkeit/rubrik -calentry link 2013-08-23 13:42:19 +02:00
HausdorffHimself
adbbce5fc8 CHANGE: Layout auf CSS umgestellt 2013-08-23 13:41:09 +02:00
HausdorffHimself
7a18a53cc8 ADD: picture to themengruppe 2013-08-23 13:40:42 +02:00
Andreas Stephanides
de4c84871c Add object to calentries 2013-08-23 13:39:54 +02:00
Andreas Stephanides
abc5ce04a3 public to rubrik and object to calentries addecd 2013-08-23 12:07:04 +02:00
HausdorffHimself
e87f108d8a Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-08-23 12:04:57 +02:00
HausdorffHimself
f64079415a ressourcify attachment 2013-08-23 12:04:24 +02:00
Andreas Stephanides
2e808b8a54 Merge branch 'master' of https://github.com/fetsite/fetsite 2013-08-23 12:03:28 +02:00
Andreas Stephanides
fabf9d26a6 Merge branch 'master' of github.com:andreassteph/fetsite 
Conflicts:
	app/models/neuigkeit.rb
 2013-08-23 12:02:45 +02:00
Andreas Stephanides
6d925b1b3d annotations 2013-08-23 12:01:14 +02:00
Thomas Blazek
8f2da66215 Merge branch 'master' of https://github.com/andreassteph/fetsite 2013-08-22 23:49:18 +02:00
Andreas Stephanides
57b015a44e neuigkeit styling 2013-08-22 23:44:09 +02:00
Thomas Blazek
e5bc1683c2 Merge branch 'master' of github.com:fetsite/fetsite 2013-08-22 19:23:17 +02:00
Thomas Blazek
12b453fdc8 gallery now default on fullscreen 2013-08-22 19:00:39 +02:00
Thomas Blazek
cd3f3c2b89 fix upload & gallery 2013-08-22 18:45:08 +02:00
Andreas Stephanides
9ec7bdd6cb fotos - resized 2013-08-22 17:52:56 +02:00
Andreas Stephanides
cfcf0be4d5 Fetprofiles verbesserung Calentry upcoming 2013-08-22 16:38:33 +02:00
Andreas Stephanides
d031e7b855 Mitarbeiter Menueintrag 2013-08-22 15:46:18 +02:00
Andreas Stephanides
ab4c80104f Merge branch 'master' of https://github.com/Inachos/fetsite 2013-08-22 15:42:51 +02:00
Thomas Blazek
cbe536a56b bugfix multiple lines 2013-08-22 13:49:11 +02:00
Andreas Stephanides
292dec672c Merge branch 'master' of https://github.com/Inachos/fetsite 2013-08-22 12:08:57 +02:00
Andreas Stephanides
1289045e06 FETPROFIL 2013-08-22 12:08:27 +02:00
Thomas Blazek
60d86d9cb1 fix multiple 2013-08-22 12:04:44 +02:00
Thomas Blazek
9b2db870bc bugfix 2013-08-22 11:51:57 +02:00
Thomas Blazek
5aca5eca1c bulk_upload_problematic 2013-08-22 11:24:34 +02:00