21682 Commits (f29144fda58224ed73f9f9e6f1ab32e49abda664)

 

All Branches   

Search

Author	SHA1	Message	Date
Alex Coles	f29144fda5	Update Rails configs: application.rb ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	3d30080d12	Update Rails configs: boot.rb ... Based on freshly-generated Rails 4.0.13 application. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	7aa1a541d2	Remove empty vendor/assets directory ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	dfdea61e12	Add binstubs ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	461a6b76f6	Remove obsolete scripts ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	7561a65bbf	Merge branch 'dev' into feature/rails4 ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	02b5c722ef	[wip] Disable acts_as_watchable has_many validate ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	40ae6c6524	[wip] Disable ProjectType has_many validation ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	2640852fe3	Fix MembersController#autocomplete_for_member routing ... * make routing less convoluted (as in 18835799). Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f84409bc9b	Fix "impaired" mode cuke step: use correct user ... If this `User.current` is called before a subsequent request has been made, then it will be set to `AnonymousUser`. (this issue only appears in my development environment) Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Jan Sandbrink	c4812a083a	Merge branch 'release/4.2' into dev	10 years ago
Jan Sandbrink	4e91860852	Merge remote-tracking branch 'upstream/release/4.1' into release/4.2	10 years ago
Jan Sandbrink	3c87e3225b	Merge pull request #3055 from ulferts/fix/timezone_on_dates ... consider all dates without a timezone (i.e. local) on the front end	10 years ago
Jens Ulferts	687149dfed	consider all dates without a timezone (i.e. local) on the front end	10 years ago
Alex Coles	5841ae9e41	Fix MyController spec broken in 0a0f6c7b ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	4de4dd9659	Mark custom field cuke wip temporarily ... Since 889fa241, most custom field features have been disabled: as the stated in that commit, we should consider whether it would be worth re-writing custom field features from scratch. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Jan Sandbrink	44909740c7	Merge pull request #3054 from floriank/fix/20169-select2-highlight-color ... [20169] Use $primary-color for select2 item highlighting	10 years ago
Alex Coles	fca5ba002f	Update expected error text in registration cuke ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	0a0f6c7b6c	Interpolate attribute in confirmation error string ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	18835799dd	Make ProjectsController#types use PATCH ... * make routing less convoluted: switch to a regular member route. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	ae97716087	Make MyController#account use PATCH ... Now routes form helper-generated request correctly. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	e4d1f7f7d7	Make WikiController#update_parent_page use PATCH ... Now routes form helper-generated request correctly. Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	ab0864062e	Make WikiController#rename use PATCH ... Now routes form helper-generated request correctly. http://weblog.rubyonrails.org/2012/2/26/edge-rails-patch-is-the-new-primary-http-method-for-updates/ Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	fda9d5c4c5	Revert "Fix sprockets file exposure vulnerability" ... With the release of Sprockets 2.12.3, this patch for CVE-2014-7819 should be redundant. This reverts commit 850e052fba.	10 years ago
Alex Coles	6247ad62f3	Peg Sprockets to ~> 2.12.3 ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Florian Kraft	97e853c741	Merge pull request #3053 from marutosi/finn/release-4.2-fix-Gemfile-lock ... fix Gemfile.lock	10 years ago
Toshi MARUYAMA	e7a451cd3b	fix Gemfile.lock	10 years ago
Florian Kraft	b3c18e2839	use $primary-color for select highlighting ... Signed-off-by: Florian Kraft <f.kraft@finn.de>	10 years ago
Jan Sandbrink	8c7b8d6880	Merge pull request #3049 from ulferts/fix/duplicate_base_path_in_angular_routes ... prevent duplicate prepending of base path	10 years ago
Alex Coles	68fe3d8f32	Merge branch 'dev' into feature/rails4 ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	f8dc7e3397	Remove commented rails-dev-tweaks dependency ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Alex Coles	b5e7814b5a	Bump sass-rails to released ~> 5.0.3	10 years ago
Alex Coles	f2045686ad	Replace deprecated #link_to :confirm option ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Florian Kraft	7d98b2a469	Merge branch 'release/4.2' into dev	10 years ago
Florian Kraft	157ea9e9b4	repair gemfile.lock	10 years ago
Florian Kraft	2a56c5f7a6	Merge branch 'release/4.2' into dev	10 years ago
Florian Kraft	db10d7c2ef	Merge branch 'release/4.1' into release/4.2 ... Conflicts: Gemfile.lock	10 years ago
Florian Kraft	efc7e4ec9a	Merge pull request #3048 from 0xF013/feature/code-stabilization-for-datepickers ... datepickers code stabilization	10 years ago
Florian Kraft	99569095e5	Merge pull request #2999 from 0xF013/details_pane_feature_specs ... subject and some description specs	10 years ago
Alex Coles	f968ecffe1	Merge branch 'dev' into feature/rails4 ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	10 years ago
Jens Ulferts	d6deee8967	prevent duplicate prepending of base path ... Routes generated statically need the base path to be appended to the requested url. Routes received from the server do not need to have it appended as they should already be fully qualified.	10 years ago
Mihail Maxacov	70a7bca510	add missing Y	10 years ago
Mihail Maxacov	65d341eb5b	remove traling newline	10 years ago
Mihail Maxacov	1f84832d29	missing newline	10 years ago
Mihail Maxacov	785a0f93cc	code extraction	10 years ago
Jan Sandbrink	65c9a08102	Merge branch 'release/4.2' into dev	10 years ago
Jan Sandbrink	1b4918fec4	Merge branch 'release/4.1' into release/4.2	10 years ago
Jan Sandbrink	9159ce6927	Merge pull request #3047 from ulferts/fix/unwanted_textile_help ... correctly type button	10 years ago
Jens Ulferts	ff7a9cd659	correctly type button	10 years ago
Jan Sandbrink	d9a8f853c7	Merge pull request #3038 from ulferts/fix/remove_dom_font_reduction ... remove dom font reduction	10 years ago