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
86e23a584a
spianch -> profile -> specify within block
2013-03-15 16:05:07 +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
7799b5bda6
Merge branch 'feature/writeboard'
2013-03-15 14:22:49 +02:00
35ad4fe7db
Use wiki tab for wiki, wall, snippets
2013-03-15 14:20:03 +02:00
39bbdc468f
on wall subpage active tab should be wiki too
2013-03-15 09:39:50 +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
753ecbdcec
Change spinach tab tests to fit new tabs navigation
2013-03-14 21:51:44 +02:00
38ecec4472
Remove tree single-tab panel
2013-03-14 19:50:57 +02:00
3df5253cc3
Adds DB-sensitive tablename escape for backup task.
...
Uses ActiveRecord::Base.connection.quote_table_name.
Fixes issue 2437.
2013-03-14 13:30:25 -04:00
5c4e74acc3
Add settings tab to project. Move all project administration there
2013-03-14 19:28:29 +02:00
d2b882fae5
Fix spinach tests
2013-03-14 17:13:00 +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
0e57085795
Merge branch 'feature/select2-user-ajax'
2013-03-14 10:20:25 +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
67e2cf8864
select2-rails gem added
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
963c212b68
UserTeam spinach fixed
2013-03-13 22:30:33 +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
366bc32013
stub git shell mv_repository
2013-03-12 18:59:25 +02:00
aecb37623e
ask users to use ruby 1.9.3 for now
2013-03-12 14:16:55 +02:00
70fc1c5021
cleanup ProjectMover
2013-03-12 14:13:25 +02:00
f1c24f40f9
fix spinach after #3196
2013-03-12 14:10:20 +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
Dmitriy Zaporozhets
Chris Lawlor
Dan Knox