Commit Graph

63 Commits

Author SHA1 Message Date
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Alexander Machehin b0da168621 [#29] remove encode strings 2014-01-10 08:59:33 +06:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Vokhmin Alexey V 13d2a701d0 #327: switched to abf.io 2013-11-25 20:35:36 +04:00
Alexander Machehin c2a609236b fix moment/ru.js isn't precompiled 2013-09-02 17:33:23 +06:00
Vokhmin Alexey V 8795a46774 Merge branch 'master' into 219-use-caching 2013-07-18 20:26:31 +04:00
Vokhmin Alexey V 4bb163a71d Added staging environment 2013-07-18 17:20:23 +04:00
Vokhmin Alexey V d0fae38e17 #219: some refactoring 2013-07-16 16:02:13 +04:00
Vokhmin Alexey V 7586f5ee1b #219: use redis_store as Rails cache_store 2013-07-16 16:00:32 +04:00
Alexander Machehin 37003f8f0c add source url 2013-06-17 23:29:13 +06:00
Alexander Machehin 0e273d8efc quiet assets in dev 2013-06-17 22:21:25 +06:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin 0d9c095cbd [refs #847] remove old core code 2013-01-24 12:33:16 +06:00
Vokhmin Alexey V 9a12de95bb #778: remove SymlinkStub module 2012-12-17 16:43:57 +04:00
Vokhmin Alexey V 8757724acc #778: update rails gem, update destroy Platform and Reposytory 2012-12-17 16:28:17 +04:00
Vladimir Sharshov 4f21f0cb88 Add new school adress; change email send method to sendmail; add google check page 2012-10-12 00:16:51 +04:00
Pavel Chipiga 8e91159b5b Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263 2012-07-31 20:32:49 +03:00
konstantin.grabar 9920802006 [refs #438] Fix symlink stubbing 2012-05-18 13:03:42 +04:00
Alexander Machehin 398cec4806 [refs #443] add js to precompile 2012-05-12 21:23:33 +06:00
Alexander Machehin 5f5eb00c4f [refs #443] abf tour 2012-05-12 00:15:20 +06:00
George Vinogradov 71c8efabf9 [issue #347] Added backbone. Changed collaborators page. 2012-04-09 21:11:39 +04:00
Alexander Machehin d18e55f180 [refs #340] titles - part2 2012-03-30 22:37:54 +06:00
Vladimir Sharshov 9a45353ccb Merge pull request #342 from warpc/128-account-activation
[Refs #128] account activation
2012-03-29 09:09:03 -07:00
konstantin.grabar f33ef75666 [refs #128] Add email confirmation on email change. Remove email confirmation after registration. 2012-03-27 17:45:09 +04:00
George Vinogradov dd8e3b0497 [issue #195] Added JQuery datatables to /projects 2012-03-25 01:36:56 +04:00
Alexander Machehin cadd1995d1 [refs #230] fix forgot password SignUp style 2012-03-01 01:50:08 +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
Alexander Machehin 322e68212f [refs #230] add registration to precompile list 2012-02-29 22:59:09 +06:00
Alexander Machehin 632e908442 [refs #228] add logins to precompile array 2012-02-29 22:59:09 +06:00
George Vinogradov fe46e53ad8 [issue #195] Many changes.
*  Base presenter moved to lib
  *  Added diff display
  *  Changes in some views

TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
Pavel Chipiga 9860624a0d Temporary disable SSL force 2012-02-28 19:00:43 +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
Pavel Chipiga 07b081cc0d Fresh up assets. Force production SSL. Refs #223 2012-02-28 17:40:22 +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
Pavel Chipiga 7508bb1339 Fix bugs to force new design work. Minor refactor and improvements. Refs #193 2012-02-27 20:58:37 +02:00
George Vinogradov 85f3d956f5 [issue #195] Merge branch '203-feed_message' into 195-new_design_for_projects
Conflicts:
	app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
George Vinogradov 2b170fcbf1 Fixed default host in mailer 2012-02-15 22:02:47 +04:00
Pavel Chipiga 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
Pavel Chipiga 704c544cbc Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174 2012-02-10 18:33:16 +02:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Vladimir Sharshov a5c2bcdd85 Fix email host address 2012-01-20 00:06:09 +04:00
konstantin.grabar 6a364b73a6 [refs #12] Fix platform admin relations. Locales correction. Add validationa and rsync stubs. 2011-12-12 18:10:39 +04:00
Pavel Chipiga 0ca7c5d451 Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2 2011-12-08 20:51:25 +02:00
Pavel Chipiga 04a17cb691 Redo deploy to work multistage on same host. Add ui and pingwinsoft stages, Refactor deploy. Refactor XML RPC stub. Apply nginx config generation script. Fix scripts. Cleanup code and config. Refs #2261 2011-12-06 16:45:20 +02:00
Pavel Chipiga d7c9452efa Update gems. Redo exception catch for BuildServer.get_status. Write specs. Experiments with large file uploads. Refs #2261 2011-12-02 03:30:25 +02:00
Pavel Chipiga e45ba6692a Rename delete_build_list to cancel_build_list. Rescue XML get_status exception. Refs #2261 2011-12-01 00:55:47 +02:00
Pavel Chipiga c4a31e3d29 Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261 2011-11-29 23:42:58 +02:00
Pavel Chipiga 796ff75857 Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249 2011-11-24 23:48:58 +02:00