Thomas Blazek
|
f95c8469e3
|
Merge branch 'master' of https://github.com/fetsite/fetsite
|
2015-01-12 16:54:21 +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 |
|
|
|
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 |
|
Andreas Stephanides
|
9307acf29f
|
fix2
|
2014-12-17 17:00:50 +01:00 |
|
Andreas Stephanides
|
8232b0d0c0
|
faqs fix
|
2014-12-17 16:58:24 +01:00 |
|
Andreas Stephanides
|
bf7111816f
|
faqs
|
2014-12-17 16:57:13 +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
|
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
|
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
|
6ad5a76cc8
|
logo2014
|
2014-12-08 17:17:18 +01:00 |
|
|
|
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
|
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
|
9bef57284e
|
remove article_author
|
2014-11-24 13:34:56 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
0308eeaa47
|
fix picture url
|
2014-11-08 11:07:55 +01:00 |
|
Andreas Stephanides
|
68fb657c97
|
meta tag link fix
|
2014-11-08 11:02:02 +01:00 |
|
Andreas Stephanides
|
e1ee0bc7f9
|
studieninterface,title
|
2014-11-08 11:00:42 +01:00 |
|
Andreas Stephanides
|
483fc37345
|
studium info, modulgruppen
|
2014-11-08 10:38:22 +01:00 |
|
Andreas Stephanides
|
2a35a29bf5
|
metaimage neuigkeit nil
|
2014-11-08 10:30:27 +01:00 |
|
Andreas Stephanides
|
5b52a13a4c
|
#180 fixed
|
2014-10-31 15:07:05 +01:00 |
|
Andreas Stephanides
|
ecb555bc06
|
#183 fixed
|
2014-10-31 15:00:46 +01:00 |
|
Andreas Stephanides
|
0463cf57fd
|
meta tag fix
|
2014-10-30 12:16:27 +01:00 |
|
Andreas Stephanides
|
dce5acefeb
|
no robots
|
2014-10-28 16:53:07 +01:00 |
|
Andreas Stephanides
|
bff600a896
|
remove hallo welt
|
2014-10-28 08:44:19 +01:00 |
|
