andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity
1,290 Commits 7 Branches 0 Tags
8a32bff3990f4039e04bbdf612d73e46b006179c
Commit Graph

1290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Stephanides
349753106e gitignore data.yml 2014-12-17 16:42:06 +01:00
Andreas Stephanides
5e6a32c244 yaml_db added 2014-12-17 16:41:42 +01:00
Andreas Stephanides
afb4508e71 updated tinymce config 2014-12-17 16:41:33 +01:00
Andreas Stephanides
d26ab277af merge errors 2014-12-16 09:23:47 +01:00
Andreas Stephanides
881df624b3 Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting 
Conflicts:
	app/controllers/documents_controller.rb
	app/controllers/meetings_controller.rb
	app/models/ability.rb
	app/models/document.rb
	app/models/meeting.rb
	app/models/meetingtyp.rb
	app/views/documents/_document.html.erb
	app/views/documents/_nested_form.html.erb
	app/views/documents/edit.js.erb
	app/views/documents/new.js.erb
	app/views/meetings/_meeting.html.erb
	app/views/themen/_small.html.erb
	config/routes.rb
 2014-12-16 09:00:43 +01:00
Andreas Stephanides
07944bce89 meeting 2014-12-14 21:30:21 +01:00
Andreas Stephanides
aa98919e88 searchable 2014-12-14 21:30:09 +01:00
Andreas Stephanides
a9ef5c14ba meeting ix 2014-12-12 15:24:20 +01:00
Andreas Stephanides
e411a98b4e Treffen sichtbar 2014-12-08 22:58:22 +01:00
Andreas Stephanides
ab396c002e meeting views 2014-12-08 22:58:21 +01:00
Andreas Stephanides
b259c1080a merge 2014-12-08 22:58:21 +01:00
Andreas Stephanides
87dd70ea44 meetings added, documents added 2014-12-08 22:58:21 +01:00
Andreas Stephanides
c2ea1782ff documents 2014-12-08 22:58:21 +01:00
Andreas Stephanides
60d8c6754c send to all 2014-12-08 18:45:10 +01:00
Andreas Stephanides
6ad5a76cc8 logo2014 2014-12-08 17:17:18 +01:00
Andreas Stephanides
cba52fccc2 Merge branch 'master' of github.com:fetsite/fetsite 2014-12-08 17:12:11 +01:00
Andreas Stephanides
2bc428456c logo2014 added , sitemap fix 2014-12-08 17:08:26 +01:00
Andreas Stephanides
41d6407093 Merge branch 'master' of https://github.com/fetsite/fetsite 2014-12-08 16:14:28 +01:00
Andreas Stephanides
d17e5330e9 sitemap update 2014-12-08 16:14:15 +01:00
Andreas Stephanides
34891f09bf themengruppen statt themen ind der sitmap 2014-12-08 16:09:00 +01:00
Andreas Stephanides
ad6fc74303 whenever 2014-12-08 14:58:29 +01:00
Andreas Stephanides
276496635f extend sitemap 2014-12-08 14:29:01 +01:00
Andreas Stephanides
bd3c6054fb sitemap generator 2014-12-08 13:42:34 +01:00
Andreas Stephanides
71b63187fa fix order 1 2014-12-05 15:04:18 +01:00
Andreas Stephanides
ec82bc5edd themengruppen-themen-reverse 2014-12-05 14:52:15 +01:00
Andreas Stephanides
f0bb4654b4 Merge branch 'master' of github.com:fetsite/fetsite 2014-12-05 14:50:04 +01:00
Andreas Stephanides
f90a545fe6 themen reverse 2014-12-05 14:47:54 +01:00
Andreas Stephanides
282d16c086 reformat searchable 2014-12-02 23:29:19 +01:00
Andreas Stephanides
2df6f7745e Fix SunSpot and minor fix in calentry 2014-12-02 12:03:14 +01:00
Andreas Stephanides
85c6985a06 lva nlink fix 2014-11-28 20:48:22 +01:00
Andreas Stephanides
dc124e3810 weitere classen durchsuchen 2014-11-28 14:27:44 +01:00
Andreas Stephanides
e9245919c3 ignore log 2014-11-28 14:27:44 +01:00
Andreas Stephanides
a41f964a84 sunspot install 2014-11-28 14:27:44 +01:00
Andreas Stephanides
741a3abb6d meetings added, documents added 2014-11-26 20:36:04 +01:00
Andreas Stephanides
3a8f84d9b4 Merge branch 'master' of github.com:fetsite/fetsite 2014-11-24 13:43:48 +01:00
Andreas Stephanides
3aafa0cc4e facebook publish fix 2014-11-24 13:43:30 +01:00
Andreas Stephanides
9bef57284e remove article_author 2014-11-24 13:34:56 +01:00
Andreas Stephanides
c4e63eac6e neuigkeit mailer host parameter fix 2014-11-20 12:08:39 +01:00
Andreas Stephanides
684d198470 neuigkeit mail host parameter 2014-11-20 11:58:02 +01:00
Andreas Stephanides
8178898db2 link fix news mailer 2014-11-20 11:49:33 +01:00
Andreas Stephanides
1a6c8422b3 neuigkeit mailer text 2014-11-20 11:44:52 +01:00
Andreas Stephanides
65cb400126 documents 2014-11-20 11:40:49 +01:00
Andreas Stephanides
c49ec5e736 calentry js interface 2014-11-16 14:30:04 +01:00
Andreas Stephanides
4c47919543 nlink-modul 2014-11-15 12:53:58 +01:00
Andreas Stephanides
5ee1b68d6e fetprofile picture url 2014-11-13 10:33:19 +01:00
Andreas Stephanides
fd4bd81e96 fetprofile path 2014-11-13 10:19:26 +01:00
Andreas Stephanides
02eba03439 Merge branch 'master' of github.com:fetsite/fetsite 
Conflicts:
	app/controllers/application_controller.rb
 2014-11-10 20:23:47 +01:00
Andreas Stephanides
24c76a7f5d login fix 2014-11-10 20:20:36 +01:00
Andreas Stephanides
9f61769425 app controller 2014-11-08 11:17:53 +01:00
Andreas Stephanides
e7933eb7ad Merge branch 'master' of https://github.com/fetsite/fetsite 
Conflicts:
	app/views/neuigkeiten/show.html.erb
 2014-11-08 11:08:43 +01:00