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

199 commits

Author SHA1 Message Date
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
a7aee9d1ee Pretty compare mode 2012-12-19 20:14:05 +03:00
Koen Punt
9916e8d6dc Updated test to match with switched commits 
Added compare switch
 2012-12-20 14:39:39 +01:00
Dmitriy Zaporozhets
8826077471 Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03: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
a8fbda945e bit reordering and cleanup unused styles 2012-12-13 21:44:55 +02: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
ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Dmitriy Zaporozhets
55f776f095 Tiny nav 2012-12-06 16:54:53 +02: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
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
140652e9b0 Fix common form and note preview 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
5c2f6d7f05 Update notes views to support discussions 2012-12-03 22:51:55 +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
eb3e07a509 Use project owner if no namespace. Restyled team page 2012-11-30 18:26:17 +02: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
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
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
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
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
c1c1a1eeee Restored old h6 of bootstrap. Fixed buttons line-height 2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets
942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets
ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03:00
Dmitriy Zaporozhets
6878f55620 Bigger file name for commits diff 2012-11-19 14:01:40 +02:00
Dmitriy Zaporozhets
86b181398c Merge pull request #2011 from koenpunt/extended-image-diff 
Optimized commit diff views, now showing file size and file mode changes
 2012-11-19 04:01:49 -08:00
Koen Punt
3ac1f9459a Optimized commit diff views, now showing file size and file mode changes 
Replaced commit status images (diff_file_*.png) with fontawesome icons
 2012-11-18 17:41:41 +01:00
Riyad Preukschas
98e938bdb0 Fix editor form, styles and JS 2012-11-17 15:43:13 +01:00
Riyad Preukschas
6c1b44859d Fix Haml indenting file content 2012-11-17 01:00:26 +01:00
Dmitriy Zaporozhets
3c7806c3f2 Improve lists. Remove unneccessary padding 2012-11-11 00:08:42 +02:00
Dmitriy Zaporozhets
283a9c7b7d Fix margin-right for some avatars 2012-11-10 23:45:13 +02:00
Dmitriy Zaporozhets
949233aa1f Changed default icon for gravatar. Moved filter out of layout 2012-11-06 13:47:43 +02:00
Dmitriy Zaporozhets
f555578414 Added EventFilter class. Compeleted first version of dashbaord filtering 2012-11-05 20:12:26 +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
646bad43e9 Fix styles 2012-10-27 18:27:51 +02:00
Dmitriy Zaporozhets
1c9351abf0 Restyle branches list. Remove unneccesary styles from tree avatar 2012-10-26 19:00:09 +03:00
Sergio Visinoni
a7d0816933 Add Milestone information in Merge Requests 
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
  Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
  Merge Requests listing page
 2012-10-26 16:12:40 +02:00
randx
9902f1af6e Reduce line-height for commits diff lines 2012-10-22 23:49:21 +03:00
randx
e51b2d58e7 Restyled last push widget. Increased line-height for td in tables 2012-10-22 23:37:50 +03:00
Riyad Preukschas
4fd73683d9 Update author info in tree view 2012-10-18 20:53:35 +02:00
Valeriy Sizov
8e989d4863 revert all wiki changes 2012-10-17 16:14:20 +03:00
Valeriy Sizov
31f1cebe4b Wiki style: move styles to right place 2012-10-17 15:17:27 +03:00
Valeriy Sizov
607d8b7970 Wiki Style Fixing 2012-10-17 15:09:16 +03:00
Riyad Preukschas
fa4c38f32b Fix issues close and reopen button text and styles 2012-10-16 19:17:48 +02:00
Riyad Preukschas
866b9f6d91 Make history link for trees look like action links for blobs 2012-10-16 00:57:15 +02:00
randx
809aefb828 Minor improve to UI and code formatting of gitlab web editor 2012-10-15 19:51:11 +03:00
Dmitriy Zaporozhets
02c83f122a Design improved 2012-10-12 20:07:24 +03:00
Valeriy Sizov
57e2b5ed1a WebEditor: integrated editor 2012-10-12 20:07:24 +03:00
Riyad Preukschas
77bde9a0e4 Add notes count to commits in lists. 2012-10-10 01:31:36 +02:00
randx
4f7bd58307 Bigger fonts for groups box 2012-10-03 19:51:14 +03:00
randx
1b6a3dfec9 Move all stuff to groups controller 2012-10-02 20:42:15 +03:00
Dmitriy Zaporozhets
b82cb2630c Use class instead id for css styles 2012-10-02 10:26:24 +03:00
Dmitriy Zaporozhets
663dd6fad6 Refactored events output. Added links to authors of events 2012-10-01 16:39:19 +03:00
Dmitriy Zaporozhets
a79eb84289 commit show page styled a bit 2012-09-28 16:05:54 +03:00
randx
7ded8584a5 blue hover 2012-09-27 23:59:41 +03:00
Robert Speicher
51c1e49900 Change active tab and nav class to "active" 
The main nav used active, the sub nav used current. This normalizes it.
 2012-09-26 16:32:24 -04:00
randx
dddb5b5de9 fix left project event 2012-09-26 21:05:04 +03:00
Dmitriy Zaporozhets
9270b6c3c7 Fix milestone calendar, Removed unnecessary selects from admin 2012-09-26 16:49:20 +03:00
Dmitriy Zaporozhets
e584f14857 Merge pull request #1534 from iamntz/emoji_alignment 
Removed float on emoji
 2012-09-25 12:44:03 -07:00
Dmitriy Zaporozhets
c3efcf7a62 Pollished push event 2012-09-25 13:15:06 +03:00
Dmitriy Zaporozhets
6667f3dbf9 Colored labels for events 2012-09-24 13:33:51 +03:00
Dmitriy Zaporozhets
d23022c6f6 Working on dashboard restyle and events refactoring 2012-09-24 12:32:51 +03:00
Staicu Ionut
c701507b6c Removed float on emoji 
-`remove comment` button will not make the text jump anymore.
 2012-09-24 10:06:41 +03:00
Dmitriy Zaporozhets
bf625b7c92 polishing UI a bit. Added footer links for dashboard 2012-09-19 09:14:07 +03:00
Dmitriy Zaporozhets
64e76a87aa Notes votes: use icons instead of borders. Removed unnecessary padding 2012-09-18 09:17:55 +03:00
Dmitriy Zaporozhets
2aafd7cf4e Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes 2012-09-18 08:56:54 +03:00
Dmitriy Zaporozhets
249cb19d96 Fix project update. Make slim form only for reversed comments 2012-09-18 08:54:17 +03:00
Riyad Preukschas
b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02:00
randx
9159be3a50 Fix MR diff comments. Fix wiki comments loading error 2012-09-15 09:49:21 +03:00
randx
caeb65b189 Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order 2012-09-15 01:02:58 +03:00
Riyad Preukschas
7563abbe49 Add 'notes/reversed_notes_with_form' partial 2012-09-14 21:41:57 +02:00
Riyad Preukschas
1416401753 Fix markup 2012-09-14 21:41:56 +02:00
Riyad Preukschas
8b6dba749a Reorder notes view elements 2012-09-14 21:41:56 +02:00
Dmitriy Zaporozhets
dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
randx
0523b4265b Application logger 2012-09-11 23:24:53 +03:00
randx
21bfd1e7fc minor css improvements 2012-09-05 23:00:10 +03:00
randx
f557686eb2 git clone panel available on files tab too 2012-09-03 22:30:14 +03:00
randx
8ca0b75d05 Tables refactored 2012-09-03 21:53:16 +03:00
randx
beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
randx
adeeae9f73 Few fixes for ~ 1000px resolution 2012-09-01 22:21:28 +03:00
randx
b9ff0c79b4 Changed filters to readable one. Styled some stuff 2012-08-30 22:15:34 +03:00
randx
4a6596af27 Fixed bunch of js bugs with comments. Also added development tips 2012-08-30 21:31:55 +03:00
randx
92137b7beb Removed class 'small' for some buttons. Fixed issue creation 2012-08-30 20:00:16 +03:00