Thomas Blazek
|
f95c8469e3
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-12 16:54:21 +01:00 |
|
Thomas Blazek
|
25cf052f95
|
Merge pull request #212 from bernis/master
Sprache/Login im Menü rechtsbündig
|
2015-01-12 12:26:29 +01:00 |
|
Thomas Blazek
|
85d2bb5bf9
|
Check for 0 themen
|
2015-01-11 22:18:31 +01:00 |
|
Thomas Blazek
|
79ba089b70
|
Merge branch 'master' of https://github.com/Inachos/fetsite
Conflicts:
Gemfile.lock
config/routes.rb
|
2015-01-11 22:18:05 +01:00 |
|
Bernhard Stampfer
|
c879189705
|
Sprache/Login im Menü rechtsbündig
|
2015-01-05 18:37:05 +01:00 |
|
Andreas Stephanides
|
fd20bd5c90
|
ability agenda sehen
|
2015-01-04 16:31:19 +01:00 |
|
Andreas Stephanides
|
940e7211d2
|
fix meeting auth
|
2015-01-04 16:25:44 +01:00 |
|
|
|
81f1db8ff6
|
Merge remote-tracking branch 'origin'
|
2015-01-03 10:54:48 +01:00 |
|
|
|
3799e5f842
|
configuration for production
|
2015-01-03 10:52:34 +01:00 |
|
Andreas Stephanides
|
aa080a1eec
|
Buttons doument show
|
2015-01-03 10:49:41 +01:00 |
|
Andreas Stephanides
|
0cca373f33
|
document views
|
2015-01-03 10:08:00 +01:00 |
|
Andreas Stephanides
|
d72f78488d
|
document/meeting updates
|
2015-01-03 10:06:58 +01:00 |
|
Andreas Stephanides
|
de8802c34a
|
Merge branch 'master' into documentmeeting
|
2014-12-18 07:50:16 +01:00 |
|
|
|
52ec22646b
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2014-12-17 17:01:13 +01:00 |
|
Andreas Stephanides
|
9307acf29f
|
fix2
|
2014-12-17 17:00:50 +01:00 |
|
|
|
1b3aeadba7
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2014-12-17 16:58:41 +01:00 |
|
Andreas Stephanides
|
8232b0d0c0
|
faqs fix
|
2014-12-17 16:58:24 +01:00 |
|
|
|
33c1cc6fea
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2014-12-17 16:57:34 +01:00 |
|
Andreas Stephanides
|
bf7111816f
|
faqs
|
2014-12-17 16:57:13 +01:00 |
|
|
|
5fdfc944e7
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2014-12-17 16:51:09 +01:00 |
|
Andreas Stephanides
|
3cddab7276
|
extend whitelist sanitze
|
2014-12-17 16:44:34 +01:00 |
|
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 |
|
|
|
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 |
|
|
|
41d6407093
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2014-12-08 16:14:28 +01:00 |
|
|
|
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 |
|
|
|
f90a545fe6
|
themen reverse
|
2014-12-05 14:47:54 +01:00 |
|
Andreas Stephanides
|
282d16c086
|
reformat searchable
|
2014-12-02 23:29:19 +01:00 |
|
|
|
2df6f7745e
|
Fix SunSpot and minor fix in calentry
|
2014-12-02 12:03:14 +01:00 |
|
