Alexander Machehin
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
George Vinogradov
f070a9d729
[issue #193 ] Merge branch '3.2-master' into 193-new_design_for_wiki
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-06 17:40:44 +04:00
George Vinogradov
2b1b5504cd
[issue #193 ] Added fullname to history table.
2012-03-06 17:20:30 +04:00
George Vinogradov
cd57da0946
[issue #193 ] Fixed searchbar in wiki.
2012-03-06 17:08:19 +04:00
konstantin.grabar
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
Alexander Machehin
9e6d06f1c9
[refs #194 ] manage issue executer
2012-03-06 00:28:55 +06:00
Vladimir Sharshov
9d8eb8a3f2
Merge pull request #269 from warpc/195-new_design_for_projects
...
[Refs #195 ] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
2012-03-05 09:07:36 -08:00
George Vinogradov
93e2caccc8
[issue #195 ] Added blame view.
2012-03-05 19:29:05 +04:00
Alexander Machehin
dab45f9afe
[refs #228 ] fix checking remember me button
2012-03-05 16:49:31 +06: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
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
Pavel Chipiga
a0f0c24f88
Fix flash messages. Add styles. Refs #263
2012-03-03 03:05:19 +02:00
Pavel Chipiga
13f0d8223d
Remove compass-bootstrap. Take back DJ fix. Refs #263
2012-03-03 02:42:10 +02: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
Vladimir Sharshov
403a8a19ce
Merge pull request #262 from warpc/194-nice_radio_change
...
[Refs #194 ] Fix triggering change event for niceRadio buttons
2012-03-02 10:27:27 -08:00
Alexander Machehin
dfa361f5c3
[refs #194 ] fix triggering change event for niceRadio buttons
2012-03-02 23:45:20 +06:00
George Vinogradov
6522650c5a
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
George Vinogradov
7b37846a54
[issue #195 ] Fixed line numbering with files contains <>
2012-03-02 19:50:17 +04:00
Alexander Machehin
50fc094bce
[refs #228 ] fuuuuu...
2012-03-02 21:32:00 +06:00
Alexander Machehin
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
George Vinogradov
6cfb5d0c3d
[issue #195 ] Fixed bug with encodings. Added avatar. Stubbed blame.
2012-03-02 04:39:43 +04:00
Pavel Chipiga
e66f0110fc
Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/javascripts/extra/syntax.highlighter-init.js
app/assets/stylesheets/design/common.scss
vendor/assets/stylesheets/vendor.scss
2012-03-02 02:12:11 +02:00
George Vinogradov
900c1fe2f5
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-02 02:07:04 +02:00
Pavel Chipiga
accf38a088
Fix build_list display width. Refs #223
2012-03-02 02:04:07 +02:00
Alexander Machehin
cea7bc79bb
[refs #194 ] fix notification line style
2012-03-02 02:04:06 +02:00
Alexander Machehin
d7dbe79357
[refs #230 ] edit password page
2012-03-02 02:04:06 +02:00
Pavel Chipiga
036dfb6dd5
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-02 02:04:04 +02:00
Pavel Chipiga
84a7a9fe2d
Fix build_list display width. Refs #223
2012-03-02 01:37:05 +02:00
George Vinogradov
318dc72d29
[issue #195 ] Fixes.
...
* Added border to gutter in file preview
* Added "empty repo" message
* Fixed one of bugs with tree/branch selector
2012-03-02 02:23:53 +04:00
George Vinogradov
43c10ee812
[issue #195 ] Fixed long comments displaying.
2012-03-02 00:33:48 +04:00
Vladimir Sharshov
9e11a20f71
Merge pull request #249 from warpc/230-registration_page
...
[refs #230 ] Edit password page
2012-03-01 11:43:53 -08:00
Alexander Machehin
2f0981c12f
[refs #194 ] fix notification line style
2012-03-02 01:33:22 +06:00
Alexander Machehin
4931dc773b
[refs #230 ] edit password page
2012-03-02 01:16:49 +06:00
George Vinogradov
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
Pavel Chipiga
7d112d0524
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-01 19:33:46 +02:00
George Vinogradov
2a4e978857
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-03-01 14:22:39 +04:00
George Vinogradov
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
George Vinogradov
dedd64f976
[issue #195 ] Returned lost files.
2012-03-01 03:29:16 +04:00
Alexander Machehin
cadd1995d1
[refs #230 ] fix forgot password SignUp style
2012-03-01 01:50:08 +06:00
Alexander Machehin
3a10ed91b2
[refs #194 ] more uniq
2012-03-01 00:33:01 +06:00
Alexander Machehin
fe0eba8e61
[refs #194 ] fix index page
2012-03-01 00:23:19 +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
3415c6eb9f
Merge branch '3.2-master' into 230-registration_page
2012-02-29 23:25:24 +06:00
Vladimir Sharshov
6e8b48188e
Merge pull request #229 from warpc/228-sign_in
...
[Refs #228 ] sign in
2012-02-29 09:22:42 -08: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
Alexander Machehin
ee84ac84cf
[refs #228 ] fix I18n
2012-02-29 22:59:08 +06:00
Alexander Machehin
71d9079003
[refs #228 ] fix registration link
2012-02-29 22:59:08 +06:00
Alexander Machehin
a1bfe66791
[refs #228 ] sign_in page
2012-02-29 22:59:08 +06:00
George Vinogradov
5b9d20154b
[issue #195 ] Added translations and maybe missed partials
2012-02-29 20:27:32 +04:00
George Vinogradov
19dd58800b
[issue #195 ] Added comments to commit.
2012-02-29 19:05:36 +04: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
Alexander Machehin
89a5cf56b2
[refs #228 ] fix submit button style
2012-02-29 15:23:59 +06:00
Alexander Machehin
c9067da374
[refs #233 ] fix users menu toggle
2012-02-29 12:40:21 +06:00
Alexander Machehin
8126b49567
[refs #228 ] fix I18n
2012-02-29 11:43:40 +06:00
Alexander Machehin
c55d6d097e
[refs #228 ] fix registration link
2012-02-29 10:41:25 +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
Alexander Machehin
91eb306560
[refs #228 ] sign_in page
2012-02-29 02:43:17 +06:00
konstantin.grabar
fa69cd8ee4
[refs #195 ] Fix radio and checkboxes script. Fix project edit and new form
2012-02-28 23:11:08 +04:00
Alexander Machehin
e83e19ea50
[refs #194 ] remove duplicates
2012-02-28 22:36:29 +06:00
Alexander Machehin
c4719f12da
[refs #194 ] some change in the issue managing
2012-02-28 22:33:38 +06:00
Alexander Machehin
895b095058
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
app/assets/stylesheets/main.scss
2012-02-28 22:31:00 +06:00
konstantin.grabar
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
Alexander Machehin
99e3bbb762
[refs #194 ] update issue content
2012-02-28 21:41:47 +06:00
Pavel Chipiga
07b081cc0d
Fresh up assets. Force production SSL. Refs #223
2012-02-28 17:40:22 +02:00
Alexander Machehin
f9c834cf4d
Revert "[refs #194 ] return main.scss"
...
This reverts commit 0b8461a5df9f3d9bbca6e3b377164ff4aa4ac4e6.
2012-02-28 20:56:43 +06:00
Alexander Machehin
5abdbd4486
[refs #194 ] return main.scss
2012-02-28 20:37:30 +06:00
konstantin.grabar
39b0beb3ab
[refs #193 ] Fix wrap gollum and wiki page styles
2012-02-28 18:36:04 +04: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
Alexander Machehin
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
Alexander Machehin
66a08662c2
[refs #194 ] new styles; some changes
2012-02-28 15:23:27 +06: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
Alexander Machehin
2c0e1b6314
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/custom.scss
2012-02-27 23:55:18 +06:00
George Vinogradov
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
Alexander Machehin
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
Pavel Chipiga
4d2459c60c
Refactor, fix and cleanup wiki templates and translations. Refs #193
2012-02-24 23:39:40 +02:00
George Vinogradov
3c83649627
[issue #96 ] Some fixes in layout and scripts.
2012-02-24 23:39:40 +02:00
Alexander Machehin
a6a51225b8
[refs #194 ] some js refactoring
2012-02-23 22:16:04 +06:00
Alexander Machehin
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
George Vinogradov
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
konstantin.grabar
3a48f8dea9
[refs #193 ] Add lost file with wiki_history checkboxes script
2012-02-21 20:11:16 +04:00
George Vinogradov
328cd17f46
[issue #195 ] Fixed bug in CommitPresenter
2012-02-21 19:51:48 +04: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
Alexander Machehin
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
George Vinogradov
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
George Vinogradov
608faf3564
[issue #96 ] Some fixes in layout and scripts.
2012-02-17 03:07:22 +04:00
Pavel Chipiga
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
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
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