Alexander Machehin
|
cc05fa695a
|
[refs #90] fixed pull abilities part 2
|
2012-09-26 23:09:29 +06:00 |
Alexander Machehin
|
496cb7d354
|
Merge pull request #660 from warpc/90-separate-issues-and-pull-requests
#90: separate issues and pull requests
|
2012-09-26 09:53:19 -07:00 |
Vokhmin Alexey V
|
5f0e683711
|
#90: moved code
|
2012-09-26 19:41:00 +04:00 |
Vokhmin Alexey V
|
6f889b15a9
|
#90: added access to show pull requests
|
2012-09-26 19:39:47 +04:00 |
Vokhmin Alexey V
|
0ebc545b01
|
#90: small refactoring of views
|
2012-09-26 19:16:34 +04:00 |
Vokhmin Alexey V
|
37c9a906c4
|
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
|
2012-09-26 18:45:26 +04:00 |
Vokhmin Alexey V
|
6070c276f6
|
Merge branch 'master' into 90-pull
|
2012-09-26 18:33:04 +04:00 |
Vokhmin Alexey V
|
efe8b1ffdb
|
#90: small refactoring
|
2012-09-26 18:20:46 +04:00 |
Vokhmin Alexey V
|
07b27b934f
|
#90: updated #index page for pull-requests
|
2012-09-26 15:46:23 +04:00 |
Alexander Machehin
|
dbf1a5f8ca
|
Merge remote-tracking branch 'origin/90-pull' into 90-pull
|
2012-09-26 15:27:54 +06:00 |
Alexander Machehin
|
eba6a14e0b
|
[refs #90] very small refactoring
|
2012-09-26 15:27:24 +06:00 |
Alexander Machehin
|
3491492c8d
|
[refs #90] fixed pull authorization
|
2012-09-26 15:24:46 +06:00 |
Vokhmin Alexey V
|
397d411252
|
#90: added #index action, updated routes
|
2012-09-26 00:50:40 +04:00 |
Alexander Machehin
|
47a73a4ddb
|
[refs #90] fixed existing project name
|
2012-09-25 21:47:08 +06:00 |
Vokhmin Alexey V
|
d54a50e2e0
|
#90: added line-height style
|
2012-09-25 19:31:06 +04:00 |
Vokhmin Alexey V
|
0299c069c6
|
#90: style changes for header, increase performanse for #autocomplete_base_project action
|
2012-09-25 19:18:22 +04:00 |
Alexander Machehin
|
dfbf8a8d58
|
Merge branch 'master' into 90-pull
Fucking conflicts:
app/controllers/projects/issues_controller.rb
app/models/ability.rb
app/views/projects/issues/show.html.haml
config/routes.rb
db/schema.rb
lib/tasks/import.rake
spec/models/comment_for_commit_spec.rb
vendor/assets/javascripts/bootstrap-tab.js
vendor/assets/stylesheets/bootstrap.css
|
2012-09-25 17:55:30 +06:00 |
Vladimir Sharshov
|
06099a15b6
|
Merge pull request #657 from warpc/648-add-filters-to-projects-page
[refs #648]: Filters by owners in projects page
|
2012-09-25 03:41:11 -07:00 |
Vladimir Sharshov
|
c426f81abe
|
Merge pull request #656 from warpc/616-issues_and_comments
[refs #616] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
|
2012-09-25 03:37:44 -07:00 |
Vokhmin Alexey V
|
40999debbf
|
#648: updated projects_helper
|
2012-09-25 13:50:28 +04:00 |
Alexander Machehin
|
06e15cf3fa
|
[refs #616] remove unneeded code
|
2012-09-25 15:47:12 +06:00 |
Alexander Machehin
|
a29a2f8fe9
|
[refs #616] change ability for preview
|
2012-09-25 15:46:19 +06:00 |
Vokhmin Alexey V
|
84378afc3d
|
#648: small code optimization
|
2012-09-25 13:36:50 +04:00 |
Vokhmin Alexey V
|
d15094f128
|
#648: moved 'Create' button
|
2012-09-25 00:03:33 +04:00 |
Vokhmin Alexey V
|
91f215351c
|
#648: small refactoring according to comment
|
2012-09-24 23:27:00 +04:00 |
Vokhmin Alexey V
|
0bb9f38b66
|
#648: collor for labels has been changed
|
2012-09-24 22:44:06 +04:00 |
Vokhmin Alexey V
|
1e468b5073
|
#648: updated styles, added icons for filters
|
2012-09-24 22:36:02 +04:00 |
Vokhmin Alexey V
|
768f4b1dfb
|
#648: renamed parametr
|
2012-09-24 22:07:53 +04:00 |
Vokhmin Alexey V
|
9be978eb68
|
#648: updated models, JS, controller according to comments and discussions
|
2012-09-24 22:04:53 +04:00 |
Alexander Machehin
|
51c9375613
|
[refs #616] change preview translation
|
2012-09-24 23:40:41 +06:00 |
Alexander Machehin
|
2c6d4bae9e
|
[refs #616] add error messages to ajax
|
2012-09-24 23:34:14 +06:00 |
Alexander Machehin
|
f4bbeaaa46
|
[refs #616] fixed 500 when failed to create comment
|
2012-09-24 23:01:04 +06:00 |
Vladimir Sharshov
|
29ab62748d
|
Merge pull request #659 from warpc/652-mailer_urls
[refs #652] https link in email if service use https
|
2012-09-24 08:50:50 -07:00 |
Alexander Machehin
|
fc672451c6
|
[refs #616] small changes in styles
|
2012-09-24 21:19:50 +06:00 |
Alexander Machehin
|
eaf71f9cc0
|
[refs #652] set url options for mailer
|
2012-09-24 19:02:21 +06:00 |
Vokhmin Alexey V
|
cee1ee6cb6
|
#648: small refactoring
|
2012-09-23 20:22:49 +04:00 |
Vokhmin Alexey V
|
ceeae09332
|
#648: small revert, updated filter name
|
2012-09-21 22:08:19 +04:00 |
Vokhmin Alexey V
|
c14f2851e3
|
#648: revert changes
|
2012-09-21 22:04:58 +04:00 |
Vokhmin Alexey V
|
2406423483
|
#648: added filters to Projects page
|
2012-09-21 21:57:22 +04:00 |
Alexander Machehin
|
b5bee35275
|
Revert "[refs #616] add table styles"
This reverts commit 1818f25de28de0e9efa8d1ae9e22649445d3953d.
|
2012-09-21 19:23:41 +06:00 |
Alexander Machehin
|
1f63fec004
|
Revert "[refs #616] dont filter html"
This reverts commit 68eac7a9de083d6a29503ac2900b3dd404e22c0c.
|
2012-09-21 19:22:27 +06:00 |
Alexander Machehin
|
855f1f356d
|
[refs #616] remove some inline styles
|
2012-09-21 18:10:47 +06:00 |
Alexander Machehin
|
651be997b3
|
[refs #616] add table styles
|
2012-09-21 17:46:44 +06:00 |
Alexander Machehin
|
94c3863e27
|
[refs #616] fixed markdown image example
|
2012-09-21 16:43:54 +06:00 |
Alexander Machehin
|
d25bdb2329
|
[refs #616] fixed preview bug
|
2012-09-21 16:32:53 +06:00 |
Alexander Machehin
|
b65ca14131
|
[refs #616] small js refactoring
|
2012-09-21 16:31:55 +06:00 |
Alexander Machehin
|
96f8a9a43f
|
[refs #616] dont filter html
|
2012-09-20 23:48:20 +06:00 |
Alexander Machehin
|
378fe5847e
|
[refs #616] ugly replaces
|
2012-09-20 23:10:50 +06:00 |
Alexander Machehin
|
1dcce7bf92
|
[refs #616] small fixes
|
2012-09-20 20:58:14 +06:00 |
Vladimir Sharshov
|
3c70adba9a
|
Merge pull request #655 from warpc/385-fix-link-for-tar-archive
[refs #385] Fix archive tar.gz link for project source code
|
2012-09-20 07:53:42 -07:00 |