George Vinogradov
|
2dd99d32f9
|
Merge branch 'downloads'
First turn of merging.
Conflicts:
.gitignore
Gemfile
Gemfile.lock
config/locales/ru.yml
config/routes.rb
db/schema.rb
|
2011-10-20 19:22:11 +04:00 |
|
George Vinogradov
|
ff36b1fdd3
|
Merge branch 'itima_web_refactoring'
Conflicts:
Gemfile
Gemfile.lock
app/models/user.rb
app/views/layouts/application.html.haml
config/locales/ru.yml
config/routes.rb
db/schema.rb
|
2011-10-19 18:09:58 +04:00 |
santaux
|
8103b14e15
|
[refs #1861] Add downloads statistics
|
2011-10-14 10:35:25 +04:00 |
|
George Vinogradov
|
229b4bb3f4
|
Created new models and provided relationships between them.
|
2011-10-13 19:55:03 +04:00 |
Pavel Chipiga
|
77e03df70b
|
Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954
|
2011-10-11 23:56:51 +03:00 |
Vladimir Sharshov
|
f3d32273d8
|
Support Airbrake account
|
2011-09-29 17:24:33 +04:00 |
Alexey Nayden
|
856b93d3d8
|
Product management. Step 2
|
2011-04-14 11:23:08 +04:00 |
Timothy N. Tsvetkov
|
1a6330956b
|
build list creation
|
2011-04-11 20:37:09 +04:00 |
|
Timothy N. Tsvetkov
|
636a8ed8f2
|
removed boilerplate from the compass config
|
2011-03-31 03:42:18 +04:00 |
|
Timothy N. Tsvetkov
|
309b037acf
|
Paul Irish BUY BUY oMG, Using AWESOME web-app-theme
|
2011-03-31 03:10:23 +04:00 |
|
Timothy N. Tsvetkov
|
76ccc1621f
|
gemfile.lock
|
2011-03-29 21:48:30 +04:00 |
|
Timothy N. Tsvetkov
|
c7fe38c6a8
|
playing with assets, jammit and compass
|
2011-03-29 20:35:42 +04:00 |
|
Timothy N. Tsvetkov
|
e6e44d292a
|
added the Grit gem for working with git
|
2011-03-10 14:09:19 +03:00 |
|
Alexey Nayden
|
eae3c46912
|
Initial commit
|
2011-03-09 16:13:36 +03:00 |