openproject

Commit Graph

Author	SHA1	Message	Date
Alex Coles	531b328ac3	Merge branch 'dev' into feature/rails4 Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
ulferts	c294fe90d4	Merge pull request #3162 from NobodysNightmare/feature/autocomplete_scopes Change auto completion scopes	9 years ago
Florian Kraft	144289b8e0	Merge branch 'release/4.2' into dev	9 years ago
Florian Kraft	524dc0ec30	Merge pull request #3164 from NobodysNightmare/feature/private_mail_by_default Hide Mail address by default	9 years ago
Florian Kraft	37457e2891	Merge branch 'release/4.2' into dev	9 years ago
Florian Kraft	9c0a7197e3	Merge branch 'release/4.1' into release/4.2	9 years ago
Florian Kraft	bcaabeb497	Merge branch 'fix/formbuilder-label-for' into release/4.1	9 years ago
Jens Ulferts	a0c7fa2946	Merge branch 'release/4.2' into dev	9 years ago
Jens Ulferts	f3458138fb	add safeguard to spec	9 years ago
Jan Sandbrink	6406b640b7	remove redundant spec one could argue that I learned from @0xF013 to delete inconvenient specs ;-) But in this case the spec is really made redundant by the two specs below [ci skip]	9 years ago
Jan Sandbrink	cc844c1068	centralize knowledge of WP autocomplete url - project information is not needed anymore - the endpoint format was fixed anyway (also accepted parameters)	9 years ago
Jan Sandbrink	c05c43938c	use "relatable" scope for relations	9 years ago
Jan Sandbrink	42ec887384	uglify order statement at least this one DOES work...	9 years ago
Jan Sandbrink	0f868f17e2	specify order in the Rails 3 way ascending is the default anyway	9 years ago
Jan Sandbrink	9ed5480298	also accept auto complete requests without query	9 years ago
Jan Sandbrink	799f3b9b52	eliminate instance variable	9 years ago
Jan Sandbrink	b265ad88db	increase readability of wp->hash conversion it might use more lines, but I hope there is a gain in readability	9 years ago
Jan Sandbrink	b524b0724d	rewrite find into where, order and limit	9 years ago
Jan Sandbrink	dd052d5114	always return a valid scope though WorkPackage works like a scope most of the time, it is not a scope e.g. you can't directly call :order on WorkPackage Note: I would have loved to already do it the Rails 4 way and call :all However in Rails 3 :all returns an Array and not a Relation, so we will have to wait for the Rails 4(.1) Upgrade to replace :scoped with :all :( Sorry @myabc	9 years ago
Jan Sandbrink	dc71f37587	try to increase readability - extract scopedeterminition into an extra method - always use "outer" if statements in index method	9 years ago
Jan Sandbrink	4556da741e	explain why some code exists	9 years ago
Jan Sandbrink	d59b54a63c	use more clear scopes for autocompletion lets see if that really makes stuff more understandable... I (personally) found the old definition of "all" to be too narrow. Now there is: scope == "all": I want to search over all WPs scope == "relatable": I want to search over all WPs that are relatable to WPs in the given project (via project_id) no scope: If I specified a project search over the WPs of that one, otherwise search everywhere (like "all")	9 years ago
Jan Sandbrink	75b542725a	rename query to scope sounds more understandable to me, but I am biased, I guess...	9 years ago
Jens Ulferts	7dcd3e6560	Merge branch 'release/4.2' into dev	9 years ago
Jens Ulferts	9b93316283	explicitly expecting a setting	9 years ago
Jens Ulferts	f4b26f0f40	avoid spec sideeffects by mocking	9 years ago
Jan Sandbrink	885d1eb3d3	repair table in APIv2 documentation [ci skip]	9 years ago
Florian Kraft	550d3f3a51	fix possible xss in label_for_field	9 years ago
Jan Sandbrink	db5d633850	update factories to new default preference also use boolean type instead of DB values	9 years ago
Jan Sandbrink	620c55bf3d	change the default preference for mail hiding	9 years ago
Jens Ulferts	3316b45af8	Merge branch 'release/4.2' into dev	9 years ago
Jens Ulferts	2652388587	Merge branch 'release/4.1' into release/4.2	9 years ago
Jens Ulferts	4ae7d5cafa	remove unsafe html_safe	9 years ago
Alex Coles	49242f3b45	Merge branch 'dev' into feature/rails4 Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Jan Sandbrink	25b7211b55	Merge pull request #2957 from myabc/feature/livingstyleguide-upgrade	9 years ago
Alex Coles	43da5beea3	Tell gulp to watch .lsg files instead Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Alex Coles	a216a04127	Add html[id] to style guide based on file path Required in order for the style guide's own styles to be correctly scoped. File path is most likely temporary however. See: https://github.com/livingstyleguide/livingstyleguide/issues/133 Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Alex Coles	15f2cc5824	[WORKAROUND] Add coffee-script as devDependency Work around an issue with gulp-livingstyleguide packaging: See https://github.com/efacilitation/gulp-livingstyleguide/issues/4 Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Alex Coles	25259f4ca4	Bump gulp-livingstyleguide to 0.1.5 This version now uses `bundle exec` when calling out to the `livingstyleguide` binary. See: `d645828f59`	9 years ago
Alex Coles	7a16a70e49	Upgrade to livingstyleguide v2 syntax Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Alex Coles	95072f5c7d	Rename style guide doc files from .md → .lsg Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Alex Coles	a50e4396cb	Add separate frontend Gemfile w/ livingstyleguide Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Alex Coles	4e920c2183	Remove livingstyleguide as Rails app dependency NOTE: removes the ability to build the style guide with Sprockets. Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago
Jan Sandbrink	397f2eacfc	Merge pull request #3120 from floriank/fix/pin-select-version [18714] Pin select2 3.5.2	9 years ago
Jens Ulferts	8bde768253	Merge branch 'release/4.2' into dev	9 years ago
Jens Ulferts	f301b56a92	explicitly require helper	9 years ago
ulferts	71d066ee3e	Merge pull request #3161 from oliverguenther/feature/consolidate_module_menu Consolidate Module menu in header navigation.	9 years ago
Jens Ulferts	5a8b9ba795	ensure page loaded before cuke	9 years ago
Oliver Günther	5ada719136	Consolidate Module menu in header navigation This effectively changes the following menus: Top Menu - Removed Administration item - Added Item 'Work Packages' -> /work_packages - Added Item 'News' -> /news - Added Item 'Time Sheet' -> /time_entries (if user has a project with view time log permission) My Menu - Added Administration item as first position With work packages, time entries, news now residing in the top menu, these buttons are superfluous in the projects overview and are also removed. Relevant work package: https://community.openproject.org/work_packages/20512	9 years ago
Alex Coles	d92a9b1cf0	Prune unused method in QueriesHelper Signed-off-by: Alex Coles <alex@alexbcoles.com>	9 years ago

1 2 3 4 5 ...

22109 Commits (531b328ac3df1c7dd78a705ee015d7303c20b125) All Branches Search

22109 Commits (531b328ac3df1c7dd78a705ee015d7303c20b125)

All Branches