Dmitriy Zaporozhets
14d0ef8f37
Show images preview in notes. Show line additions/deletions for commit
2013-01-04 22:13:32 +02:00
Dmitriy Zaporozhets
ef5b36eaaf
Fixed protected branches and file edit
2013-01-04 21:45:30 +02:00
Dmitriy Zaporozhets
afbdbb0c95
Rspec fixes
2013-01-04 18:50:31 +02:00
Dmitriy Zaporozhets
dccd8b6eaa
Continue refactoring. Use repostory and team
2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets
39ba934c0a
REpostiry, Team models
2013-01-03 21:09:18 +02:00
Riyad Preukschas
e29687552e
Fix link titles
2013-01-02 21:07:02 +01:00
Dmitriy Zaporozhets
07a5cb2ef8
More readable Title for tab
2013-01-02 21:52:03 +02:00
Riyad Preukschas
7335f366dc
Fix comment and reply buttons
2013-01-02 20:49:27 +01:00
Dmitriy Zaporozhets
642e64034c
Fix crash on group => show
2013-01-02 20:59:47 +02:00
Dmitriy Zaporozhets
ce484fa9da
Fixed admin -> group -> show
2013-01-02 20:45:11 +02:00
Dmitriy Zaporozhets
d431e43392
Fix few bugs and tests after refactoring ownership logic
2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets
00a1f5bc2c
Project has now correct owner and creator. Increased test coverage
2013-01-02 19:00:00 +02:00
Dmitriy Zaporozhets
91995909d9
Fix #2375 . Admin and owner can manage groups
2013-01-02 18:57:02 +02:00
Dmitriy Zaporozhets
ffe064a2c1
Bit of cleanup and improving mailer
2012-12-31 19:46:40 +02:00
Dmitriy Zaporozhets
cf3f22cc99
Corrent link for MR diff note in email
2012-12-31 19:06:49 +02:00
Dmitriy Zaporozhets
22ec3fa14c
Fix MR css for accept MR block
2012-12-31 18:35:38 +02:00
Dmitriy Zaporozhets
a16533a04a
Add groups to search autocomplete. Use alphabetically scope for users order
2012-12-30 13:50:23 +02:00
Dmitriy Zaporozhets
e37a043df7
Get rid of skipping callbacks in production code. Dont trigger gitolite more than once on import in group
2012-12-30 13:37:33 +02:00
Robert Hopson
32be082055
Update app/views/notify/new_merge_request_email.html.haml
...
Fix spelling of 'assignee'
2012-12-28 10:56:48 -08:00
Dmitriy Zaporozhets
3de4271846
Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298
2012-12-28 09:14:28 +02:00
Dmitriy Zaporozhets
4cbb29cfad
Fix not_in_project scope. Added counters in admin -> users. Improved seeds
2012-12-27 06:14:05 +03:00
Andrey Kumanyaev
c8bf5905bf
Fix form url and routes path
2012-12-26 20:31:18 +04:00
Andrey Kumanyaev
39e7a0eafe
Rewrite rendering rows with users projects access in Users table in Admin group section
2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
634783feb0
Rename scope "in_group" to "in_namespace"
2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
1e3d238910
Replace short loop variable from "p" to "project"
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
2753cea75a
Add variable form in user section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
25c5763780
Add functional in user section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
9c574464a6
Add functional in admin section
2012-12-26 19:52:15 +04:00
Dmitriy Zaporozhets
c8ba5c2d58
Fix routing issues when navigating over tree, commits etc
2012-12-25 06:14:05 +03:00
Dmitriy Zaporozhets
6570843f84
Fix MR count for group scope
2012-12-24 21:27:12 +02:00
Dmitriy Zaporozhets
4ba24596d3
Make the logo icon more awesome
2012-12-24 21:18:23 +02:00
Dmitriy Zaporozhets
2937f35f9a
Replace Wire font with Yanone. Show only icon as link to dashboard
2012-12-24 14:24:45 +02:00
Riyad Preukschas
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
25c33ca3d0
Fix webhook data sample
2012-12-23 01:14:04 +02:00
Dmitriy Zaporozhets
3ff131a747
Improve web hook data. Use clonable url in repo info
2012-12-23 01:10:57 +02:00
Dmitriy Zaporozhets
86ed2e8f17
Fixed MR count on dashboard
2012-12-23 00:39:42 +02:00
Riyad Preukschas
eaa99478a7
Up API version to v3
2012-12-21 18:55:39 +01:00
Dmitriy Zaporozhets
a47032bc29
Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
...
Conflicts:
vendor/assets/javascripts/branch-graph.js
2012-12-21 13:07:34 +02:00
Riyad Preukschas
0efc903eef
Fix text in project move mail
2012-12-20 22:25:42 +01:00
Dmitriy Zaporozhets
2a3f5dae0f
Fix email send on close/reopen issue. Display project name with namespace. remove css style
2012-12-20 23:04:27 +02:00
Dmitriy Zaporozhets
75dd704294
Send update instructions after project namespace id changed or namespace path changed
2012-12-20 22:16:51 +02:00
Dmitriy Zaporozhets
d188adfd97
Changelog updated. Added warnings to username form
2012-12-20 21:16:42 +02:00
Riyad Preukschas
757c7a5291
Fix gravatar and ldap config
2012-12-20 16:54:28 +01:00
Riyad Preukschas
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets
b772c2c3f0
Fix issue update.js
2012-12-20 16:42:13 +02:00
Dmitriy Zaporozhets
a7aee9d1ee
Pretty compare mode
2012-12-19 20:14:05 +03:00
Dmitriy Zaporozhets
40c6d87175
Merge pull request #2315 from koenpunt/gh-issue-513
...
Added compare switch
2012-12-20 06:15:39 -08:00
Koen Punt
d11f9a632c
only show switch if from and to are set
2012-12-20 14:42:05 +01:00
Koen Punt
9916e8d6dc
Updated test to match with switched commits
...
Added compare switch
2012-12-20 14:39:39 +01:00
Dmitriy Zaporozhets
4b02f4a22d
show production.log, show only active milestone for issue filter
2012-12-19 07:14:05 +03:00
Dmitriy Zaporozhets
adb17d6052
Cleanup after issues refactor and fix test
2012-12-20 15:39:54 +02:00
Dmitriy Zaporozhets
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
8826077471
Refactor css lists. Use well-list class
2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
85d5f606f6
Labels autocomplete
2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
2b921a6c72
Few icons for services list
2012-12-20 11:52:42 +02:00
Dmitriy Zaporozhets
9ada678819
Split commit_id and noteable_id for Note
2012-12-18 20:02:00 +02:00
Dmitriy Zaporozhets
f4a6f1fd5a
Fix admin paging gap issue
2012-12-17 15:57:10 +02:00
Dmitriy Zaporozhets
5058c4fdcf
Fix wall notes event trying to render target
2012-12-16 19:52:39 +02:00
Dmitriy Zaporozhets
26afde94fd
Merge pull request #2250 from jouve/fix_missing_tr_in_thead
...
add missing mandatory tr in thead
2012-12-16 08:16:42 -08:00
Dmitriy Zaporozhets
0f7d3f591c
Moving repositories spec to roles. Added missing spec for project
2012-12-15 12:32:09 +02:00
Dmitriy Zaporozhets
0ff468160e
Fixed event.allowed? with event.proper?
2012-12-14 21:54:49 +02:00
Dmitriy Zaporozhets
f2db188dbe
Processing with note events. reformated dashboard for more events to handle
2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets
678e5355a3
Create events on comments and milestone
2012-12-14 19:33:33 +02:00
Dmitriy Zaporozhets
190e483fb4
Rework of milestones
2012-12-14 08:34:05 +03:00
Dmitriy Zaporozhets
b01f8b63c2
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
2012-12-14 08:14:05 +03:00
Dmitriy Zaporozhets
44209861e8
Allow group path renaming. Dont show project transfer if no permissions. More danger messages :)
2012-12-14 06:14:05 +03:00
Dmitriy Zaporozhets
a8fbda945e
bit reordering and cleanup unused styles
2012-12-13 21:44:55 +02:00
Dmitriy Zaporozhets
1d156c9c8e
Fix project lookup. Show error if project transfer fails
2012-12-13 19:20:37 +02:00
Dmitriy Zaporozhets
03369a9165
Use one helper for linking to team member. More clear title for Issue and MR
2012-12-13 06:14:05 +03:00
Dmitriy Zaporozhets
bca7bddd3d
Add ace editor to snippets
2012-12-12 19:42:08 +02:00
Dmitriy Zaporozhets
273c0d2aa3
Merge pull request #2253 from alexleutgoeb/patch-1
...
Minor: Change html input type to "email" on sign-in view
2012-12-12 04:17:14 -08:00
Dmitriy Zaporozhets
439d03bbed
Fix namespace api autocomplete
2012-12-12 12:54:28 +02:00
Dmitriy Zaporozhets
d7eb314553
Project titles with namespaces
2012-12-12 12:02:29 +02:00
Alex Leutgöb
f2bf05066d
Add autofocus attribute to sign-in email field
2012-12-11 11:57:25 +01:00
Alex Leutgöb
8738eb2369
Change html input type to "email" on sign-in view
...
As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one.
2012-12-11 11:25:55 +01:00
Dmitriy Zaporozhets
5d219bd5f0
Fix gitolite error instructions
2012-12-11 09:22:14 +02:00
Dmitriy Zaporozhets
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
Cyril
c76764b7dc
add missing mandatory tr in thead
2012-12-11 02:39:05 +01:00
Cyril
7d3ee2baa6
add username to team_member page
2012-12-11 02:17:09 +01:00
Dmitriy Zaporozhets
b1437d4c8d
use link_to_project for Dashboard: Issues, MR
2012-12-10 15:39:10 +02:00
Dmitriy Zaporozhets
bf13579b92
Make admin sorting more obvious
2012-12-10 06:14:05 +03:00
Dmitriy Zaporozhets
f1dfc27c5d
Replace project with namespace for events
2012-12-09 16:03:24 +02:00
Dmitriy Zaporozhets
f4d9059b7e
Show project with namespace in feeds
2012-12-09 10:56:15 +02:00
Koen Punt
4b2ecbc420
Updated branch-graph, abstracted some code in seperate functions
...
Removed unused Raphael.fn.popup
2012-12-07 22:05:17 +01:00
Koen Punt
e1282d507f
BranchGraph now loads async
...
Centralized keyboard and drag events for BranchGraph
2012-12-07 19:06:46 +01:00
Koen Punt
40576b8709
Fixed #1509 by converting the entities in js
...
Converted BranchGraph to some sort of Class
2012-12-07 17:39:40 +01:00
Dmitriy Zaporozhets
84465576d7
Dont show remove project button if you have no permission
2012-12-07 15:53:04 +02:00
Dmitriy Zaporozhets
674efd38d8
Fix 500 error on services page. Fixed active project tab when on services
2012-12-05 14:17:40 +02:00
Dmitriy Zaporozhets
cc0295b789
Only owner can remove project
2012-12-05 06:14:05 +03:00
Riyad Preukschas
b47173da6a
Revamped note form options.
2012-12-03 22:51:57 +01:00
Riyad Preukschas
4ed8278870
Fix a bunch of smaller glitches.
2012-12-03 22:51:57 +01:00
Riyad Preukschas
7978f8dd2b
Fix handling form errors.
2012-12-03 22:51:57 +01:00
Riyad Preukschas
c1ffee4e65
Fix dicussion headers
2012-12-03 22:51:57 +01:00
Riyad Preukschas
c20af32ae4
Pull together and rename Notes partials
2012-12-03 22:51:57 +01:00
Riyad Preukschas
6fc10fa256
Unify forms for discussions and main target.
...
Allows previews and uploads in all forms.
Also fixes #1730
2012-12-03 22:51:56 +01:00
Riyad Preukschas
fbd345ea20
Make attachments more obvious
2012-12-03 22:51:56 +01:00
Riyad Preukschas
c4a7824a8c
Fix wall notes
2012-12-03 22:51:56 +01:00
Riyad Preukschas
140652e9b0
Fix common form and note preview
2012-12-03 22:51:56 +01:00
Riyad Preukschas
918dc87376
Move code for appending a discussion note to notes JS
2012-12-03 22:51:56 +01:00
Riyad Preukschas
494ae87840
Refactor discussion reply
2012-12-03 22:51:56 +01:00