Commit Graph

12764 Commits (8d34d46c9bae0c097f294daf95347b79160c7b2e)
 

Author SHA1 Message Date
Martin Linkhorst 8d34d46c9b enabled ActiveRecord based session store and make it configurable 11 years ago
Martin Linkhorst a96413ca0c Merge pull request #1244 from opf/fix/ruby_2.1.1_hash_select_and_reject 11 years ago
Michael Frister 8d6ae91d8b Add patch to fix Rails' hash types with Ruby 2.1.1 11 years ago
Hagen Schink c1d51c3cf1 Fix travis' ruby version 11 years ago
Alex Coles 2d66adbc24 Merge pull request #1177 from marutosi/finn-branch-model 11 years ago
Alex Coles 2614d2ac75 Merge pull request #1176 from marutosi/finn-contribute 11 years ago
Michael Frister c786882f25 Mark API v1 as deprecated in CHANGELOG 11 years ago
Markus Kahl a9fd52fd71 Merge branch 'fix/wp_journal_not_added' into release/3.0 11 years ago
Michael Frister b1b2adcae9 Fix WikiController test_update_stale_page_should_not_raise_an_error 11 years ago
Michael Frister 68c7f933af JournalManager: Fix attempting to create two journals with same version 11 years ago
Michael Frister 2c7359436a acts_as_journalized: Use save! instead of save 11 years ago
Michael Frister f079e4bcdd Clean up acts_as_journalized SaveHooks 11 years ago
Alex Coles 7f26378989 Merge pull request #1175 from marutosi/finn-ie11 11 years ago
Toshi MARUYAMA 54be61a24d add "Git Flow" link to CONTRIBUTING.md 11 years ago
Toshi MARUYAMA 46c664935f split CONTRIBUTING.md from README.md 11 years ago
Alex Coles 6bb9f61bbd Merge pull request #1172 from opf/fix/i18n_and_nokogiri_vulnerabilities 11 years ago
Michael Frister ded3d8ea4e Gemfile.lock: Update i18n to fix security issue 11 years ago
Michael Frister ef0a8b971b Gemfile.lock: Update nokogiri to fix security issues 11 years ago
Alex Coles c6421dc390 Merge pull request #1120 from marutosi/finn-rel-3.0-readme-src 11 years ago
Toshi MARUYAMA 4775f66e77 fix non-ascii attachment file name get corrupted in IE11 (#16711) 11 years ago
Martin Linkhorst 6adb469477 config can contain an empty string. use presence to convert that to nil. pass it directly to :path. rails handles the nil case with its default like before. 11 years ago
Martin Linkhorst afb6292501 set the path attribute of the session cookie when a relative url root is set 11 years ago
Martin Linkhorst 9ae0e5f7b9 refactor session store initializer 11 years ago
Toshi MARUYAMA ba5d0e0d7f fix travis build status image src of release/3.0 branch 11 years ago
Hagen Schink 9dc500c0e0 Merge pull request #1118 from opf/fix/user_mailer_mail_to 11 years ago
kgalli 291aa1c6c5 Small refactoring of spec including comment to clarify before block 11 years ago
kgalli 94f7084ba8 Fix for user name display format 11 years ago
kgalli 38bd3fa279 Failing spec for test mail user name display format 11 years ago
Hagen Schink 9e4c66bfb2 Merge pull request #1110 from opf/fix/speedup_legacy_journal_migrations 11 years ago
Jens Ulferts c4175cd6f7 speedup migrations by adding indices sooner 11 years ago
Philipp Tessenow 3be1c177e6 Merge pull request #1084 from marutosi/finn-Invalid-form-authenticity-token 11 years ago
Alex Coles 0ece502a55 Merge pull request #1086 from marutosi/finn-travis-stable-img 11 years ago
Toshi MARUYAMA 56ff12fc28 fix travis build status image src of stable branch 11 years ago
Jean-Philippe Lang b8ffa31e1a Potentiel data leak in "Invalid form authenticity token" error screen (#16511). 11 years ago
Alex Coles 80812b42ae Merge pull request #1083 from marutosi/finn-mail-conf 11 years ago
marutosijp 8ef0f1e936 replace mail options reference URL at configuration.yml.example 11 years ago
Markus Kahl 00cc6026be Merge pull request #1046 from opf/release/3.0 11 years ago
cratz dde06e2736 Merge pull request #1045 from machisuji/release/3.0.1 11 years ago
Markus Kahl 0418ccd4d5 release 3.0.1 11 years ago
Markus Kahl d6b215f09e dropped redundant limit 11 years ago
Markus Kahl 7301228d65 don't rely on journal record id to find predecessor and use version instead 11 years ago
Hagen Schink fa11d0b533 Fix customizable journal's value column 11 years ago
Hagen Schink 321932ca7d Adds spec 11 years ago
Toshi MARUYAMA 8f0451c454 add stable branch to .travis.yml 11 years ago
Philipp Tessenow 7ef18e64dd Merge pull request #1002 from marutosi/finn-stable-travis 11 years ago
Toshi MARUYAMA e9b8446d85 add stable branch to .travis.yml 11 years ago
Jens Ulferts e33df3c8c1 release 3.0.0 11 years ago
Jens Ulferts 46a9958f6e Merge branch 'feature/better_readme' into release/3.0 11 years ago
Michael Frister e671e927c0 Further improvements to readme (mainly fixing names of people/orgs) 11 years ago
Michael Frister a193faa066 Improve readme 11 years ago