deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3391 commits 6 branches 43 tags 25 MiB
Commit graph

207 commits

Author SHA1 Message Date
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
Riyad Preukschas 1cda62465f Fix GFM JS code style 2012-11-21 20:05:37 +01:00
Dmitriy Zaporozhets 0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Riyad Preukschas 51f48392ab Fix type error if there is a different location hash 2012-11-17 22:26:22 +01:00
Dmitriy Zaporozhets b339c747a9 Merge pull request #1937 from riyad/add-file-line-links 
Add file line links
 2012-11-16 03:46:43 -08:00
Riyad Preukschas ece563296b Fix Notes JS 
Also fixes #1983
 2012-11-14 14:36:51 +01:00
Riyad Preukschas 578cf89812 Fix specs 2012-11-14 01:20:37 +01:00
randx 1c5b2a5153 Stats page 2012-11-10 23:08:47 +02:00
Riyad Preukschas c42ada9bee Allow linking to file lines 
Supported formats: "L12" for single lines and "L12-34" for multiple lines
 2012-11-10 00:03:46 +01:00
Riyad Preukschas 45dcb1b5c4 Add jQuery.ScrollTo 2012-11-09 23:35:02 +01:00
Dmitriy Zaporozhets f555578414 Added EventFilter class. Compeleted first version of dashbaord filtering 2012-11-05 20:12:26 +02:00
Robert Speicher badb092a2d Don't initialize Tree History unless tree-slider is present 
This was breaking breadcrumb links on non-Tree pages
 2012-11-01 17:57:12 -04:00
randx f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +02:00
randx ecdf778e80 Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr 
Conflicts:
	app/views/merge_requests/_form.html.haml
 2012-10-29 21:37:46 +02:00
Riyad Preukschas 17cec05087 Make new/edit issue forms use containers on the page instead of adding their own 
Fixes #1830
 2012-10-27 17:54:24 +02:00
Riyad Preukschas 2f5e44a02d Enable/disable from buttons on all input events (not just key events) 
Fixes #1836
 2012-10-27 17:00:51 +02:00