Andreas Stephanides
|
978d923082
|
fix blueimp gallery
|
2015-01-15 16:38:16 +01:00 |
|
Andreas Stephanides
|
c95782744a
|
gemfle update
|
2015-01-15 16:13:28 +01:00 |
|
Andreas Stephanides
|
fe4d72dcb3
|
application css scss
|
2015-01-15 15:57:00 +01:00 |
|
Andreas Stephanides
|
43a551fc28
|
Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery
Conflicts:
app/views/layouts/application.html.erb
|
2015-01-15 15:40:36 +01:00 |
|
Thomas Blazek
|
48e3c1149a
|
added start_topic.yml to gitignore
|
2015-01-15 15:36:54 +01:00 |
|
Thomas Blazek
|
3dff2d2bbe
|
Fix: Bildergallerie
Bildergallerie läuft jetzt auf Blueimp-gallery.
Viel spaß
|
2015-01-15 15:36:20 +01:00 |
|
Andreas Stephanides
|
565024c282
|
blue2
|
2015-01-15 15:20:19 +01:00 |
|
Thomas Blazek
|
9873c4f1c1
|
Merge branch 'master' of https://github.com/Inachos/fetsite
|
2015-01-15 14:38:41 +01:00 |
|
Thomas Blazek
|
f6a95dee57
|
commit
|
2015-01-15 14:30:53 +01:00 |
|
Thomas Blazek
|
3a00794851
|
dfsd
|
2015-01-15 14:01:16 +01:00 |
|
Thomas Blazek
|
2931ee6cd6
|
Need to enforce the jquery-fileupload version
0.4.2 broke uploads for me
|
2015-01-15 12:56:52 +01:00 |
|
Thomas Blazek
|
bcffee7bc9
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-14 09:12:56 +01:00 |
|
|
|
70e34875f1
|
search results fix
|
2015-01-14 09:11:09 +01:00 |
|
Thomas Blazek
|
9cc108b2ed
|
Merge branch 'master' of https://github.com/andreassteph/fetsite
|
2015-01-14 09:10:57 +01:00 |
|
|
|
1d11b270cf
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-14 09:08:51 +01:00 |
|
Andreas Stephanides
|
1731d1f3d2
|
Merge branch 'master' of github.com:fetsite/fetsite
|
2015-01-14 09:08:05 +01:00 |
|
Andreas Stephanides
|
47b692b243
|
Suchergebnis darstellung
|
2015-01-14 09:07:34 +01:00 |
|
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 |
|
|
|
5b0840a7d2
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-04 16:31:51 +01:00 |
|
Andreas Stephanides
|
fd20bd5c90
|
ability agenda sehen
|
2015-01-04 16:31:19 +01:00 |
|
|
|
edecf20a44
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-04 16:26:38 +01:00 |
|
Andreas Stephanides
|
940e7211d2
|
fix meeting auth
|
2015-01-04 16:25:44 +01:00 |
|
|
|
40739523c2
|
fix document typ
|
2015-01-03 11:40:25 +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 |
|
