Dmitriy Zaporozhets
54d95f5897
Restyle flash message. Not it does not overflow head panel
2013-02-28 11:06:52 +02:00
Dmitriy Zaporozhets
585259b837
Fix merge state detection
2013-02-21 09:25:07 +02:00
Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Andrew8xx8
6e333d5075
Javascript widget fixed
2013-02-19 12:57:09 +04:00
Dmitriy Zaporozhets
97de6f851b
Fix not-working team memebership permissions change
2013-02-18 16:40:11 +02:00
Dmitriy Zaporozhets
8bf8c70c4b
Import repo feature
2013-02-11 23:00:12 +02:00
Dmitriy Zaporozhets
130f60d55b
a bit of restyling. Replace some images with icons. Simplify note form
2013-01-31 11:22:06 +02:00
Dmitriy Zaporozhets
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
Koen Punt
e33debc214
Updated commit diff view with some minor visual modifications
...
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
2013-01-27 18:27:32 +01:00
Dmitriy Zaporozhets
ce0ec05c63
Pager.js to coffee
2013-01-27 18:47:19 +02:00
Andrey Kumanyaev
eb99feb4a7
simple refactoring
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
a5ce8696a6
remove unused autogenerated files
2013-01-24 22:31:48 +02:00
Andrey Kumanyaev
497f7ab5ba
save autogenerated files
2013-01-24 22:31:25 +02:00
Andrey Kumanyaev
cca9935970
save generated files
2013-01-24 22:31:24 +02:00
Dmitriy Zaporozhets
ee43e9248c
Add warning if user own projet but not in team. Also show loading when merge MR
2013-01-21 15:05:18 +02:00
Dmitriy Zaporozhets
f598cc7897
change logic on line_code
2013-01-15 11:12:17 +02:00
Riyad Preukschas
bda7fe38d0
Merge branch 'master' into discussions
2013-01-15 00:53:00 +01:00
Riyad Preukschas
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets
dd20da1bff
Fix pager loading on every page in application
2013-01-10 17:38:37 +02:00
Alex Denisov
d7bc121474
replace javascript:void with preventDefault
2013-01-09 21:02:41 +00:00
Alex Denisov
5133fe8efb
dashboard js -> coffee
2013-01-09 19:30:20 +00:00
Alex Denisov
3cc0458312
Reloading of events via ajax instead of page reloading.
2013-01-09 19:30:20 +00:00
AlexDenisov
0d9f73fa1e
JavaScript removed from dashboard#index template.
2013-01-09 19:30:20 +00:00
Alex Denisov
97d17cf835
Event filters stores at cookies.
2013-01-09 19:30:20 +00:00
Dmitriy Zaporozhets
8d8c161a7f
Speedup dashboard via loading events with ajax
2013-01-07 14:36:01 +02:00
Dmitriy Zaporozhets
6c777ff823
Improve milestone show page
2013-01-07 14:08:03 +02:00
Dmitriy Zaporozhets
891bc414b1
Fix merge_request js -> ci_path
2013-01-05 23:26:14 +02:00
Dmitriy Zaporozhets
eaa8cd28d0
Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee
2013-01-05 22:54:48 +02:00
Dmitriy Zaporozhets
1724f45f46
Remove unused styles. Restyled Issues a bit
2013-01-05 14:49:08 +02:00
Koen Punt
a1566a9c86
Converted merge_requests.js to coffeescript and updated code
2013-01-05 02:53:34 +01:00
Riyad Preukschas
7335f366dc
Fix comment and reply buttons
2013-01-02 20:49:27 +01: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
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
Dmitriy Zaporozhets
a567d596f8
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
...
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
Valeriy Sizov
77d632890b
refactoring gfm_autocomplete
2012-12-20 20:52:12 +02:00
Dmitriy Zaporozhets
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
85d5f606f6
Labels autocomplete
2012-12-18 06:14:05 +03:00
Riyad Preukschas
d2be7577c1
Merge pull request #2243 from jouve/fix_gfm_username_autocomplete
...
fix gfm autocomplete for usernames
2012-12-14 13:56:06 -08:00
Dmitriy Zaporozhets
1d156c9c8e
Fix project lookup. Show error if project transfer fails
2012-12-13 19:20:37 +02:00
Cyril
a5861b8ff3
fix gfm autocomplete for usernames
2012-12-13 01:44:25 +01:00
Dmitriy Zaporozhets
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
Koen Punt
e1282d507f
BranchGraph now loads async
...
Centralized keyboard and drag events for BranchGraph
2012-12-07 19:06:46 +01: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
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
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
5d3fb35cd1
Rename JS behaviors
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
