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
Riyad Preukschas
fac4e3f2e5
Reformat notes JS
2012-12-03 22:51:56 +01:00
Riyad Preukschas
494ae87840
Refactor discussion reply
2012-12-03 22:51:56 +01:00
Riyad Preukschas
06ea122840
Refactor diff notes creation
2012-12-03 22:51:56 +01:00
Riyad Preukschas
bd60a4ed40
Make notes JS know which notes are new in a request
2012-12-03 22:51:56 +01:00
Riyad Preukschas
5c2f6d7f05
Update notes views to support discussions
2012-12-03 22:51:55 +01:00
Riyad Preukschas
a048c955fd
Add JS behaviors
2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets
46bf3a0949
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
2012-12-02 13:29:24 +02:00
Cyril
a9a5497915
refactor flash
...
* make unobtrusive js
* convert js to coffee
2012-12-01 18:40:47 +01:00
Dmitriy Zaporozhets
c19e766f1e
Added vendor/bundle to gitignore. Removed project js slugify
2012-11-30 19:49:51 +02:00
Dmitriy Zaporozhets
3c13ef648b
Fix MR comments
2012-11-30 16:03:10 +02:00
Dmitriy Zaporozhets
ff9a2e2a93
Improve admin logs
2012-11-29 07:49:11 +03:00
panxiaoming
e2b73513f4
fixed the bug of URIDECODE error
...
if link to a chinese file name, it will jump to error page;
for example, the chinese file name called "消息文档.md", when after urlencode, it will be "%E6%B6%88%E6%81%AF%E6%96%87%E6%A1%A3.md", but after use History.pushState, will jump to a bad decode link.
2012-11-28 10:09:55 +08:00
Dmitriy Zaporozhets
7392d28dca
Merge pull request #2030 from tsigo/theme_feedback
...
Improve user feedback on the Profile > Design page
2012-11-21 12:54:22 -08:00
Robert Speicher
30a66c065a
Improve user feedback on the Profile > Design page
...
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
2012-11-21 15:01:40 -05:00
Riyad Preukschas
3e800c3bb1
Refactor GFM JS naming and access
2012-11-21 20:25:49 +01:00
