Andreas Stephanides
|
de8802c34a
|
Merge branch 'master' into documentmeeting
|
2014-12-18 07:50:16 +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
|
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
|
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 |
|
|
|
60d8c6754c
|
send to all
|
2014-12-08 18:45:10 +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 |
|
|
|
f90a545fe6
|
themen reverse
|
2014-12-05 14:47:54 +01:00 |
|
|
|
2df6f7745e
|
Fix SunSpot and minor fix in calentry
|
2014-12-02 12:03:14 +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
|
80790dcada
|
Revert "beispielcontroller fix :show_comments"
This reverts commit 4815f57a83.
|
2014-11-28 14:22:43 +01:00 |
|
Andreas Stephanides
|
699517fb56
|
Revert "removecomments"
This reverts commit 6ee1468ce3.
|
2014-11-28 14:22:43 +01:00 |
|
Andreas Stephanides
|
741a3abb6d
|
meetings added, documents added
|
2014-11-26 20:36:04 +01:00 |
|
Andreas Stephanides
|
3aafa0cc4e
|
facebook publish fix
|
2014-11-24 13:43:30 +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
|
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 |
|
|
|
9f61769425
|
app controller
|
2014-11-08 11:17:53 +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
|
8aa52bc83c
|
redirect after sign in
|
2014-11-08 10:30:01 +01:00 |
|
Andreas Stephanides
|
2688bca831
|
calentry inline form
|
2014-10-28 08:43:44 +01:00 |
|
Andreas Stephanides
|
f000e91b6d
|
#182 links versteckt
|
2014-10-26 13:15:12 +01:00 |
|
Andreas Stephanides
|
42ecb7dbcb
|
themen scope+ fix search
|
2014-10-21 13:29:42 +02:00 |
|
Andreas Stephanides
|
6a2be58a73
|
default host für mailer
|
2014-10-19 22:16:34 +02:00 |
|
Andreas Stephanides
|
a337e2a589
|
host request fix2
|
2014-10-19 22:09:34 +02:00 |
|
Andreas Stephanides
|
3254cc86e8
|
sort & paginate nlinks @ gremium
|
2014-10-19 21:04:38 +02:00 |
|
Andreas Stephanides
|
7436c5c01e
|
rechte für actions versions neuigkeiten
|
2014-10-19 19:49:33 +02:00 |
|
Andreas Stephanides
|
96ef48cb31
|
is updated button für themen
|
2014-10-19 19:25:34 +02:00 |
|
Andreas Stephanides
|
e81c263ba0
|
is_wiki fix thmen
|
2014-10-19 16:35:23 +02:00 |
|
Andreas Stephanides
|
e7ffb850d5
|
calentry edit
|
2014-10-19 16:16:55 +02:00 |
|
Andreas Stephanides
|
d083d00bbb
|
rmeove wiki
|
2014-10-17 10:17:24 +02:00 |
|
Andreas Stephanides
|
6639011968
|
thmen sanitize
|
2014-10-17 10:17:24 +02:00 |
|
Andreas Stephanides
|
a785cc0bc5
|
beispielcontroller fix :show_comments
|
2014-10-17 10:17:24 +02:00 |
|
Andreas Stephanides
|
116d0562d9
|
removecomments
|
2014-10-17 10:17:24 +02:00 |
|
Andreas Stephanides
|
1f2cc5d202
|
meta tags neuigkeit
|
2014-10-17 10:17:24 +02:00 |
|
Andreas Stephanides
|
a8dd419f9e
|
pagination update
|
2014-10-17 10:17:24 +02:00 |
|
Andreas Stephanides
|
fc48959e48
|
nlink fix
|
2014-10-17 10:17:23 +02:00 |
|
Andreas Stephanides
|
c40804b5cb
|
membership gremium scope
|
2014-10-17 10:17:23 +02:00 |
|
Andreas Stephanides
|
fce2b0a02a
|
themengruppe verwalten fix link
|
2014-10-17 10:17:23 +02:00 |
|
Andreas Stephanides
|
7a7128aa32
|
Pagination fix
|
2014-10-17 10:17:23 +02:00 |
|
Andreas Stephanides
|
0658a8b423
|
fetprofiles
|
2014-10-17 10:17:23 +02:00 |
|
