Alexander Machehin
|
944c6fc0e2
|
Merge branch 'master' into 90-pull
Conflicts:
app/assets/stylesheets/design/custom.scss
app/controllers/projects/git/commits_controller.rb
app/helpers/git_helper.rb
app/models/project.rb
app/views/projects/git/commits/_commit_diff.html.haml
db/schema.rb
lib/ext/core/string.rb
|
2012-07-27 18:37:25 +06:00 |
George Vinogradov
|
f1839f0ad0
|
[issue #578] Added submit blocking to user creation
|
2012-07-26 02:12:06 +04:00 |
Alexander Machehin
|
34e97510cd
|
[refs #90] modify pull headers
|
2012-07-16 22:27:41 +06:00 |
Vladimir Sharshov
|
5b5aec490a
|
Merge pull request #409 from warpc/396-rss_atom_feed
[refs #396] Add atom feed for activity feed
|
2012-04-19 07:08:59 -07:00 |
konstantin.grabar
|
2fc4e2db61
|
[refs #396] Fix token migration. Fix atom link tag title
|
2012-04-19 14:50:43 +04:00 |
George Vinogradov
|
721fa1b0c0
|
[issue #408] Fixed translations
|
2012-04-18 14:59:41 +04:00 |
George Vinogradov
|
6c64125787
|
[issue #408] Changed behavior of build list for released platform
|
2012-04-17 22:18:39 +04:00 |
konstantin.grabar
|
2c9d4583e8
|
[refs #404] Remove downloads from menu
|
2012-04-17 13:17:52 +04:00 |
Pavel Chipiga
|
d6e6959f46
|
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349, #263
|
2012-03-31 02:37:54 +03:00 |
Vladimir Sharshov
|
3cedef5f07
|
Merge branch 'master' into 344-fix_products_monitoring
Conflicts:
db/schema.rb
|
2012-03-30 20:30:06 +04:00 |
konstantin.grabar
|
d3c2bac226
|
[refs #344] Add product buils list filter and search
|
2012-03-30 15:26:28 +04:00 |
Vladimir Sharshov
|
0c2d0f4612
|
[Refs #263] Delete Categories
|
2012-03-29 23:01:25 +04:00 |
Vladimir Sharshov
|
5db485a4c0
|
[Refs #263] Remove Aut BuildList. Part 2
|
2012-03-29 22:43:46 +04:00 |
George Vinogradov
|
9f23cf7727
|
[issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
app/views/projects/_sidebar.html.haml
|
2012-03-22 18:15:57 +04:00 |
George Vinogradov
|
524fa2302f
|
[issue #279] Changed buttons alignment.
|
2012-03-22 17:53:35 +04:00 |
Pavel Chipiga
|
89f31e9782
|
Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190
|
2012-03-21 21:55:14 +02:00 |
George Vinogradov
|
304141b1ba
|
[issue #279] Added views and removed datatables plugin
* Datatables plugin moved to lib.
* Added views to platform and repositories.
|
2012-03-13 19:12:06 +04:00 |
Vladimir Sharshov
|
d86653e172
|
Split code and tracker options in notification center
|
2012-03-11 21:21:31 +04:00 |
Pavel Chipiga
|
7308c4a0d2
|
Merge branch '3.2-master' into 255-search
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
|
2012-03-06 20:59:29 +02:00 |
Pavel Chipiga
|
d6f9b2c3e9
|
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
|
2012-03-06 17:53:04 +02:00 |
konstantin.grabar
|
637edabb4c
|
[refs #257] Fix some locales and headers
|
2012-03-05 22:00:44 +04:00 |
konstantin.grabar
|
73296059eb
|
[refs #257] Merge 3.2-master into 257-new_design_for_profiles
|
2012-03-05 13:42:39 +04:00 |
konstantin.grabar
|
ecff8d2d41
|
[refs #257] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile
|
2012-03-03 13:23:30 +04:00 |
Pavel Chipiga
|
159fbe65dc
|
Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263
|
2012-03-03 02:28:27 +02:00 |
Pavel Chipiga
|
56a12dc9ea
|
Merge branch 'master' into 3.2-master
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
|
2012-03-03 01:38:43 +02:00 |
konstantin.grabar
|
e147c2d6c5
|
[refs #257] Add new design for user public page. New field. Move locales to another file
|
2012-03-02 16:14:59 +04:00 |
konstantin.grabar
|
1700588b97
|
[refs #232] Merge 3.2-master into 232-new_groups_design
|
2012-03-02 13:44:54 +04:00 |
konstantin.grabar
|
d376b55a57
|
[refs #232] Move groups locales to another files. Remove unsused commented code. On small sidebar fix
|
2012-03-02 12:47:16 +04:00 |
Alexander Machehin
|
4931dc773b
|
[refs #230] edit password page
|
2012-03-02 01:16:49 +06:00 |
konstantin.grabar
|
157f9a1a68
|
[refs #232] Add sidebar and group edit page
|
2012-03-01 16:28:38 +04:00 |
Vladimir Sharshov
|
d3231b5faa
|
Merge pull request #243 from warpc/230-registration_page
[Refs #230] Fix I18n and remove wrong js for registration page
|
2012-02-29 11:23:35 -08:00 |
Alexander Machehin
|
ceae6730d8
|
[refs #230] fix I18n
|
2012-03-01 01:14:46 +06:00 |
Vladimir Sharshov
|
d9ca8ff8b6
|
Merge pull request #231 from warpc/195-new_design_for_projects
[Refs #195] new design for projects
|
2012-02-29 09:54:42 -08:00 |
konstantin.grabar
|
bc75b318ce
|
[refs #195] Merge 3.2-master into 195-new_design_for_projects
|
2012-02-29 21:37:28 +04:00 |
konstantin.grabar
|
12d8f5e7b8
|
[refs #232] Add new design to some group pages
|
2012-02-29 21:12:06 +04:00 |
Alexander Machehin
|
ba4fae071f
|
[refs #230] error messages
|
2012-02-29 23:01:30 +06:00 |
Alexander Machehin
|
3136159777
|
[refs #230] add red borders to invalid attributes
|
2012-02-29 22:59:09 +06:00 |
konstantin.grabar
|
c5d8041296
|
[refs #195] Add global fixes to projects and collaborators logic
|
2012-02-29 18:45:04 +04:00 |
Pavel Chipiga
|
cefaa902b1
|
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
|
2012-02-29 16:04:38 +02:00 |
konstantin.grabar
|
e9ae923b60
|
[refs #195] Merge 3.2-master into 195-new_design_for_projects
|
2012-02-28 20:10:31 +04:00 |
Vladimir Sharshov
|
529d8d3708
|
Merge pull request #192 from warpc/123-activity-feed
[Refs #123] activity feed (commits notifcation not work)
|
2012-02-28 07:46:55 -08:00 |
Alexander Machehin
|
bc4a157703
|
Merge branch '3.2-master' into 194-tracker
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
|
2012-02-28 20:13:08 +06:00 |
konstantin.grabar
|
03663a8ed7
|
[refs #195] Add sections page and method to projects
|
2012-02-28 12:00:56 +04:00 |
Pavel Chipiga
|
70963d0943
|
Merge branch 'master' into 3.2-master
|
2012-02-27 22:34:21 +02:00 |
Pavel Chipiga
|
159ef26b38
|
Merge branch 'master' into 3.2-master
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
|
2012-02-27 22:32:57 +02:00 |
Vladimir Sharshov
|
ddda2b92ab
|
[Refs #221] Delete product build lists (only in web)
|
2012-02-28 00:00:33 +04:00 |
Pavel Chipiga
|
1005fbd64f
|
Add link to product container. Refs #217
|
2012-02-27 18:21:56 +02:00 |
konstantin.grabar
|
72fec3b314
|
[refs #195] Add owner choose on project create
|
2012-02-27 13:03:28 +04:00 |
Vladimir Sharshov
|
63c89edfda
|
Isolated localization for activity feed
|
2012-02-24 19:28:01 +04:00 |
Vladimir Sharshov
|
f4f542811d
|
[Refs#196] Update text message for empty text[ru]
|
2012-02-24 19:27:57 +04:00 |