Commit Graph
111 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-20 11:55:58 +03:00
Matthew McMillion afc5b7110f Fix missing links and incorrect display of issue numbers for notes, comments, and merge requests 2014-07-26 12:43:04 -05:00
Dmitriy Zaporozhets 119b02877d Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master'
Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed

This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
2014-07-02 07:00:16 +00:00
Kyle Fazzari 1f976a646d Updated ATOM feed partials to use markdown instead of simple_format. 2014-07-01 06:29:58 -07:00
Dmitriy Zaporozhets f881e43677 Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard
links to issues on main dashboard
2014-06-11 15:02:48 +03:00
Kyle Fazzari c1b1c32196 Add summaries for notes and merge requests to dashboard feed.
This fixes #305.
2014-05-29 07:55:55 -07:00
Dmitriy Zaporozhets c456231690 Use css truncation on dashboard 2014-05-26 23:26:41 +03:00
skvandGitLab 9c046fea67 links to issues on main dashboard 2014-05-26 13:24:21 +00:00
Javier Castro 556ae5ae81 Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible 2014-01-14 12:06:53 -03:00
Dmitriy Zaporozhets 9a31844e2a Remove unnecessary ago keyword
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:49:22 +02:00
Dmitriy Zaporozhets 9a7e2399dd Use jquery timeago plugin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:38:42 +02:00
Drew Blessing fa817dffea Add time ago tooltips to show actual date/time
Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
2013-12-14 15:24:12 -06:00
Dmitriy Zaporozhets 0cd2ea88b3 Dashboard avatars: No need to load 40px images if we render them in 24px
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-11 16:09:23 +02:00
Dmitriy Zaporozhets 33aea41708 Drop rjs from Infinite scrolling
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 11:38:20 +02:00
Dmitriy Zaporozhets 844f8fd213 Show only first line of commit message on dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-01 09:36:59 +02:00
Dmitriy Zaporozhets e8d1e827d8 Remove unnecessary tag 2013-10-10 12:14:21 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets 13fec18ac9 Truncate some text from dashboard events 2013-09-11 22:46:37 +03:00
Dmitriy Zaporozhets 94d364e8cc UI fixes for commits lists 2013-09-10 13:15:49 +03:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets 25e629e460 Render small avatars for inline events 2013-08-20 21:31:37 +03:00
Dmitriy Zaporozhets 9174020f14 Fix event image preview 2013-08-20 21:20:11 +03:00
Dmitriy Zaporozhets 20397091f1 Show iid in event feed and uatocomplete as default id for issues, mr 2013-08-19 22:12:59 +03:00
Dmitriy Zaporozhets ffa234bc80 Dont render event body if empty 2013-08-16 15:40:55 +03:00
Dmitriy Zaporozhets 14db704231 Minor UI improvements to event feed 2013-08-16 15:37:42 +03:00
Dmitriy Zaporozhets dcac37d9e4 Restyle MR form page 2013-07-17 15:48:22 +03:00
Dmitriy Zaporozhets c1c28d3cea Restyle last push widget 2013-07-17 00:46:27 +03:00
Dmitriy Zaporozhets e49ec46461 Open note image attachment in new tab 2013-07-11 09:19:19 +03:00
Izaak Alpert c1b05e7b86 Gravatar image fixes when gravatar unavailable
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar  wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)

Conflicts:
	app/assets/stylesheets/themes/ui_bb.scss
	app/views/snippets/_snippet.html.haml

Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets 08e52a5624 Refactor event title for notes 2013-06-07 18:46:33 +03:00
Dmitriy Zaporozhets d0357f3bbe Fix event note output 2013-06-07 18:33:16 +03:00
Dmitriy Zaporozhets 96e8c6b7ed Fix dashboard lost if comment on commit 2013-06-07 17:18:11 +03:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
2013-06-04 18:36:22 +03:00
Dmitriy Zaporozhets f4ae433d90 Increase event title font size on dashboard activity feed 2013-04-06 15:53:35 +03:00
Dmitriy Zaporozhets cd6280f4fe Use data[:commits] hash from event to render push info on dashboard 2013-04-05 19:47:45 +03:00
Dmitriy Zaporozhets ff4471a3cd Get rid of event decorator. Use event data hash instead commit objects to increase perfomance 2013-04-05 19:47:12 +03:00
Dmitriy Zaporozhets b53557aca6 Remove decorator calls and methods from views. Repalace with helper calls when needed 2013-03-31 23:47:26 +03:00
Andrew8xx8 3e695acfa2 Notes fixed 2013-03-25 15:58:09 +04:00
Dmitriy Zaporozhets b1bd3f1252 fix tests. added jquery.timeago.js 2013-03-19 14:39:32 +02:00
Dmitriy Zaporozhets 9c709be335 fix event relative date being cached 2013-03-08 13:14:47 +02:00
Dmitriy Zaporozhets 4c1538a946 Use redis as cache storage. cache events 2013-03-06 17:30:48 +02:00
Dmitriy Zaporozhets 730e79e787 better event-notes typography 2013-03-04 22:00:51 +02:00
Dmitriy Zaporozhets a699ebdbcc handle attahcment with send_file 2013-02-11 21:31:19 +02:00
Dmitriy Zaporozhets dd8d0a659d Fix procfile and attachment in event nore 2013-02-11 19:25:06 +02:00
Dmitriy Zaporozhets 8e0b58d7e7 render note with attachment for event 2013-02-11 15:47:01 +02:00
Dmitriy Zaporozhets e2fb18a3ec replace right with pull-right 2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets bf753e99e7 Improve link to comment targets on dashboard 2013-01-17 22:54:02 +02:00
Riyad Preukschas 9bc829d397 Fix markdown for note events 2013-01-16 23:03:21 +01:00