Commit Graph

14195 Commits (504ad9d2912e7ed9cb065ae03bc89ec9ff5f7a5c)
 

Author SHA1 Message Date
Till Breuer 504ad9d291 Sketch ng context menu integration (WIP) 11 years ago
Till Breuer 2ff4945a54 Add ng context menu 11 years ago
Jens Ulferts 754b3652b1 reimplements context_menu with jQuery 11 years ago
Alex Coles 936b160581 Merge branch 'dev' into dev-angular 11 years ago
Hagen Schink c680e97895 Add changelog entry 11 years ago
Hagen Schink c61df2b860 Merge pull request #1089 from opf/fix/invalid_form_auth_token_error 11 years ago
linki cef5da44c8 Update CHANGELOG.md 11 years ago
linki 9817c9731e Merge pull request #1163 from opf/fix/7137_no_last_connection 11 years ago
Alex Coles 51808c5ffd Merge branch 'dev' into dev-angular 11 years ago
Alex Coles a4ca0b277c Persist Caret.js resolutions to bower.json 11 years ago
Martin Linkhorst fd9fbe4afe Merge branch 'release/3.0' into dev 11 years ago
Martin Linkhorst 1e9c73fe63 bump version to 3.0.3 11 years ago
meeee 6d81b2ab88 Changelog: Add note about Rails 3.2.18 11 years ago
Alex Coles 3ad065c2ff Merge pull request #1260 from opf/fix/rspec_warnings_for_accessibility_specs 11 years ago
linki d176cddc5a Merge pull request #1261 from opf/fix/cve-2014-0130 11 years ago
Michael Frister 28e5d989ea Update rails to 3.2.18 due to CVE-2014-0130. 11 years ago
Hagen Schink 9e6007c63f Fix rspec re-definition warning 11 years ago
Hagen Schink 1814790e2a Fix rspec deprecation warning 11 years ago
Till Breuer 6a74c8c196 Merge pull request #1252 from opf/feature/jquery-upgrade 11 years ago
Till Breuer a3e7564859 Merge pull request #1255 from opf/feature/karma-grunt-integration 11 years ago
Markus Kahl e15449c96f Merge branch 'fix/numbers_in_my_page_differ' into dev 11 years ago
Markus Kahl e624f84c87 log login directly during omniauth procedure 11 years ago
linki 760a084682 Merge pull request #1253 from opf/fix/remove-deprecated-watcher_tag 11 years ago
Martin Linkhorst 3045513764 Merge branch 'release/3.0' into dev 11 years ago
Till Breuer 26f22411a8 Merge pull request #1251 from opf/fix/bower-installs-jquery-twice 11 years ago
meeee 27e82cb933 Changelog: Add entry for new Lato 2.0 11 years ago
meeee 36a6b99978 Changelog: Remove wrong entry from release/3.0 11 years ago
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 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