Commit Graph

2197 Commits

Author SHA1 Message Date
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
Alexander Machehin 598c072a80 [refs #90] add already state 2012-04-23 23:34:11 +06:00
Alexander Machehin a37bf7b50a Revert "[refs #90] more security"
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-23 23:34:11 +06:00
Alexander Machehin c75ebc4896 [refs #90] removed task 2012-04-23 23:34:11 +06:00
Alexander Machehin 41fb4f2700 [refs #90] more security 2012-04-23 23:34:11 +06:00
Alexander Machehin fda1a847f5 [refs #90] some tests and questions 2012-04-23 23:34:10 +06:00
Alexander Machehin 58776a6e9e [refs #90] fixing pull methods 2012-04-23 23:34:10 +06:00
Alexander Machehin 71fdaa4e4d [refs #90] initial 2012-04-23 23:34:10 +06:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
Vladimir Sharshov 64ba44ccab Merge pull request #418 from warpc/417-fix_devise_action_mailer_host_set
[refs #417] Set host for devise action mailer in application.yml
2012-04-23 07:44:14 -07:00
konstantin.grabar e984402068 [refs #417] Rename pingwinsoft configs to school 2012-04-23 18:37:12 +04:00
konstantin.grabar 95c795e3ab [refs #417] Remove http and slash symbols from action mailer hosts 2012-04-23 17:37:15 +04:00
konstantin.grabar 0ca6c76ce2 [refs #417] Make changes for devise action mailer host set 2012-04-23 16:53:30 +04:00
konstantin.grabar 89bfa8d0a9 [refs #415] Fix radio button click handler 2012-04-23 13:50:42 +04:00
George Vinogradov af18f4404f [issue #347] Fixed artefacts in Add Collaborators form. 2012-04-22 13:17:33 +04:00
Vladimir Sharshov 5431eec07d Merge branch 'master' of github.com:warpc/rosa-build 2012-04-20 22:56:06 +04:00
Vladimir Sharshov 1684f4a1fc Fix bug: could not update description in personal platform 2012-04-20 22:55:40 +04:00
Alexander Machehin 25bd2a6e77 [refs #90] issue status -> state 2012-04-20 23:19:23 +06:00
Alexander Machehin 37b98e3015 [refs #396] fixing rollback 2012-04-20 22:51:12 +06:00
Alexander Machehin 5dc8a4ead1 [refs #90] add already state 2012-04-20 22:23:28 +06:00
Alexander Machehin 61a27bbb7d Revert "[refs #90] more security"
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-20 21:17:43 +06:00
Vladimir Sharshov 24922cc43c Merge pull request #388 from warpc/347-javascript_refactoring
[issue #347] Union users and groups into one table in collaborators page. Use backbone(JS framework) for it. Improve UI for collaborators page (AJAX).
2012-04-20 08:15:12 -07:00
Alexander Machehin 1b93244f7b [refs #90] removed task 2012-04-20 17:48:58 +06:00
Alexander Machehin aa83c14165 [refs #90] more security 2012-04-20 17:38:19 +06:00
George Vinogradov 678f7cc0ed [issue #347] Changed search field. 2012-04-20 00:35:31 +04:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
Alexander Machehin b1365fc567 [refs #90] some tests and questions 2012-04-20 01:09:00 +06:00
Pavel Chipiga 5efabc9d4e Fix atom feed urls. Refs #396 2012-04-19 20:35:35 +03:00
Alexander Machehin c66931d347 [refs #90] fixing pull methods 2012-04-19 21:57:42 +06:00
Alexander Machehin d48a3413cc [refs #90] initial 2012-04-19 21:57:41 +06:00
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
2012-04-19 19:32:11 +04:00
George Vinogradov f9d2baef5a [issue #347] Added filter. 2012-04-19 19:27:16 +04:00
Vladimir Sharshov 02095e62c1 Merge pull request #413 from warpc/396-rss_atom_feed
[Refs #396] Hide atom feed link from anonymus users
2012-04-19 07:47:29 -07:00
konstantin.grabar 714fe34883 [refs #396] Hide atom feed link from anonymus users 2012-04-19 18:37:20 +04: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 be3daca1e6 [refs #396] Fix atom feed link tag 2012-04-19 18:06:54 +04:00
konstantin.grabar 799ba33766 [refs #396] Add token to atom feed link tag 2012-04-19 17:57:22 +04:00
konstantin.grabar def76d134d [refs #396] Fix some atom locales 2012-04-19 15:05:17 +04:00
konstantin.grabar 2fc4e2db61 [refs #396] Fix token migration. Fix atom link tag title 2012-04-19 14:50:43 +04:00
Vladimir Sharshov 0324ead59b Merge pull request #412 from warpc/408-frozen_platform
[issue #408] Fixed bug with selectbox
2012-04-18 10:39:59 -07:00
George Vinogradov 618d1ecb49 [issue #408] Fixed bug with selectbox 2012-04-18 21:31:11 +04:00
konstantin.grabar cd153375dd [refs #396] Devise token auth update for atom feed. Some atom feed fixes. 2012-04-18 19:15:04 +04:00
konstantin.grabar 3d1cb4bfee Merge master into 396-rss_atom_feed 2012-04-18 16:53:53 +04:00
konstantin.grabar 8ef020427d [refs #396] Add token auth for atom feed 2012-04-18 16:46:09 +04:00
George Vinogradov 9566855110 [issue #347] Added missed lib 2012-04-18 16:17:11 +04:00
Vladimir Sharshov 3e4eba7f9d Merge pull request #411 from warpc/408-frozen_platform
[issue #408] Allow publish build list in released platform only for platform members. Add rejected function for bs.
2012-04-18 04:17:32 -07:00
George Vinogradov 721fa1b0c0 [issue #408] Fixed translations 2012-04-18 14:59:41 +04:00
George Vinogradov 9d96b2b565 [issue #408] Removed comment. 2012-04-18 14:46:34 +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 8d723ee0be [refs #396] Fix title truncate and strip. Add feed main title. 2012-04-17 19:38:02 +04:00