2bdcdb6fd3
[refs #193 ] Fix compare buttons and links design
2012-02-20 14:27:58 +04:00
f22d9809ff
[refs #193 ] Remove debug puts from wiki controller
2012-02-20 14:02:04 +04:00
2b675c6f84
[refs #193 ] Fix routes regex for wiki compare
2012-02-20 13:56:09 +04:00
76beb6a277
[refs #194 ] add creator to issue
2012-02-19 23:28:43 +06:00
43a268371f
[issue #203 ] Some changes in ApplicationPresenter
2012-02-19 03:21:34 +04:00
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
f6f7d1fb87
Merge pull request #201 from warpc/196-dj_old
...
[Refs #196 ] Refactor bluepill deploy recipies. Restart DJ through bluepill.
2012-02-17 07:53:40 -08:00
3347a74653
Refactor bluepill deploy recipies. Restart DJ through bluepill. Refs #196
2012-02-17 16:32:03 +02:00
d9025b093f
[refs #193 ] Compare routes repair and compare design
2012-02-17 18:12:05 +04:00
4bdc763ef0
Merge branch '3.2-master' into 195-new_design_for_projects
2012-02-17 18:02:43 +04:00
7863869a30
[refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages
2012-02-17 16:47:33 +04:00
ece7051e1b
Merge pull request #199 from warpc/134-lost_env
...
[refs #134 ] Refactoring git-hooks scripts
2012-02-17 03:50:15 -08:00
d8a3983b07
[refs #193 ] Add new design to wiki
2012-02-17 15:13:54 +04:00
c55158a892
[refs #134 ] some hook task improvements
2012-02-17 15:22:55 +06:00
608faf3564
[issue #96 ] Some fixes in layout and scripts.
2012-02-17 03:07:22 +04:00
3d7b6ea9d6
[Refs#196] Update text message for empty text[en]
2012-02-16 23:10:58 +04:00
6a08704866
[Refs#196] Update text message for empty text[ru]
2012-02-16 23:08:54 +04:00
689d15f9fd
Change blank repo message. Refs #196
2012-02-16 20:23:49 +02:00
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
99e18cede3
Merge pull request #198 from warpc/134-new_project
...
[refs #134 ] fixed bug with new project
2012-02-16 07:33:03 -08:00
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
98059d6570
Merge pull request #191 from warpc/134-git-hook
...
[refs #134 ] Fixed git hook (hadr-coded desctionation and wrong rails env)
2012-02-16 05:52:09 -08:00
c140c1b466
Merge branch '194-project_submenu' into 193-new_design_for_wiki
2012-02-16 12:23:41 +04:00
55379ed9c8
[refs #194 ] first steps
2012-02-16 00:53:58 +06:00
2b170fcbf1
Fixed default host in mailer
2012-02-15 22:02:47 +04:00
fab80d97eb
[refs #194 ] project submenu partial
2012-02-15 22:32:26 +06:00
5dac20bac5
Some fixes:
...
* Changed default visibility to personal platforms to 'open'
* Changed 'Erase' button to simple link in comments partial
* Probably added domain name to links in mail notifications
* Fixed protocol in repo links form 'http' to 'https'
2012-02-15 20:30:56 +04:00
0763936e38
[refs #193 ] Wiki navigation design
2012-02-15 19:01:49 +04:00
ba44c32507
Merge pull request #187 from warpc/96-upgrade_rails
...
[Refs #96 ] New Rails 3.2 and more new staff
2012-02-15 06:04:03 -08:00
eaa6a46a43
[refs #96 ] fixed commit subscribing
2012-02-15 19:07:56 +06:00
a8f507737f
[refs #134 ] rails root
2012-02-15 19:06:25 +06:00
fbaa9949df
[refs #134 ] clean
2012-02-15 17:23:49 +06:00
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
00e2043f51
Change nginx log rotate period to 1 day
2012-02-15 14:37:27 +04:00
90c1250769
Merge pull request #186 from warpc/64-project_wiki
...
[Refs #64 ] - Fix diff for russians pages, add ability to revert last commit
2012-02-15 01:44:41 -08:00
7530cf5d91
Merge pull request #189 from warpc/143-remove_migration
...
Remove broken migration
2012-02-14 16:03:37 -08:00
5b7d1a79d0
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-15 02:13:52 +04:00
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
3690d69663
remove broken migration
2012-02-15 00:50:55 +06:00
d47ad1ed88
Merge pull request #188 from warpc/174-invite_system
...
[Refs #174 ] Apply approved and rejected filters for register requests
2012-02-14 10:35:43 -08:00
2c493cdbb7
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-14 20:15:52 +02:00
b7b69a86d8
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
2012-02-14 18:05:41 +02:00
e9c5273136
[issue #64 ] Added possibility to diff and revert last commit
2012-02-14 18:54:44 +04:00
85723f7da6
[issue #64 ] Fixed encodings bugs
2012-02-14 18:54:18 +04:00
02478f5451
Merge branch 'master' into 96-upgrade_rails
2012-02-14 14:05:27 +02:00
a53f627f5f
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-14 17:54:46 +06:00
6fff641531
fix collaborator tests
2012-02-14 17:52:33 +06:00
7bca61c58d
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-14 13:50:01 +02:00
7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
ea176264d9
Merge pull request #185 from warpc/64-project_wiki
...
64 project wiki
2012-02-13 15:45:23 -08:00
konstantin.grabar
Alexander Machehin
George Vinogradov
Vladimir Sharshov
Pavel Chipiga
Pasha