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

822 commits

Author SHA1 Message Date
Dmitriy Zaporozhets efc4cae1b7 Add License 2012-12-24 14:33:16 +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
Dmitriy Zaporozhets d80d4cd92b Replace font with free one 2012-12-24 12:37:28 +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 cec866a7ce Improve wiki rendering. Fix pygemnt + markdown invalid html 2012-12-22 13:01:15 +02:00
Dmitriy Zaporozhets 86673a66b7 Fix fark background highlight 2012-12-21 23:22:52 +02: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 9bc315bb25 Merge pull request #2211 from jojosch/fix-dark-code-preview 
fix dark code preview background when displaying long lines
 2012-12-20 07:46:59 -08: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 b2e31692a5 Added icon 2012-12-20 14:58:07 +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 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 9b57bf7811 Remove main. Use application.scss instead 2012-12-19 20:57:41 +02:00
Dmitriy Zaporozhets 965102b3f6 Move mixins and variables under gitlab bootstrap 2012-12-19 19:02:12 +02:00
Dmitriy Zaporozhets 52fbcd45a4 Better organization of styles 2012-12-19 18:34:24 +02:00
Johannes Schleifenbaum d3b3810928 fix dark code preview background when displaying long lines 2012-12-15 11:44:30 +01: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 f2db188dbe Processing with note events. reformated dashboard for more events to handle 2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets 190e483fb4 Rework of milestones 2012-12-14 08:34: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
Cyril a5861b8ff3 fix gfm autocomplete for usernames 2012-12-13 01:44:25 +01:00
Dmitriy Zaporozhets bca7bddd3d Add ace editor to snippets 2012-12-12 19:42:08 +02:00
Dmitriy Zaporozhets 105f5ba3c9 Reduce header font a bit. Moved to mixin header font styles 2012-12-12 12:30:19 +02:00
Dmitriy Zaporozhets 743073ce5f pretty gl icon for dark themes. Removed old gl icons 2012-12-11 21:11:29 +02:00
Dmitriy Zaporozhets ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Dmitriy Zaporozhets b1437d4c8d use link_to_project for Dashboard: Issues, MR 2012-12-10 15:39:10 +02:00
Dmitriy Zaporozhets f4d9059b7e Show project with namespace in feeds 2012-12-09 10:56:15 +02:00
Koen Punt e1282d507f BranchGraph now loads async 
Centralized keyboard and drag events for BranchGraph
 2012-12-07 19:06:46 +01:00
Dmitriy Zaporozhets 55f776f095 Tiny nav 2012-12-06 16:54:53 +02:00
Riyad Preukschas 9b96509899 Fix broken styling after #2176 
Closes #2196
 2012-12-06 11:08:51 +01:00
Dmitriy Zaporozhets 4c3cdfa4ff Make profile dropbown a bit bigger 2012-12-05 17:08:24 +02: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 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 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 d9b15fc17d Crop and rename the add diff note image 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 39834ec640 Move diff notes into the actual diff content column 2012-12-03 22:51:56 +01:00
Riyad Preukschas 534bd5a268 Fix emoji generation and styling 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 a5105ddf13 Fix broken CSS 2012-12-03 14:39:13 +02:00
Dmitriy Zaporozhets 6ea6ab7c8d Restyled services page in order to make it more usable 2012-12-02 08:41:06 +03:00
Koen Punt 61140b71cd overflow: auto so content won't break layout #1612 2012-12-05 01:22:30 +01:00
Dmitriy Zaporozhets ba74fa1413 Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. 2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets f2a76228f2 Remove unsued css styles. Fixed Milestone preselected date. 2012-12-01 09:14:05 +03:00
Dmitriy Zaporozhets 0530e5baae Add description to project features on edit project page 2012-12-02 19:28:23 +02: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 eb3e07a509 Use project owner if no namespace. Restyled team page 2012-11-30 18:26:17 +02:00
Dmitriy Zaporozhets 3c13ef648b Fix MR comments 2012-11-30 16:03:10 +02:00
Dmitriy Zaporozhets c38b9a2f80 Filter projects on dashboard 2012-11-30 13:40:34 +02:00
Dmitriy Zaporozhets 08fded3fac Minor improvments to UI 2012-11-29 18:09:27 +02:00
Dmitriy Zaporozhets 83f2a387d6 Merge pull request #2117 from koenpunt/scss-cleanup 
Scss cleanup
 2012-11-29 06:51:27 -08:00
Koen Punt 1481bae559 Selective responsive bootstrap 2012-11-29 15:37:28 +01:00
Koen Punt 0f31392712 Mixins are now all with dashes instead of underscores 
(there really should be some convention for all gitlab css)
 2012-11-29 12:18:44 +01:00
Koen Punt d7e9eda24d renamed blue_link var to primary_color 2012-11-29 12:18:44 +01:00
Koen Punt df0bd0c212 Removed bg-gradient, now directly using linear-gradient 2012-11-29 12:18:44 +01:00
Koen Punt 81175073a0 removed overqualified mixins round-borders-* 2012-11-29 12:18:44 +01:00
Koen Punt 238c214ac9 Forgot to rename var 2012-11-29 12:18:44 +01:00
Koen Punt b825582eb1 replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
Koen Punt 84de1b71d1 Added some uniformity, all css properties and values are separated by a colon and a space : 2012-11-29 12:18:44 +01:00
Koen Punt 755e4a4700 Removed css declarations out of main.scss, so main is only a collector 
Fonts, variables and mixins are now all in their own stylesheets
 2012-11-29 12:18:44 +01:00
Saito a1ffc673b9 Merge pull request #2096 from panxiaoming/master 
can't open a chinese file name doc
 2012-11-29 02:02:22 -08:00
Dmitriy Zaporozhets ff9a2e2a93 Improve admin logs 2012-11-29 07:49:11 +03:00
Dmitriy Zaporozhets c873cf81f6 Restyled error messages in common way. Added title to head partial 2012-11-28 19:40:54 +02: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
Riyad Preukschas dc99b19af7 Fix CSS for code highlighting 2012-11-27 22:51:10 +01:00
Dmitriy Zaporozhets 4340112398 Remove unused responsive formats 2012-11-27 21:30:39 +02:00
Dmitriy Zaporozhets 23734a715e Dashboard filters for events 2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets f17ddeb394 Make admin project list more useful 2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets 9e8aadb0f0 Merge pull request #2026 from koenpunt/extended-image-diff 
Added bg for transparent images
 2012-11-21 12:56:06 -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
Koen Punt 1de0ea28b9 added bg for transparent images 
added width and height below images in diff
 2012-11-21 18:27:21 +01:00
Dmitriy Zaporozhets 4c6c24856c Themes refactored 2012-11-21 18:19:03 +02:00
Dmitriy Zaporozhets 0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets 6bf656970d Use fieldset. Improved profile 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets d18e2bd59d styled error message 2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets c1c1a1eeee Restored old h6 of bootstrap. Fixed buttons line-height 2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets ec7a1c504f Fix tabs line height 2012-11-21 00:18:36 +02:00