George Vinogradov
|
a4f95e3660
|
[issue #64] Changed editor toolbar.
|
2012-01-27 21:00:44 +04:00 |
George Vinogradov
|
549f0a55e8
|
[issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
|
2012-01-27 18:27:23 +04:00 |
George Vinogradov
|
3cb426a508
|
[issue #64] Added cancan restrictions.
|
2012-01-26 20:26:21 +04:00 |
Vladimir Sharshov
|
c529e63c96
|
Merge pull request #122 from warpc/105-internationalization
[refs #105] Fix devise translations
|
2012-01-26 08:06:34 -08:00 |
George Vinogradov
|
45877e8b5c
|
[issue #64] Bug fix & views refactoring
* Fixed bug with history
* Navigation moved to partial.
|
2012-01-25 00:47:55 +04:00 |
Pavel Chipiga
|
3f4bf65825
|
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
|
2012-01-24 22:35:36 +02:00 |
George Vinogradov
|
230c25eefd
|
[issue #64] Some changes.
* WikiController#compare splitted into WikiController#compare
and WikiController#compate_wiki
* Show only last 30 versions in history.
|
2012-01-23 16:45:38 +04:00 |
konstantin.grabar
|
23ace52d90
|
[refs #113] Images render and download href for binary data into blobs
|
2012-01-20 22:31:01 +04:00 |
George Vinogradov
|
23573a1a07
|
[issue #64] Added creation wiki to project.
|
2012-01-20 19:10:30 +04:00 |
George Vinogradov
|
011efb0c4b
|
[issue #64] Added git access to Wiki.
|
2012-01-20 19:01:59 +04:00 |
konstantin.grabar
|
e3a716b7db
|
[refs #105] Fix some translations
|
2012-01-20 15:29:32 +04:00 |
George Vinogradov
|
364f2e40c0
|
[issue #64] Added Wiki history, compare, revert.
|
2012-01-20 03:25:15 +04:00 |
George Vinogradov
|
54bc26d960
|
[issue #64] Added translations.
|
2012-01-19 18:37:36 +04:00 |
George Vinogradov
|
0c527af291
|
[issue #64] Added revisions comparsion.
|
2012-01-19 17:49:32 +04:00 |
George Vinogradov
|
552aa0a58a
|
[issue #64] Fixed bug with sidebar and footer.
|
2012-01-19 17:48:29 +04:00 |
George Vinogradov
|
538e3da8c8
|
[issue #64] Added search through wiki
|
2012-01-19 16:10:50 +04:00 |
George Vinogradov
|
65e659ad49
|
[issue #64] Some changes in preview.
|
2012-01-19 16:09:55 +04:00 |
George Vinogradov
|
a03690a9f7
|
[issue #64] Some views restuct.
|
2012-01-19 01:14:12 +04:00 |
George Vinogradov
|
2af0135fb5
|
[issue #64] Added All Pages representation.
|
2012-01-18 19:09:25 +04:00 |
George Vinogradov
|
0386c34246
|
[issue #64] Added page deletion.
|
2012-01-18 18:33:35 +04:00 |
George Vinogradov
|
7afcc3a617
|
[issue #64] Some fixes.
|
2012-01-18 18:33:09 +04:00 |
Pasha
|
4ba268dd67
|
Merge pull request #109 from warpc/18-commit_comments
18 commit comments
|
2012-01-18 05:49:57 -08:00 |
George Vinogradov
|
931aef4db6
|
[issue #64] Fixed some bugs in templates.
|
2012-01-18 04:47:01 +04:00 |
George Vinogradov
|
d3b32e4d6d
|
[issue #64] Fixed bug with preview page.
|
2012-01-18 04:43:36 +04:00 |
George Vinogradov
|
2522dd3c63
|
[issue #64] Added page history views.
|
2012-01-18 03:30:54 +04:00 |
George Vinogradov
|
51e9b5d1f6
|
[issue #64] Some changes in views and routes.
|
2012-01-18 02:28:59 +04:00 |
Alexander Machehin
|
310e11b666
|
[refs #18] Fix if blocking referer
|
2012-01-18 00:33:42 +06:00 |
konstantin.grabar
|
bbbf17c2b4
|
[refs #105] Merge master with 105-internationalization
|
2012-01-17 17:58:49 +04:00 |
konstantin.grabar
|
d205eb2dd9
|
[refs #105] Add language check on user save
|
2012-01-17 15:57:46 +04:00 |
konstantin.grabar
|
726eddc40e
|
[refs #105] Add internationalization support to project
|
2012-01-17 15:48:40 +04:00 |
Alexander Machehin
|
a0aad7103e
|
some fixes
|
2012-01-17 17:38:40 +06:00 |
Pavel Chipiga
|
fab62c548f
|
Hide container_path if build_list published. Cleanup translations. Refs #100
|
2012-01-17 13:04:50 +02:00 |
Alexander Machehin
|
95b4e2557c
|
[refs #18] forgot comments order
|
2012-01-17 16:30:11 +06:00 |
Alexander Machehin
|
bf4e4f02ed
|
Right merge branch 'master' into 18-commit_comments
Conflicts:
app/controllers/comments_controller.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
db/schema.rb
|
2012-01-17 15:52:46 +06:00 |
George Vinogradov
|
62922c30a3
|
[issue #64] Added search partial.
|
2012-01-17 04:05:07 +04:00 |
George Vinogradov
|
1e1dab369b
|
[issue #64] Added some views, styles and scripts.
* Added base gollum styles
* Added base gollum javascripts (with minor changes)
* Fixed some bugs in WikiController
* Added some views (draft yet)
|
2012-01-17 01:48:38 +04:00 |
konstantin.grabar
|
52696791f2
|
[refs #54, #94] Merge master into issues
|
2012-01-16 13:42:44 +04:00 |
Alexander Machehin
|
e10dd56dff
|
[refs #18] refactoring
|
2012-01-16 13:28:30 +06:00 |
konstantin.grabar
|
a1a92e9878
|
[refs #54] Fix comments serial_id routing and some logic
|
2012-01-13 20:07:46 +04:00 |
Alexander Machehin
|
794c55a030
|
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
|
2012-01-13 22:01:30 +06:00 |
konstantin.grabar
|
db0a66846b
|
[refs #94] Add new notifier rules. Fix some issues and comments bugs
|
2012-01-13 19:07:01 +04:00 |
George Vinogradov
|
0751a94974
|
[update #76] Merge branch 'master' into 76-project_autocomplete
Conflicts:
app/views/layouts/_stylesheets.html.haml
|
2012-01-12 20:43:32 +04:00 |
George Vinogradov
|
73b710ae4e
|
[close #76] Changed styles. Fixed bug with pagination.
|
2012-01-12 20:37:50 +04:00 |
Alexander Machehin
|
630346d2e3
|
[refs #18] fix cancel button
|
2012-01-12 20:48:08 +06:00 |
Alexander Machehin
|
636c90e6e4
|
[refs #18] add some I18n
|
2012-01-12 20:27:45 +06:00 |
Alexander Machehin
|
f8d00f5235
|
[refs #18] Fix cancan ability for commit comments
|
2012-01-12 18:04:16 +06:00 |
Alexander Machehin
|
07dc7a4800
|
[refs #18] add comments to commit
|
2012-01-12 17:19:22 +06:00 |
George Vinogradov
|
49082c2a8d
|
[issue #76] Fixed bug with JSON generation.
|
2012-01-12 01:12:56 +04:00 |
konstantin.grabar
|
2b8aca5f09
|
[refs #54] Add settings notifier
|
2012-01-11 17:58:13 +04:00 |
konstantin.grabar
|
4132c336d6
|
[refs #54] Fix comment update path
|
2011-12-31 14:55:49 +04:00 |