Pavel Chipiga
|
7508bb1339
|
Fix bugs to force new design work. Minor refactor and improvements. Refs #193
|
2012-02-27 20:58:37 +02:00 |
Pavel Chipiga
|
1dd20377cf
|
Fix layout. Refs #193
|
2012-02-24 23:54:44 +02: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 |
konstantin.grabar
|
b99a7d5aa9
|
[refs #193] Move wiki locales to another file
|
2012-02-22 16:11:40 +04:00 |
konstantin.grabar
|
3a48f8dea9
|
[refs #193] Add lost file with wiki_history checkboxes script
|
2012-02-21 20:11:16 +04:00 |
konstantin.grabar
|
81393d7f5b
|
[refs #193] Disable more than 2 versions for wiki diff by js
|
2012-02-21 16:42:09 +04:00 |
konstantin.grabar
|
9b610eb920
|
[refs #193] Fixed old commented code from old template versions. Fix diff page
|
2012-02-21 14:49:06 +04:00 |
konstantin.grabar
|
2bdcdb6fd3
|
[refs #193] Fix compare buttons and links design
|
2012-02-20 14:27:58 +04:00 |
konstantin.grabar
|
f22d9809ff
|
[refs #193] Remove debug puts from wiki controller
|
2012-02-20 14:02:04 +04:00 |
konstantin.grabar
|
2b675c6f84
|
[refs #193] Fix routes regex for wiki compare
|
2012-02-20 13:56:09 +04:00 |
konstantin.grabar
|
d9025b093f
|
[refs #193] Compare routes repair and compare design
|
2012-02-17 18:12:05 +04:00 |
konstantin.grabar
|
7863869a30
|
[refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages
|
2012-02-17 16:47:33 +04:00 |
konstantin.grabar
|
d8a3983b07
|
[refs #193] Add new design to wiki
|
2012-02-17 15:13:54 +04:00 |
konstantin.grabar
|
c140c1b466
|
Merge branch '194-project_submenu' into 193-new_design_for_wiki
|
2012-02-16 12:23:41 +04:00 |
Alexander Machehin
|
fab80d97eb
|
[refs #194] project submenu partial
|
2012-02-15 22:32:26 +06:00 |
konstantin.grabar
|
0763936e38
|
[refs #193] Wiki navigation design
|
2012-02-15 19:01:49 +04:00 |
Vladimir Sharshov
|
ba44c32507
|
Merge pull request #187 from warpc/96-upgrade_rails
[Refs #96] New Rails 3.2 and more new staff
|
2012-02-15 06:04:03 -08:00 |
Alexander Machehin
|
eaa6a46a43
|
[refs #96] fixed commit subscribing
|
2012-02-15 19:07:56 +06:00 |
Alexander Machehin
|
da0d791f74
|
[refs #96] fixed commentable & subscribeable ids
|
2012-02-15 02:28:01 +06: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
|
02478f5451
|
Merge branch 'master' into 96-upgrade_rails
|
2012-02-14 14:05:27 +02:00 |
Alexander Machehin
|
a53f627f5f
|
Merge branch 'master' of github.com:warpc/rosa-build
|
2012-02-14 17:54:46 +06:00 |
Alexander Machehin
|
6fff641531
|
fix collaborator tests
|
2012-02-14 17:52:33 +06:00 |
Pavel Chipiga
|
7bca61c58d
|
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
|
2012-02-14 13:50:01 +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 |
Pasha
|
ea176264d9
|
Merge pull request #185 from warpc/64-project_wiki
64 project wiki
|
2012-02-13 15:45:23 -08:00 |
George Vinogradov
|
99ee490e94
|
[issue #64] Added callback for notifications + some minor changes
|
2012-02-14 03:30:17 +04:00 |
George Vinogradov
|
159bf21810
|
Merge branch 'master' into 64-project_wiki
|
2012-02-14 02:29:32 +04:00 |
Vladimir Sharshov
|
141a078cce
|
Merge pull request #175 from warpc/133-editing_from_web
[Refs #133] Edit files in git-repo with web editor
|
2012-02-13 13:07:55 -08:00 |
George Vinogradov
|
4dcc39975d
|
[issue #133] Fixed redirection bugs
|
2012-02-13 23:04:41 +04:00 |
Vladimir Sharshov
|
2ca69df1cd
|
Merge pull request #165 from warpc/150-acl-collaborators
[Fix #150] Disable edit and update action for non-admin collaborators in projects.
|
2012-02-13 10:49:01 -08:00 |
George Vinogradov
|
c26962c216
|
[issue #133] Added redirects if cannot find Blob object
|
2012-02-13 22:45:45 +04:00 |
George Vinogradov
|
e4da6057a5
|
[issue #64] Changed authorization filters
|
2012-02-13 22:28:43 +04:00 |
George Vinogradov
|
99c314fb11
|
[issue #133] Merge branch 'master' into 133-editing_from_web
Conflicts:
db/schema.rb
|
2012-02-13 21:48:40 +04:00 |
Vladimir Sharshov
|
2350993120
|
Merge pull request #182 from warpc/171-build_list_tab_acl_fix
[fix #171] Added ACL calls to project navigation
|
2012-02-13 09:24:04 -08:00 |
Vladimir Sharshov
|
fb66bac119
|
Merge pull request #184 from warpc/183-ga
Fix #183. Add GA code to layouts and invite pages. Do not track admins.
|
2012-02-13 08:46:18 -08:00 |
Pavel Chipiga
|
c6f9995b98
|
Add GA code to layouts and invite pages. Do not track admins. Refs #183
|
2012-02-13 18:42:11 +02:00 |
George Vinogradov
|
50d27ad34d
|
[issue #171] Added ACL calls to project navigation.
|
2012-02-13 20:16:50 +04:00 |
George Vinogradov
|
8c0cd29f0e
|
[issue #133] Fixed bug with no acl on editing blobs
|
2012-02-13 19:21:00 +04:00 |
konstantin.grabar
|
391716fee5
|
[refs #133] Fix syntax error into blob template
|
2012-02-13 14:43:57 +04:00 |
Vladimir Sharshov
|
2866014a6f
|
Merge pull request #181 from warpc/178-project_and_group_create_error
[Fix #178] Fix project create error with group owner
|
2012-02-13 02:26:54 -08:00 |
konstantin.grabar
|
1356ffa437
|
[refs #178] Fix project create error with group owner
|
2012-02-13 14:23:20 +04:00 |
Vladimir Sharshov
|
47399a957f
|
Update doc link
|
2012-02-11 00:36:45 +04:00 |
Pasha
|
325533f39e
|
Merge pull request #180 from warpc/174-invite_system
Доработка системы приглашений
|
2012-02-10 09:00:07 -08: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 |
George Vinogradov
|
8417e8c16f
|
[issue #174] multiupdate in admin view.
|
2012-02-10 15:18:40 +04:00 |
George Vinogradov
|
a17f548168
|
[issue #174] Fixed bugs
|
2012-02-10 14:04:15 +04:00 |
Pasha
|
3dae76ef4a
|
Merge pull request #177 from warpc/174-invite_system
Система приглашений для регистрации
|
2012-02-09 15:33:37 -08:00 |
Pavel Chipiga
|
e535ca2b64
|
Fix validations. Refs #174
|
2012-02-10 01:33:06 +02:00 |