Robert Speicher
465e40d3a6
Extract ref switcher into a partial
...
Also moves onchange JS to projects.js.coffee
2012-09-16 12:07:57 -04:00
Robert Speicher
4247ccd340
Remove unused project/_refs partial
2012-09-16 11:53:36 -04: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
348def0344
Init mr comments when naviagate via ajax to diff
2012-09-15 09:58:16 +03: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
07eec9c66a
Update Notes JS for reversed notes
2012-09-14 21:41:57 +02:00
Riyad Preukschas
7563abbe49
Add 'notes/reversed_notes_with_form' partial
2012-09-14 21:41:57 +02:00
Riyad Preukschas
e1ca155c95
Extract 'notes/per_line_notes_with_reply' partial
2012-09-14 21:41:57 +02:00
Riyad Preukschas
a3dbd99068
Extract 'notes/per_line_note_link' partial
2012-09-14 21:41:57 +02:00
Riyad Preukschas
c6d71b7b8e
Rename 'notes/per_line_show' partial to 'notes/per_line_note'
2012-09-14 21:41:57 +02:00
Riyad Preukschas
dd1b3177c9
Renamed 'notes/notes_list' partial to 'notes/notes'
2012-09-14 21:41:57 +02:00
Riyad Preukschas
4fc66ead4f
Rename 'notes/show' partial to 'notes/note'
2012-09-14 21:41:57 +02:00
Riyad Preukschas
29c71f2fb9
Rename 'notes/reply_button' partial to 'notes/per_line_reply_button'
2012-09-14 21:41:57 +02:00
Riyad Preukschas
c02e3f2104
Rename 'notes/form' partial to 'notes/common_form'
2012-09-14 21:41:57 +02:00
Riyad Preukschas
3c02c93f08
Remove 'notes/load' partial
2012-09-14 21:41:56 +02:00
Riyad Preukschas
8fb70d924d
Rename 'notes/create_*' partials
2012-09-14 21:41:56 +02:00
Riyad Preukschas
61eb650db0
Rename 'notes/notes' partial to 'notes/notes_with_form'
2012-09-14 21:41:56 +02:00
Riyad Preukschas
cee230a158
Update JS for adding and removing diff line notes
2012-09-14 21:41:56 +02:00
Riyad Preukschas
653f7ec4fb
Update links for inline comments to use data-* attributes
2012-09-14 21:41:56 +02:00
Riyad Preukschas
20e009a40a
Update diff comments order and rendering
2012-09-14 21:41:56 +02:00
Riyad Preukschas
e802d00996
Completely redo loading of notes with JS
2012-09-14 21:41:56 +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
randx
759fb518eb
fix event issue when event for left project + project removed
2012-09-14 18:46:40 +03:00
Dmitriy Zaporozhets
dc37c8aaae
Refactored profile area
2012-09-14 19:13:25 +03:00
randx
9329dfbfc5
Show inline providers icons on login page
2012-09-12 19:01:52 +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
486de8c3f4
Refactoring auth
2012-09-12 07:48:22 +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
Dmitriy Zaporozhets
40eec08c99
Merge pull request #1409 from riyad/update-votes
...
Update votes for issues and merge requests
2012-09-11 23:08:19 -07:00
randx
0523b4265b
Application logger
2012-09-11 23:24:53 +03:00
Riyad Preukschas
0bfcc574b6
Extract displaying votes into partials
2012-09-11 16:48:11 +02:00
Dmitriy Zaporozhets
4903910390
Merge pull request #1438 from SaitoWu/bugfix/1434
...
tree view need use ascii-8bit, file name need be utf8.
2012-09-11 05:43:56 -07:00
Nihad Abbasov
5a90712645
don't load commit logs when viewing blob
2012-09-11 05:35:16 -07:00
Saito
96d4f22e53
tree view need use ascii-8bit, file name need be utf8.
2012-09-11 19:18:14 +08:00
Dmitriy Zaporozhets
263b8af1c4
Merge pull request #1423 from u-minor/fix_ldap_login
...
Fix haml template error for ldap login.
2012-09-10 06:39:21 -07:00
Dmitriy Zaporozhets
5604613025
Merge pull request #1415 from tsigo/chosen_behavior
...
Reduce the amount of JavaScript written in views
2012-09-10 04:43:21 -07:00
Minoru NAKATA
a3d22297dc
fix haml template error for ldap login.
2012-09-10 20:40:20 +09:00
Dmitriy Zaporozhets
52d29f5d59
Project team page improved
2012-09-10 09:14:37 +03:00
Robert Speicher
d6c384c20f
Reduce the amount of JavaScript written in views
...
Seeing `:javascript` all over Views feels like a code smell. This goes a
long way towards reducing the amount of JS in views, but there's still
plenty to be done on that front.
2012-09-10 02:12:36 -04:00
Alex Denisov
1f240b09ed
User left project event added
2012-09-10 00:27:47 +03:00
Alex Denisov
a86bd87afc
User joined project event added
2012-09-09 23:18:28 +03:00
Riyad Preukschas
a5164ea2ed
Show votes as a bar
2012-09-08 16:44:56 +02:00
Riyad Preukschas
5ca31aa252
Make issue buttons look more consistent with MRs
2012-09-08 16:07:51 +02:00
Riyad Preukschas
1271b4ce66
Update display of merge requests and issues to also show downvotes
2012-09-08 16:07:44 +02:00
Riyad Preukschas
f4a90bc9f3
Add emoji docs to Markdown help
2012-09-08 01:09:12 +02:00
Riyad Preukschas
130520fa5e
Reorder blocks in Markdown help
2012-09-08 01:09:09 +02:00
Dmitriy Zaporozhets
7b50a7c99d
Merge pull request #1402 from AlexDenisov/preselected_milestone_while_create_new_issue
...
Preselected milestone and assignee while create new issue
2012-09-07 11:10:27 -07:00
randx
367e17cc84
5xx error status code for gitolite & encoding error
2012-09-07 20:47:52 +03:00
randx
048117c05d
projects helper added
2012-09-07 19:57:13 +03:00
Alex Denisov
f789476241
Merge branch 'master' into preselected_milestone_while_create_new_issue
2012-09-07 17:20:20 +03:00
Alex Denisov
26552051b7
Pre-selected milestone implemented
2012-09-07 16:35:59 +03:00
Dmitriy Zaporozhets
fed6ab2481
Change representation of team members. Group by role
2012-09-07 10:42:41 +03:00
Dmitriy Zaporozhets
61c7449321
Bulk user add on project -> new team member
2012-09-07 09:50:35 +03:00
Dmitriy Zaporozhets
79021e674b
Split gitolite backend. Use gitolite_config methods moved to separate class
2012-09-07 08:16:29 +03:00
Robert Speicher
8fdeb43c36
Fix Help/Markdown: Take 2
2012-09-06 17:20:57 -04:00
Robert Speicher
34a48d55cc
Revert "Change @project instance variable to a local in views/help/markdown"
...
This reverts commit 6471d8c652
.
2012-09-06 17:17:56 -04:00
Alex Denisov
562af7a6a2
Merge branch 'master' into normalize_capitalization
2012-09-06 11:40:56 +03:00
Alex Denisov
09a86bd4d6
Capitlization of /gitlab/i normalized. #1367
2012-09-06 11:21:35 +03:00
Dmitriy Zaporozhets
982a4095c1
Use tw style for some buttons. Improved deploy key UI
2012-09-05 08:56:59 +03:00
Robert Speicher
0bc4ecfedd
Change projects/empty to include the clone_panel partial instead of duplicating
2012-09-04 12:05:21 -04:00
Robert Speicher
82a3996883
Remove projects/_show partial
...
I have no earthly idea what this file was for, but I couldn't find it being
rendered anywhere.
2012-09-04 12:05:21 -04:00
Robert Speicher
7e76610d0a
Update the projects js file to coffeescript; refactor the clone panel switcher
2012-09-04 12:05:20 -04:00
Robert Speicher
6471d8c652
Change @project instance variable to a local in views/help/markdown
...
It was erroneously appending the project name to the page's title, even
though the Help system isn't specific to one project.
2012-09-04 03:18:26 -04:00
Robert Speicher
b44e9a08d5
Add Milestone link to API help TOC
...
[ci skip]
2012-09-03 20:38:41 -04: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
Dmitriy Zaporozhets
c7cfe3d83b
devise session templates to haml. Fix problem with missing message in commit
2012-09-03 08:15:07 +03:00
Dmitriy Zaporozhets
6997543ac2
Merge pull request #1351 from tsigo/nonrelative_resque
...
Give Resque route a name and use that for the iframe src
2012-09-02 11:58:13 -07:00
randx
beb5e1bd6b
Sanitize glm helper
2012-09-01 23:35:04 +03:00
Robert Speicher
0de5d08e37
Give Resque route a name and use that for the iframe src
...
Closes #1350
2012-08-31 19:28:32 -04:00
Dmitriy Zaporozhets
ed954ebae2
Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications
...
Issue status changed notifications
2012-08-31 00:51:31 -07:00
randx
65abd8b20a
Freeze project path in admin area
2012-08-31 09:05:44 +03:00
randx
5e510ada7a
Js validation for title presence in issue, mr, milestone
2012-08-30 22:28:45 +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
Dmitriy Zaporozhets
cd3d50caf2
Changed colors for buttons. Imporved preview area. Added clone panel to empty project
2012-08-30 09:27:02 +03:00
Dmitriy Zaporozhets
793db070f0
Restyled projects list on dashboard
2012-08-30 08:13:36 +03:00
randx
51558bd57a
Refactoring scss & improving some UI elements
2012-08-29 22:29:50 +03:00
randx
1dd938d20c
SCSS refactoring & cleanup. First iteration
2012-08-29 21:23:43 +03:00
Alex Denisov
4d65532158
Issue_status_changed email added
2012-08-29 09:49:39 +03:00
randx
e5adca1b81
Preview as button. Disable note submit unless content
2012-08-29 08:13:38 +03:00
Robert Speicher
8a49cdc3b4
Add milestone API docs to doc/README and views/help/api
...
Also removes `closed` attribute option from create action.
2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets
1f5e2658f5
Merge pull request #1412 from tsigo/more_coffeescript
...
Convert main.js to CoffeeScript
2012-09-09 06:48:33 -07:00
Robert Speicher
3b89f14090
Convert main.js to coffee
...
Remove duplicate 's' hotkey code
2012-09-09 07:28:41 -04:00
Robert Speicher
1c01536829
Fix spelling of "empty" in disableButtonIfEmptyField function name
2012-09-09 07:28:41 -04: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
Robert Speicher
52c521ffe8
Use GitHub::Markup to parse markup files
...
Closes #1382
2012-09-05 16:52:49 -04:00
randx
b03ee4666b
Handle invalid ssh exception
2012-08-29 00:44:26 +03:00
Riyad Preukschas
1f1ce5fbd4
Revamp GFM user docs.
2012-08-27 21:20:26 +02:00
Riyad Preukschas
58a581782b
Update forms to show consistent link to GFM.
2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets
cb6fcb6562
Merge pull request #1301 from Mikulas/help-web-hooks-typo
...
fix web hooks help view commit count off by one
2012-08-27 04:58:32 -07:00
Alex Denisov
aaeb37419a
Send notifiation on create UserProject relation (access granted)
2012-08-27 00:13:03 +03:00
randx
2c32574ac3
Project git clone panel
2012-08-25 23:39:01 +03:00
Dmitriy Zaporozhets
efde86537a
Merge pull request #1110 from gliptak/patch-1
...
Display configured git repository location on error page
2012-08-25 13:04:41 -07:00
Mikuláš Dítě
e0cd807020
fix web hooks help view commit count off by one
2012-08-25 20:48:30 +02:00
randx
6ff0652e9e
Admin area -> user form
2012-08-25 20:31:19 +03:00
randx
fee26c58e2
Move snippets api doc to separate file
2012-08-25 19:21:11 +03:00
Florian Unglaub
48443d20ca
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
2012-08-24 15:25:52 +02:00
Joe Hillenbrand
0dbde913dc
Hide gravatar tip if gravatar is disabled.
2012-08-24 16:04:07 -07:00
randx
3dd7703b80
Feature: Labels page. Index page
2012-08-24 13:05:40 +03:00
Cyril
e2f19befbc
fix inline forms
2012-08-23 23:04:43 +02:00
Dmitriy Zaporozhets
0e5dbd1caf
Merge pull request #1231 from NARKOZ/preview_notes
...
Preview window is not closed after post
2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets
aa50408ecb
1. Better message if no ssh key
...
2. SSH Keys Help page
2012-08-22 03:56:53 +03:00
randx
f088eaa972
Refactoring & minor css changes
2012-08-21 21:26:56 +03:00
randx
c625293b99
Handle post-receive files via gitolite, not gitlab
2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets
2e7ca8c866
Show only tm events related to this project
2012-08-21 08:20:11 +03:00
randx
b2b88b2ff2
Added font for head panel. Major restyle for header
2012-08-20 22:51:37 +03:00
randx
8eaead6a01
Text message for mergeing MR
2012-08-19 00:45:46 +03:00
randx
3f9749dd86
Fix branch selector. Few css fixed also
2012-08-18 23:53:58 +03:00
Florian Unglaub
a64aff2f1c
Omniauth Support
2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets
93401ef988
Few css improvements
2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets
4ce034ca65
Merge pull request #1247 from tsigo/feature/no_milestone_filter
...
Allow filtering issues that have no milestone or assignee
2012-08-16 22:33:56 -07:00
Robert Speicher
feee3838e1
Combine unassigned_issue and unassigned_milestone into unassigned_filter
2012-08-16 18:13:22 -04:00
Robert Speicher
66399d558d
Merge branch 'master' into hooray_apostrophes
2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets
05da3801f5
Restyled erros pages & avatar class
2012-08-16 09:13:50 +03:00
Martin Bastien
6641761e5c
Fix current class for hooks tab in admin section
...
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2012-08-15 00:03:13 -04:00
Robert Speicher
70174a1e1a
More minor translation/grammar fixes on error pages
2012-08-14 17:26:38 -04:00
Nihad Abbasov
0b7e67ad12
fix note preview link, and hide preview and errors after posting a comment
2012-08-14 01:24:27 -07:00
Robert Speicher
6af38f5145
"Cant" -> "Can't"
2012-08-13 21:02:40 -04:00
Robert Speicher
5a90d044f7
Allow filtering by issues with no assigned... assignee
...
Continues #1222
2012-08-13 20:49:18 -04:00
Dmitriy Zaporozhets
6ebd360cf2
Modern theme restyled. Better Profile -> Ui page
2012-08-13 08:52:10 +03:00
Robert Speicher
b1ea0b3c01
Allow filtering by issues with no assigned milestone
...
Closes #1222
2012-08-13 01:38:00 -04:00
randx
bd0c971aa9
Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard
...
Conflicts:
app/views/events/_commit.html.haml
2012-08-12 00:33:32 +03:00
Robert Speicher
7754189187
Fully embrace Ruby 1.9 hash syntax
...
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
Cyril
15fc0f0c10
fix commit events on dashboard
2012-08-10 21:23:54 +02:00
Dmitriy Zaporozhets
5fd0e7ba11
Merge pull request #1198 from NARKOZ/preview_notes
...
ability to preview notes
2012-08-10 06:42:31 -07:00
Nihad Abbasov
9639780359
render notes preview on server-side
2012-08-09 23:47:48 -07:00
randx
f197fa1fbf
Fix github issue #1153
2012-08-08 17:08:43 +03:00
Dmitriy Zaporozhets
839757598b
Wiki pages page
2012-08-09 07:34:29 +03:00
Dmitriy Zaporozhets
8ffb6126a9
slim comment form
2012-08-09 06:36:55 +03:00
Nihad Abbasov
1ec3bd3f8d
ability to preview notes
2012-08-08 01:12:05 -07:00
randx
6171a4d8eb
Fixed dashboard broken messages cause of glm
2012-08-03 03:28:02 +03:00
randx
34ba4e1352
Gitlab Markdown help page
2012-08-03 00:20:09 +03:00
Riyad Preukschas
5443021a0e
Update notifications mails and notify specs for GFM
2012-08-06 05:08:22 +02:00
Riyad Preukschas
9a0b763eec
Fix missing @project errors
2012-08-06 03:16:06 +02:00
Riyad Preukschas
8e6a7a172e
Merge branch 'master' into gitlab-flavored-markdown
2012-08-06 01:48:20 +02:00
Valeriy Sizov
3079687b93
Merge pull request #1179 from robbytaylor/master
...
Grammar fix after creating a project
2012-08-02 09:27:10 -07:00
Riyad Preukschas
eb06dd79f8
Update views for GFM
2012-08-02 02:54:57 +02:00
Rob Taylor
516a76c9a9
Fixed grammar in 'please wait' message after creating project
2012-08-01 11:19:20 +01:00
randx
e8261313a7
Fixed firefox css bug with issues table
2012-07-28 05:43:34 +03:00
randx
00b280c3f9
Feature: Bulk Issues update
2012-07-28 03:35:43 +03:00
randx
69e41250d1
Styled New/Edit Project for admin area
2012-07-28 00:42:44 +03:00
randx
c2817e6f3a
Team Member Profile: Remove button rebased
2012-07-29 01:40:21 +03:00
randx
4c1267e09f
CSS refactoring. Notes better styled
2012-07-29 01:34:51 +03:00
Dmitriy Zaporozhets
354d243878
Merge pull request #983 from JamesEarlDouglas/notify-grammar
...
cleanup the wording of the notification footer
2012-07-28 07:38:17 -07:00