Commit Graph

15127 Commits (310fd14ab996c270be50e7c6b1db8a2e333f6933)
 

Author SHA1 Message Date
Alex Coles ece8adb3c4 Merge branch 'dev' into dev-angular 11 years ago
Alex Coles 0e31cf83c5 Merge branch 'dev' into dev-angular 11 years ago
meeee b196cbb7ad Merge pull request #1174 from opf/fix/lato-faux-italic 11 years ago
meeee 77c3ed9618 Merge pull request #1256 from opf/fix/remove-rfpdf-invalid-ruby 11 years ago
Philipp Tessenow 28f39b8e66 Merge pull request #1254 from opf/fix/general-code-cleanup 11 years ago
Alex Coles ee0a466063 Add quiet_assets to mute assets pipeline logging 11 years ago
Alex Coles 129ad4d584 Remove invalid Ruby/PHP from RFPDF plugin 11 years ago
Martin Linkhorst 81b0e2f1b3 bump version to 3.0.2 11 years ago
Martin Linkhorst c1c5b8aa15 Update CHANGELOG.md 11 years ago
Alex Coles 44d6fe46ad Add grunt-karma, enable karma task 11 years ago
Alex Coles 6d7d8f1997 Update path to jQuery in karma.conf.js 11 years ago
Alex Coles 2ee3c09bb9 Merge branch 'release/3.0' into dev 11 years ago
Alex Coles 614191130b Merge pull request #1171 from opf/retrieve_content_type_from_file 11 years ago
Alex Coles 9b34fb5f66 Merge branch 'dev' into dev-angular 11 years ago
Alex Coles c0174a8eae Update jQuery .live() usage to .on() 11 years ago
Alex Coles fa0bb2d7c4 Remove browser-sniffing, old IE (<8) support from $.fn.mySlide 11 years ago
Alex Coles dcde12a227 Add, require jquery-migrate for old jQ API shim 11 years ago
Alex Coles caf0ce9f7d Remove browser-sniffing, old IE (<8) support from top menu 11 years ago
Alex Coles 5523153797 Update jQuery to latest in 1.x series, 1.11.0 11 years ago
Alex Coles b0f9cf24b8 Attempt to fix Bower installing jQuery twice 11 years ago
Alex Coles 313341ef39 Merge pull request #1250 from opf/fix/calendar_helper_refactoring 11 years ago
cratz 8d825c3f93 Merge pull request #1239 from opf/fix/database_session_store 11 years ago
Martin Linkhorst cf6e7af5b0 Merge pull request #1137 from opf/fix/rspec-expect-syntax-style-fixes 11 years ago
Markus Kahl 3551a7ba9f fixed typo in comment 11 years ago
Markus Kahl 21dd6ecf7e log_successful_login call goes to user instance 11 years ago
Markus Kahl c1229ae42a updated copyright 11 years ago
Markus Kahl 8c94da8d89 log last login for omniauth too 11 years ago
Philipp Tessenow 329ec6c18a refactor and document the calendars helper 11 years ago
Alex Coles feda6a7b78 Merge pull request #1247 from opf/fix/timeline-timeout-error-handling-7286 11 years ago
Till Breuer 5877d2e07b Merge pull request #1232 from opf/fix/angular-rails-relative-path 11 years ago
Philipp Tessenow d3e6a5b284 better handle handle_unverified_request 11 years ago
Philipp Tessenow bd8dea129c add specs for handle_unverified_request in app controller 11 years ago
Till Breuer f5b450efdd Inject timeline model in timeline container directive (WIP) 11 years ago
Till Breuer aad8f97985 Fix typos 11 years ago
Martin Linkhorst d7c6609779 migration to set content types of all existing attachments 11 years ago
Martin Linkhorst fb096b0c86 infer content type from contents of file instead of its file extension 11 years ago
Martin Linkhorst 94d0a9fed8 Merge branch 'release/3.0' into dev 11 years ago
Till Breuer 72f61358d2 Hide all timeline elements if an errorMessage is displayed 11 years ago
Till Breuer e9ada12082 Add basic error handling on timeline load timeout (WIP) 11 years ago
Martin Linkhorst e0e8bbc37f set default in configuration.rb 11 years ago
Martin Linkhorst 1bca417b9f make session store configurable via env var SESSION_STORE 11 years ago
Martin Linkhorst 4d4a4695a2 remove unnecessary calls to presence 11 years ago
Martin Linkhorst f0b2fab9d1 default to cache store in production 11 years ago
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
Till Breuer 039cd7e0d3 Merge pull request #1243 from opf/fix/timeline-wp-shadow-with-end-date-7281 11 years ago
manwithtwowatches 19873c448d Merge pull request #1241 from opf/fix/timeline-comparison-7256 11 years ago
Michael Frister 8d6ae91d8b Add patch to fix Rails' hash types with Ruby 2.1.1 11 years ago
Richard a1c1102bc4 Added test for historical alternate date checking. 11 years ago
Richard 8f4c993a72 Timelines was looking for "end_date" property but it's called "due_date" now. 11 years ago