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

301 commits

Author SHA1 Message Date
Cyril 8a3bbbdb88 clean app helper 
* remove unused method
* simplify gravatar_icon
 2013-01-10 01:46:23 +01:00
Alex Denisov d7bc121474 replace javascript:void with preventDefault 2013-01-09 21:02:41 +00:00
Alex Denisov 3cc0458312 Reloading of events via ajax instead of page reloading. 2013-01-09 19:30:20 +00:00
Alex Denisov 97d17cf835 Event filters stores at cookies. 2013-01-09 19:30:20 +00:00
Alex Denisov b255c3c44b Tests on events filtering added 2013-01-09 19:30:20 +00:00
Dmitriy Zaporozhets cc64f2a814 Common filtering for dashboard and group. Share partial search result partial 2013-01-07 20:52:43 +02:00
Dmitriy Zaporozhets dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets 39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets d431e43392 Fix few bugs and tests after refactoring ownership logic 2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets a16533a04a Add groups to search autocomplete. Use alphabetically scope for users order 2012-12-30 13:50:23 +02:00
Dmitriy Zaporozhets c8ba5c2d58 Fix routing issues when navigating over tree, commits etc 2012-12-25 06:14:05 +03: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
Riyad Preukschas 757c7a5291 Fix gravatar and ldap config 2012-12-20 16:54:28 +01:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets 4b02f4a22d show production.log, show only active milestone for issue filter 2012-12-19 07:14:05 +03:00
Dmitriy Zaporozhets 85d5f606f6 Labels autocomplete 2012-12-18 06:14:05 +03: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
Dmitriy Zaporozhets d7eb314553 Project titles with namespaces 2012-12-12 12:02:29 +02:00
Dmitriy Zaporozhets ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Riyad Preukschas 20c8d6e644 Merge pull request #2222 from jojosch/add-test-help-raketasks 
add help/raketasks to routing spec and search autocomplete
 2012-12-10 05:38:14 -08:00
Dmitriy Zaporozhets f4d9059b7e Show project with namespace in feeds 2012-12-09 10:56:15 +02:00
Johannes Schleifenbaum 3a48177762 add help raketasks to search autocomplete 2012-12-08 17:35:10 +01:00
Sergey Linnik 0aa7f79ca4 allow customize gravatar url 2012-12-07 00:44:22 +04:00
Sergey Linnik 2c37fa381e fix some glitches in gravatar image url generation 
always use proper size value
do not show alt text when avatar image not loaded
 2012-12-07 00:03:13 +04:00
Dmitriy Zaporozhets 674efd38d8 Fix 500 error on services page. Fixed active project tab when on services 2012-12-05 14:17:40 +02:00
Riyad Preukschas c4a7824a8c Fix wall notes 2012-12-03 22:51:56 +01:00
Riyad Preukschas 494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas ae067ee322 Fix vote counting 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 b91d680257 Fix notes helper 2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets c38b9a2f80 Filter projects on dashboard 2012-11-30 13:40:34 +02:00
Riyad Preukschas 184a9ecaf6 Add user_color_scheme_class helper 2012-11-27 22:51:05 +01:00
Dmitriy Zaporozhets 81f8114f24 NamespacesHelper 2012-11-27 17:48:25 +02:00
Dmitriy Zaporozhets f5551efdfd Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues 2012-11-27 09:31:15 +03:00
Dmitriy Zaporozhets cc52eed981 Show namespace in search autocomplete 2012-11-27 07:29:11 +03:00
Dmitriy Zaporozhets d7c5885c3d Improved Issues and MR filters 2012-11-27 07:29:11 +03:00
Dmitriy Zaporozhets ab42370af0 Fix sattellites 2012-11-21 09:14:05 +03:00
Dmitriy Zaporozhets 23734a715e Dashboard filters for events 2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets 0e1635a68a Fixing requests after namespaces. Fixed admin bug with access to project 2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets f17ddeb394 Make admin project list more useful 2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets 2b683b0d0b Ability to create project with namespace 2012-11-23 07:11:09 +03:00
Dmitriy Zaporozhets ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03: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
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
Robert Speicher e60185699b Add 'breadcrumbs' helper for Commit breadcrumb links 
Closes #1731
 2012-11-01 17:58:13 -04:00
Dmitriy Zaporozhets d9c20cf5a6 Fix 404 errors on Merge Request -> new 2012-10-31 14:29:42 +02:00
randx f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +02:00
randx 0189ee97ed Security for online editor. Replace dev_access?, master_access? with can? method usage 2012-10-21 12:12:14 +03:00
Riyad Preukschas ce91014730 Fix use of Emoji 2012-10-18 01:10:35 +02:00
randx 453b2ae68b Fix plain text readme 2012-10-16 09:43:22 +03:00
Riyad Preukschas b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02:00
Dmitriy Zaporozhets 837972650c Merge pull request #1683 from riyad/fix-events-for-deleted-things-again 
Fix displaying events for deleted things on the dashboard (again)
 2012-10-12 04:56:16 -07:00
Riyad Preukschas 19560a4b5f Fix displaying events for deleted things 2012-10-12 13:37:44 +02:00
Riyad Preukschas 64008b9ec7 Improve search suggestions 2012-10-12 01:02:28 +02:00
Riyad Preukschas 81ee69381d Add links to the note source if the note is mixed in 2012-10-10 12:14:48 +02:00
Riyad Preukschas fb0279f311 Fix vote counting to only count main target notes (not mixed in ones) 2012-10-10 12:09:45 +02:00
Riyad Preukschas 3f72af9994 Make notes for merge requests include commit notes and add helpers 2012-10-10 12:06:30 +02:00
Riyad Preukschas eb92813757 Move emoji auto-complete helper to ApplicationHelper 2012-10-10 00:53:42 +02:00
randx 679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00
Riyad Preukschas bbd92e57cb Add emoji_for_completion helper 2012-10-09 14:47:42 +02:00
Andrey Kumanyaev df7c52489a simple refactoring 2012-10-09 04:10:04 +04:00
Robert Speicher 388d72e6bf Add render_tree helper; simplify (speed up) tree_icon 2012-10-03 19:39:27 -04:00
Dmitriy Zaporozhets 69751aac32 Refactoring event views 2012-10-01 16:58:13 +03:00
Dmitriy Zaporozhets 663dd6fad6 Refactored events output. Added links to authors of events 2012-10-01 16:39:19 +03:00
Robert Speicher 1502be325d Minor doc fix 2012-09-27 13:12:11 -04:00
Dmitriy Zaporozhets 2c8d3c33ff Fixed ref switcher 2012-09-27 09:53:42 +03:00
Robert Speicher 36f68140d1 Replace various "active tab" checks with nav_link 
Also remove now-unused tab_class helper
 2012-09-26 16:38:28 -04:00
Robert Speicher f064c84019 Add nav_link helper to TabHelper 2012-09-26 16:32:26 -04:00
Robert Speicher aa0c4b77b6 Add current_action? helper 2012-09-26 16:32:26 -04:00
Robert Speicher b62d6a1fe2 Remove commit_tab_class helper 2012-09-26 16:32:25 -04: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
Robert Speicher adcc6a0b0e Move tab_class helper to TabHelper 2012-09-26 16:32:24 -04:00
Robert Speicher 60ac6a28a2 Allow current_controller? helper to take an Array of options 2012-09-26 16:32:24 -04:00
Robert Speicher 3ad931ca92 Add current_controller? helper method 
Simplifies some of the "active tab" checks we're doing
 2012-09-26 16:32:23 -04:00
Robert Speicher 79a02df92e Update usages of tree_file_project_ref_path to project_tree_path 2012-09-26 16:32:21 -04:00
Dmitriy Zaporozhets 0e524aaea1 Added workaround for github-markup issue with rendering markdown 2012-09-20 13:00:18 +03:00
Robert Speicher 496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -04: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
Robert Speicher 95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Riyad Preukschas b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02: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 e802d00996 Completely redo loading of notes with JS 2012-09-14 21:41:56 +02:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
randx acc5302c3f improve profile layout after omniauth changes 2012-09-12 18:56:44 +03:00
Dmitriy Zaporozhets fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
 2012-09-12 06:49:52 +03:00
Saito 96d4f22e53 tree view need use ascii-8bit, file name need be utf8. 2012-09-11 19:18:14 +08:00
Vanja Radovanović 7e2846fb57 using blank?, much shorter 2012-09-10 17:32:31 +02:00
Vanja Radovanović 8d171a8cbc fixed commit title when commit message is an empty string and ensured that link_to_gfm helper doesn't break on nil body 2012-09-10 14:40:35 +02:00
Dmitriy Zaporozhets 52d29f5d59 Project team page improved 2012-09-10 09:14:37 +03:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
Riyad Preukschas 9a4c22d395 Remove unnecessary check in Markdown helper 2012-09-08 01:11:32 +02:00
randx 048117c05d projects helper added 2012-09-07 19:57:13 +03:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files 
Closes #1382
 2012-09-05 16:52:49 -04:00
Robert Speicher 90f587f4ee Move the entire gfm method to Gitlab::Markdown, which will be a module now 2012-09-05 16:06:20 -04:00
randx aecbd313bc Fix glm by adding id and classes to sanitize white attrs 2012-09-02 15:25:54 +03:00
randx beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
Dmitriy Zaporozhets 793db070f0 Restyled projects list on dashboard 2012-08-30 08:13:36 +03:00
Riyad Preukschas 806695f491 Split and reformat markdown options and add refs to their docs. 
Also add hard_wrap option.
 2012-08-27 21:20:13 +02:00