72db22d385
send wall message with crtl+enter
2013-03-20 09:53:39 +02:00
8300ae366c
Fix the Cancel button on the Edit Wiki page.
...
The Cancel button on the Edit Wiki page was still redirecting back
to the "Index" page which is no longer the default Wiki page.
This commit changes the Cancel button in the following ways:
* Pressing Cancel while editing an existing Wiki page will now
redirect you back to the latest version of that page.
* Pressing Cancel while editing a brand new Wiki home page that
does not yet exist will redirect you to back to the same Edit
Wiki Home page.
2013-03-19 21:36:09 -07:00
6880ace1fe
Fix bug showing merge MR in milestone open list
2013-03-19 20:11:47 +02:00
a3cdaeef66
refactor emails a bit. Add email on ssh key creation
2013-03-19 20:00:41 +02:00
8ec01e0ba9
remove ajax loader from wall
2013-03-19 18:14:59 +02:00
3b42c267a6
Dont show blocked users in autocomplete
2013-03-19 18:07:14 +02:00
07a88d6699
Merge pull request #3255 from michelsalib/patch-1
...
Gitlab does not use gitolite anymore.
2013-03-19 08:59:10 -07:00
4403f71f45
added sanitize and linkify functions. Moved some js to lib/
2013-03-19 15:54:58 +02:00
e6c2080214
use scrollTop solution for both chrome & firefox
2013-03-19 15:04:58 +02:00
ba4f0abf47
wall comment does not create an event on dashboard any more
2013-03-19 14:50:26 +02:00
b1bd3f1252
fix tests. added jquery.timeago.js
2013-03-19 14:39:32 +02:00
124a5e270e
add attachemnts support for wall
2013-03-19 13:28:29 +02:00
e2ddf03c7e
Gitlab does not use gitolite anymore.
2013-03-19 11:52:59 +01:00
4d378f3c9a
load notes for wall via api
2013-03-19 12:35:55 +02:00
57f3409bcc
move Wall to own resource
2013-03-19 12:35:42 +02:00
f3dfd22993
add wall.scss
2013-03-19 12:34:59 +02:00
5bf3a898ed
Remove wall from basic notes logic
2013-03-19 12:34:14 +02:00
175e09f167
Change graph element size.
2013-03-19 19:27:15 +09:00
351c952192
Refactor: extract method.
2013-03-19 18:42:46 +09:00
96a584211b
Refactor: Clean up code.
2013-03-19 18:08:27 +09:00
1752c6dc8b
Uncheck notify team checkbox by default
2013-03-19 09:38:33 +02:00
e68955b4fc
add permission messages to project edit
2013-03-19 09:27:12 +02:00
54f40301ff
fixed form input overflow on 1024px res
2013-03-19 08:39:26 +02:00
e00e54b69c
Fix timeout error while showing the very large repo like git repo.
2013-03-19 10:36:40 +09:00
46fa92187d
Refactor: removing duplicate code.
2013-03-19 10:00:29 +09:00
7587a3b2fc
fixed check for snippets module enabled
2013-03-18 23:44:57 +02:00
747292e2d3
reorder features list in project -> edit page
2013-03-18 23:38:16 +02:00
b765a7958d
Move snippets to own tab as feature. Make it disabled for new projects by default
2013-03-18 23:33:41 +02:00
112dc875ba
feature: wiki -> new page
2013-03-18 23:08:54 +02:00
ae06a0aab8
Return own tab for wall. Improve Wiki nav. Removed attachments listing page
2013-03-18 22:43:14 +02:00
6956f1f6e1
Improve usability of project edit page
2013-03-18 20:50:41 +02:00
0c884498d2
Rename project_head partial to settings_nav
2013-03-18 19:35:27 +02:00
0eccc08015
show project description in project listing on dashboard
2013-03-18 19:22:15 +02:00
aa5327a565
Fix project_limit being ignored on signup
2013-03-18 13:22:41 +02:00
415bade302
Result of misspellings run.
...
Most of these are comments but a few are strings for users.
Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check
It runs mostly clean now.
2013-03-17 19:46:54 +00:00
c367cc5ca6
Show projet name with namespace on team _projects widget
2013-03-16 14:40:16 +02:00
d75cb57f9c
remove separator between search & icons in header
2013-03-15 17:35:54 +02:00
94f0493999
few fixes afte merge gollum wiki
2013-03-15 17:21:01 +02:00
71ab011a17
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
...
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
2013-03-15 16:55:07 +02:00
4f23c30ace
Fix highlight line for solarized theme
2013-03-15 16:20:40 +02:00
2449bea2c4
restyle header a bit
2013-03-15 15:39:47 +02:00
21b1fee92c
reannotated
2013-03-15 15:16:02 +02:00
2a04341fba
finish up with solarized dark
2013-03-15 15:14:56 +02:00
8cad1c9f4c
add dark solarized theme for code preview
2013-03-15 15:09:34 +02:00
35ad4fe7db
Use wiki tab for wiki, wall, snippets
2013-03-15 14:20:03 +02:00
5bf88506ec
rename writeboards to wiki
2013-03-15 09:39:07 +02:00
2681a01bcf
add resize button for better wiki reading
2013-03-14 22:57:38 +02:00
a685624d27
Merge wiki, wall & snippets under one tab - writeboards
2013-03-14 22:24:27 +02:00
38ecec4472
Remove tree single-tab panel
2013-03-14 19:50:57 +02:00
5c4e74acc3
Add settings tab to project. Move all project administration there
2013-03-14 19:28:29 +02:00
da3bc14d80
removed mistype
2013-03-14 14:02:56 +02:00
a8b1f8c0e5
use refresh icon instead loader gif
2013-03-14 14:02:24 +02:00
88d42c2e1c
Replace projects_box with ui-box. Fixed team spinach test
2013-03-14 13:12:11 +02:00
e84df44ea0
Redesign search filters
2013-03-14 13:11:20 +02:00
4673c85379
add teams to search autocomplete
2013-03-14 12:43:08 +02:00
441d256188
Rebuild team area
2013-03-14 12:38:43 +02:00
f4f36f78dd
Remove separate search page from group
2013-03-14 12:37:28 +02:00
cc1dd624aa
Restyled group -> edit area. Use select2 for transfer autocomplete
2013-03-14 11:31:33 +02:00
2f6d289f32
style select2-searching too
2013-03-14 10:20:45 +02:00
ef05423f47
Finish select2-ajax for users. Added Select2Helper for tests
2013-03-14 10:16:27 +02:00
d69a37e0b7
Fix whitespace on MARKUPS constant in GollumWiki class.
2013-03-14 00:07:01 -07:00
6d25484417
Limit available Wiki formats to Markdown and RDoc.
2013-03-13 23:34:50 -07:00
7665b1de7e
Use Gitlab Markdown for Markdown files and Gollum to render the rest.
...
This commit enables the usage of the Gitlab Markdown post processing
on all Markdown formatted files. For file types that do not contain
Markdown, it defaults to the Gollum native renderer to process the
content.
2013-03-13 23:31:08 -07:00
10f14136f5
fix setting gon.api_token
2013-03-13 23:45:47 +02:00
bdcaf21ea7
Allow single/multiple user select
2013-03-13 23:19:09 +02:00
7316055ac8
multiselect for ajax-users-select2
2013-03-13 23:19:09 +02:00
bf17d976a7
add api users filter and integrate users select2
2013-03-13 23:19:09 +02:00
163908b393
user select2 javascript
2013-03-13 23:19:09 +02:00
1bba46d661
md5 and utf_encode js libraries
2013-03-13 23:19:09 +02:00
d1a5e370f3
show mail-to and block buttons on /admin/users/:id page
2013-03-13 23:15:39 +02:00
496b7da7a0
Fix spinach tests
2013-03-13 21:58:32 +02:00
1587caa3e4
Use name+username in team -> new
2013-03-13 19:24:30 +02:00
fa9a8c3847
Remove team_member show page -> use user_path instead
2013-03-13 19:16:36 +02:00
70fc1c5021
cleanup ProjectMover
2013-03-12 14:13:25 +02:00
6755d9908f
Merge pull request #3196 from Undev/feature/broken-projects-search-23049
...
Broken projects search on dashboard
2013-03-12 04:31:57 -07:00
102695530b
fix project move email
2013-03-12 12:40:49 +02:00
59b36f2032
Use gitlab-shell to move repos. Requires gitlab-shell v1.1.0
2013-03-12 12:37:53 +02:00
23f8f13ea4
Search fields were have same id's. Fixed
2013-03-12 13:41:23 +04:00
072883fd08
Search projects on dashboard was not worked. Fixed
2013-03-12 13:26:45 +04:00
b1e425511f
restyle and cleanup emails
2013-03-12 10:46:04 +02:00
197f9abedf
Covert to coffee.
2013-03-11 21:41:24 +09:00
b8f070f0d1
Rename to coffee.
2013-03-11 21:32:44 +09:00
1479f17227
Add Spinach coverage for Gollum Wiki system and correct the Delete link.
...
The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.
The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.
The link has been corrected and all steps are now passing.
2013-03-10 14:59:20 -07:00
473efc82b6
Group and team rss is valid now
2013-03-10 12:16:57 +02:00
8812d9dee2
Move groups and teams to tabs on dashboard. Remember tab with cookie
2013-03-10 11:57:14 +02:00
96c627edd8
Merge pull request #3169 from hiroponz/refactor-network-graph
...
Refactor network graph
2013-03-10 01:00:14 -08:00
ea9b3687db
Replace current Wiki system with Gollum Wikis.
...
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.
The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:
* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.
The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
2013-03-09 16:39:51 -08:00
8e8372d5ce
better logo images for header
2013-03-10 00:12:25 +02:00
9c709be335
fix event relative date being cached
2013-03-08 13:14:47 +02:00
3374027e3a
Merge branch 'master' into fixes/api, code clean up and tests fixed
...
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
2013-03-07 14:51:56 +01:00
c0d312bebe
Refactor: Removing a if statement, because the nil value is already removed in the view template.
2013-03-07 21:10:40 +09:00
b7e5f4556b
Refactor: Removing the duplicated code.
2013-03-07 21:10:27 +09:00
79cd1ca304
Refactor: change the map hash from a local variable to private variable.
2013-03-07 19:52:46 +09:00
ccc712b198
Refacor: removing the times array, because that is same with @commits array.
2013-03-07 19:16:51 +09:00
a32f85ac76
Merge pull request #3139 from rapofran/auto_focus_ldap_login
...
Autofocus to username input (LDAP login).
2013-03-07 01:55:19 -08:00
ca9098d898
remove last commit widget, added repo size and owner info on project home page
2013-03-07 11:14:19 +02:00
8c5003cf75
Refactor: clean up models.
...
* Network::Commit
** Removing unnecessary accessors.
** Removing add_refs methods.
* Network::Graph
** Removing unnecessary accessors.
** The 3 times loop of commits don't need.
2013-03-07 17:56:01 +09:00
e90277f9b5
show project description on public area
2013-03-07 10:08:43 +02:00
e03a018d28
Refactor: rename module and class names.
...
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
2013-03-07 15:42:30 +09:00
784aa266bd
Refactor: grouping parent and their space by including array.
2013-03-07 15:19:42 +09:00
2f7f46b256
Refactor: replace "render :json = graph.to_json" to view template(show.json.erb).
...
Because model shouldn't know about view logic.
2013-03-07 15:19:32 +09:00
9dc46eee8e
Return project description back
2013-03-06 22:56:48 +02:00
7b38a0de98
show highlighted code correctly inside issue body
2013-03-06 21:48:15 +02:00
872cf404eb
fix js syntax error
2013-03-06 21:39:10 +02:00
19e9c736e7
add system hooks api docs to help content
2013-03-06 21:12:47 +02:00
4c1538a946
Use redis as cache storage. cache events
2013-03-06 17:30:48 +02:00
40f1868194
Fix loading animation while browsing tree
2013-03-06 17:12:28 +02:00
d03af842c5
fix public projects identations
2013-03-06 09:12:14 +02:00
61cfa2a7a6
Merge branch 'master' into fixes/api
...
Conflicts:
lib/api/projects.rb
2013-03-05 22:29:49 +01:00
6beae84ea3
reduce letter-spacing for top nav
2013-03-05 17:28:13 +02:00
a99ad3d355
tree_heleper: concat html only if present. Avoid nil exception
2013-03-05 17:15:20 +02:00
9ba21dd0c4
better solution for #3027
2013-03-05 17:07:12 +02:00
da6b53a80e
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1
...
Conflicts:
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
2013-03-05 16:48:18 +02:00
d5d9f1c515
Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc
...
fix: grouping commits by date desc doesn't sort the groups too
2013-03-05 06:40:13 -08:00
c2ba868c9b
Merge pull request #2954 from cabeca/fix-image-url-emoji
...
Fix image url for emoji.
2013-03-05 05:52:01 -08:00
f22488f726
Merge pull request #3143 from Undev/state-machine-3
...
State machine 3
2013-03-05 05:38:16 -08:00
f9200e118c
remove custom font
2013-03-05 13:16:56 +02:00
9bb35e7e59
Prevent app crash if team owner removed
2013-03-05 09:27:06 +02:00
3a09f02e11
Merge pull request #3109 from hiroponz/improve-network-graph
...
Improve network graph
2013-03-04 23:02:27 -08:00
a40541c42d
add autofocus to username input
2013-03-04 17:54:26 -03:00
bf06b3196d
Make clone widget read-only
2013-03-04 22:18:53 +02:00
730e79e787
better event-notes typography
2013-03-04 22:00:51 +02:00
d54845a16a
use md-typography for note content
2013-03-04 21:34:26 +02:00
dc7507cfe7
= preserve do was ignored for empty project page so was replaced with filter
2013-03-04 21:12:36 +02:00
533693ab41
Fix dark color bg for wiki
2013-03-04 21:11:03 +02:00
24cc0faf2c
add link ti public area
2013-03-04 20:11:23 +02:00
c2082f4d78
Fix edit team page
2013-03-04 19:47:20 +02:00
0d9a6fe7b1
User's blocked field refactored to use state machine
2013-03-04 18:52:30 +04:00
5b4032d175
Merge pull request #3118 from 2called-chaos/dont_send_mails_twice
...
Do not send issue status mail twice if author = assignee
2013-03-02 10:48:22 -08:00
907c334fe0
fix decorate call for milestone users
2013-03-02 13:23:30 +02:00
ef646928e4
better presenting for group description
2013-03-01 16:26:26 +02:00
c280c3ce6d
Do not send issue status mail twice if author = assignee
2013-03-01 15:09:14 +01:00
5c3cb47c16
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
...
Conflicts:
db/schema.rb
2013-03-01 16:05:51 +02:00
dbcf4144ee
use simple decorate on single commits
2013-03-01 15:35:22 +02:00
6aead7991f
fix decorate calls on collections after draper update
2013-03-01 15:24:59 +02:00
22d6ce9873
Merge pull request #3082 from devote/patch-1
...
Distorted lines in `diff`
2013-02-28 23:46:07 -08:00
1c517153a8
fix admin users tests
2013-02-28 19:56:36 +02:00
115454f3ed
created-by-me filter for issues inside project. Fixed global project.issues order
2013-02-28 17:46:28 +02:00
e1f77b9be0
Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
...
Conflicts:
Gemfile.lock
2013-02-28 17:02:20 +02:00
2f1f05d431
Fixed notes from randx
2013-02-28 18:55:35 +04:00
7ed0878654
added text-templates for mail notification
2013-02-28 16:39:58 +02:00
d3f042a6f2
Css classes improved
2013-02-28 18:35:27 +04:00
9c747fbb95
Missing descriptions added
2013-02-28 17:37:02 +04:00
9959669f1c
Desctiptions removed from dashboard
2013-02-28 17:15:22 +04:00
3d4e32457b
Table description indentation fixed
2013-02-28 17:15:22 +04:00
5f657203a1
Description added to temas
2013-02-28 17:15:22 +04:00
9f45e01e84
Description to groups added
2013-02-28 17:14:21 +04:00
cff845784e
Show Issues tracker select only if one or more remote issue trackers available
2013-02-28 16:11:14 +04:00
b6d0f2852d
Issues link from project page follows on remote bug tracker if it selected now
2013-02-28 16:11:14 +04:00
ab98db73a3
Issues tracker settings enableds/disableds without page reloading now
2013-02-28 16:11:14 +04:00
Dmitriy Zaporozhets
Dan Knox
Michel Salib
Sato Hiroyuki
Kevin Lyda
Andrew8xx8
Sebastian Ziebell
J. Francisco Raposerias
Sven Pachnit
Thomas Berger