Commit Graph
2441 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f7e7dc7ebb Make note anchors actually work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 13:32:43 +02:00
Dmitriy Zaporozhets 1a2e11c891 Fix per-project counters for Dashboard filters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 09:19:51 +02:00
Dmitriy Zaporozhets 16ea2ec189 Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq 2013-12-24 18:59:00 +00:00
Dmitriy Zaporozhets 4c61c46738 Add tests to Dashboard#merge_requests filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 18:22:48 +02:00
Dmitriy Zaporozhets 5953582b65 Show Assigned/Authored/All filter for dashboard issues and mr pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 14:53:52 +02:00
Dmitriy Zaporozhets 0c0beec26e use .body instaed of .ui-box-body
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 12:58:23 +02:00
Dmitriy Zaporozhets dac67ed65f Use new ui-box classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 11:45:42 +02:00
Dmitriy Zaporozhets 7765777583 Fix project transfer feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-23 13:24:10 +02:00
Dmitriy Zaporozhets 854977a201 Merge pull request #5883 from matthee/master
Admin/Background Jobs: fixed spelling mistake
2013-12-22 00:53:20 -08:00
Dmitriy Zaporozhets f23ffeece7 Merge branch '6-5-dev'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
2013-12-21 23:23:59 +02:00
Dmitriy Zaporozhets a849676300 Use relative dates with tooltips fopr Issue#show and MR#show
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-20 10:03:29 +02:00
Dmitriy Zaporozhets 1231a3678a Dont allow change of MR target or source projects after it was created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-20 09:48:43 +02:00
Matthias Link 5c17be3604 Admin/Background Jobs: fixed spelling mistake 2013-12-19 20:42:11 +01:00
Dmitriy Zaporozhets d1aff25ca4 Consistent place for state-label across issues, mr, milestones
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 21:00:44 +02:00
Dmitriy Zaporozhets 3cdb8f26c9 UI: use different padding in labels for Issues#show and Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 20:25:01 +02:00
Dmitriy Zaporozhets 63d5fcc868 UI: allign milestone to right for issue, mr show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 20:21:22 +02:00
Dmitriy Zaporozhets d1e8495890 Add validations to BroadcastMessage color and font
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 20:11:01 +02:00
Dmitriy Zaporozhets aef944ba7f Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev 2013-12-19 19:58:40 +02:00
Dmitriy Zaporozhets 3958330edc Added milestone_options and assigne_options helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 19:54:57 +02:00
Dmitriy Zaporozhets 5c68f4f4e5 remove unecessary bold text on Issue#show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 19:39:58 +02:00
Dmitriy Zaporozhets 1616dfdc07 UI improvements to issue show page
* labels moved below the issue
* removed margin in "created by..." area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 19:36:27 +02:00
Dmitriy Zaporozhets 5405f19bac Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev 2013-12-19 19:15:19 +02:00
Humberto Pereira 392d79db0e Updated help page for Project web hooks 2013-12-19 13:32:30 -02:00
Dmitriy Zaporozhets 8c670b66f0 Show repo size for project show page in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-19 17:15:48 +02:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Jason Hollingsworth e1fa9abd89 Change archive icon and clone panel styling. 2013-12-18 08:46:06 -06:00
Dmitriy Zaporozhets 078b3f580e Rename Services to Project services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 3b0acc9eea Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 14:22:59 +00:00
Dmitriy Zaporozhets 4efaa51bbe Make comment preview button white
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:07:49 +02:00
Dmitriy Zaporozhets 1f41e1bcdd Improve commits page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 16:03:59 +02:00
Dmitriy Zaporozhets 5cb8525891 move arhoved label from project title to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-18 15:02:31 +02:00
Dmitriy Zaporozhets 79248f4ca5 Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url
Update default public pull url.
2013-12-18 04:41:06 -08:00
Dmitriy Zaporozhets dad576a777 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-18 14:40:37 +02:00
Hans Lemuet ff0d8a18bf tiny wording fix
GitLab users can can see this snippet -> GitLab users can see this snippet
2013-12-18 00:04:40 +01:00
Jason Hollingsworth 1521f467cb Update default public pull url.
This updates the default pull URL for public projects when the user
is not logged in.
2013-12-17 12:48:59 -06:00
Jason Blanchard 65448e2ff7 Added dropdown menus to issue#show page for assignee and milestone 2013-12-17 09:39:50 -05:00
Dmitriy Zaporozhets 074efd8fd5 Email on push: dont send email if new branch was pushed or branch was removed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 16:20:45 +02:00
Dmitriy Zaporozhets 8b89ef8639 Add templates for Emails on push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 15:30:15 +02:00
Dmitriy Zaporozhets d550933907 Add new method to mailer for deliver emails with push info
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 14:45:55 +02:00
Dmitriy Zaporozhets 2428a0b2dd Add project_services dir to autoload path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:58:44 +02:00
Dmitriy Zaporozhets 5ac5730547 Sort project services by title. Add textarea support to it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-17 12:42:13 +02:00
Dmitriy Zaporozhets 42003f5312 Improve UI/UX for reset_password, signup, confirmation pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 21:11:52 +02:00
Dmitriy Zaporozhets 6f556d8e71 Add resend-confirmation-link to sign-in page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 21:10:59 +02:00
Dmitriy Zaporozhets 687cf48e60 Improve email with confirmation instructions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 21:10:18 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
2013-12-16 14:39:14 +01:00
Dmitriy Zaporozhets b7fc0e81ce Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_message
Allow user to hide the message to add an ssh key permanently
2013-12-16 03:25:00 -08:00
Dmitriy Zaporozhets d46dba5830 Merge pull request #5847 from skv-headless/fix_deprecation_warnings
fix most of warnings
2013-12-16 03:22:55 -08:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently
Favor links instead of buttons

Remove unnecessary class

Remove extra space
2013-12-14 20:21:12 -06: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
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00