deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3902 commits 6 branches 43 tags 25 MiB
Commit graph

2280 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
b01f8b63c2 added NamespacedProject role. Extended project info displayed for admin. Fixed project limit 2012-12-14 08:14:05 +03:00
Dmitriy Zaporozhets
44209861e8 Allow group path renaming. Dont show project transfer if no permissions. More danger messages :) 2012-12-14 06:14:05 +03:00
Dmitriy Zaporozhets
a8fbda945e bit reordering and cleanup unused styles 2012-12-13 21:44:55 +02:00
Dmitriy Zaporozhets
1d156c9c8e Fix project lookup. Show error if project transfer fails 2012-12-13 19:20:37 +02:00
Dmitriy Zaporozhets
03369a9165 Use one helper for linking to team member. More clear title for Issue and MR 2012-12-13 06:14:05 +03:00
Cyril
a5861b8ff3 fix gfm autocomplete for usernames 2012-12-13 01:44:25 +01:00
Valeriy Sizov
b48852e789 Merge pull request #2261 from jouve/fix_user_validation 
Validates presence of User#name
 2012-12-12 09:47:56 -08:00
Dmitriy Zaporozhets
bca7bddd3d Add ace editor to snippets 2012-12-12 19:42:08 +02:00
Cyril
63d9373aa8 Validates presence of User#name 
The 2 reasons are :
- creation of user fail if name is empty : in after_save, it tries to create a
namespace with namespace.name = user.name and namespece validates presence
Namespace#name
- in the web app links to team members are broken with empty User#name because
they are of the form <a href'...'> user.name </a>
 2012-12-12 17:53:43 +01:00
Dmitriy Zaporozhets
273c0d2aa3 Merge pull request #2253 from alexleutgoeb/patch-1 
Minor: Change html input type to "email" on sign-in view
 2012-12-12 04:17:14 -08:00
Dmitriy Zaporozhets
439d03bbed Fix namespace api autocomplete 2012-12-12 12:54:28 +02:00
Dmitriy Zaporozhets
105f5ba3c9 Reduce header font a bit. Moved to mixin header font styles 2012-12-12 12:30:19 +02:00
Dmitriy Zaporozhets
d7eb314553 Project titles with namespaces 2012-12-12 12:02:29 +02:00
Dmitriy Zaporozhets
743073ce5f pretty gl icon for dark themes. Removed old gl icons 2012-12-11 21:11:29 +02:00
Dmitriy Zaporozhets
7f636b1306 Fix project namespaces for web hooks data 2012-12-11 19:16:56 +02:00
Alex Leutgöb
f2bf05066d Add autofocus attribute to sign-in email field 2012-12-11 11:57:25 +01:00
Alex Leutgöb
8738eb2369 Change html input type to "email" on sign-in view 
As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one.
 2012-12-11 11:25:55 +01:00
Dmitriy Zaporozhets
5d219bd5f0 Fix gitolite error instructions 2012-12-11 09:22:14 +02:00
Dmitriy Zaporozhets
ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Cyril
c76764b7dc add missing mandatory tr in thead 2012-12-11 02:39:05 +01:00
Cyril
7d3ee2baa6 add username to team_member page 2012-12-11 02:17:09 +01:00
Riyad Preukschas
a5243178ed Fix commit url in PushObserver#post_receive_data 
Fixes #2246
 2012-12-10 20:28:18 +01:00
Dmitriy Zaporozhets
b1437d4c8d use link_to_project for Dashboard: Issues, MR 2012-12-10 15:39:10 +02:00
Riyad Preukschas
20c8d6e644 Merge pull request #2222 from jojosch/add-test-help-raketasks 
add help/raketasks to routing spec and search autocomplete
 2012-12-10 05:38:14 -08:00
Dmitriy Zaporozhets
bf13579b92 Make admin sorting more obvious 2012-12-10 06:14:05 +03:00
Dmitriy Zaporozhets
f1dfc27c5d Replace project with namespace for events 2012-12-09 16:03:24 +02:00
Dmitriy Zaporozhets
f4d9059b7e Show project with namespace in feeds 2012-12-09 10:56:15 +02:00
Dmitriy Zaporozhets
8a08fdcd32 Fix worker specs to parse namespaces 2012-12-09 10:34:46 +02:00
Dmitriy Zaporozhets
80e984ee5e Fix project lookup in post receive 2012-12-08 20:48:33 +02:00
Johannes Schleifenbaum
3a48177762 add help raketasks to search autocomplete 2012-12-08 17:35:10 +01:00
Koen Punt
4b2ecbc420 Updated branch-graph, abstracted some code in seperate functions 
Removed unused Raphael.fn.popup
 2012-12-07 22:05:17 +01:00
Johannes Schleifenbaum
eededdd4be fix notify_team on wall 2012-12-07 19:36:12 +01:00
Koen Punt
e1282d507f BranchGraph now loads async 
Centralized keyboard and drag events for BranchGraph
 2012-12-07 19:06:46 +01:00
Koen Punt
40576b8709 Fixed #1509 by converting the entities in js 
Converted BranchGraph to some sort of Class
 2012-12-07 17:39:40 +01:00
Dmitriy Zaporozhets
84465576d7 Dont show remove project button if you have no permission 2012-12-07 15:53:04 +02:00
Ariejan de Vroom
3d9ba7b76c Merge pull request #2202 from gitlabhq/ui/tiny_nav 
Redesign for navigation bar.
 2012-12-07 01:35:48 -08:00
Sergey Linnik
0aa7f79ca4 allow customize gravatar url 2012-12-07 00:44:22 +04:00
Sergey Linnik
2c37fa381e fix some glitches in gravatar image url generation 
always use proper size value
do not show alt text when avatar image not loaded
 2012-12-07 00:03:13 +04:00
Dmitriy Zaporozhets
55f776f095 Tiny nav 2012-12-06 16:54:53 +02:00
Riyad Preukschas
9b96509899 Fix broken styling after #2176 
Closes #2196
 2012-12-06 11:08:51 +01:00
Dmitriy Zaporozhets
4c3cdfa4ff Make profile dropbown a bit bigger 2012-12-05 17:08:24 +02:00
Dmitriy Zaporozhets
a350b52c9b Rewrite project security model tests 2012-12-05 17:06:15 +02:00
Dmitriy Zaporozhets
674efd38d8 Fix 500 error on services page. Fixed active project tab when on services 2012-12-05 14:17:40 +02:00
Dmitriy Zaporozhets
cc0295b789 Only owner can remove project 2012-12-05 06:14:05 +03:00
Riyad Preukschas
b47173da6a Revamped note form options. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
4ed8278870 Fix a bunch of smaller glitches. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
7978f8dd2b Fix handling form errors. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
c1ffee4e65 Fix dicussion headers 2012-12-03 22:51:57 +01:00
Riyad Preukschas
c20af32ae4 Pull together and rename Notes partials 2012-12-03 22:51:57 +01:00
Riyad Preukschas
6fc10fa256 Unify forms for discussions and main target. 
Allows previews and uploads in all forms.
Also fixes #1730
 2012-12-03 22:51:56 +01:00
Riyad Preukschas
fbd345ea20 Make attachments more obvious 2012-12-03 22:51:56 +01:00
Riyad Preukschas
c4a7824a8c Fix wall notes 2012-12-03 22:51:56 +01:00
Riyad Preukschas
140652e9b0 Fix common form and note preview 2012-12-03 22:51:56 +01:00
Riyad Preukschas
5d3fb35cd1 Rename JS behaviors 2012-12-03 22:51:56 +01:00
Riyad Preukschas
918dc87376 Move code for appending a discussion note to notes JS 2012-12-03 22:51:56 +01:00
Riyad Preukschas
fac4e3f2e5 Reformat notes JS 2012-12-03 22:51:56 +01:00
Riyad Preukschas
d9b15fc17d Crop and rename the add diff note image 2012-12-03 22:51:56 +01:00
Riyad Preukschas
494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas
1319373d58 Fix loading notes with empty line_code in Project#commit_notes 2012-12-03 22:51:56 +01:00
Riyad Preukschas
e8f10f317f Fix Note validation 
* remove length restriction on note
* add format validation for line_code
 2012-12-03 22:51:56 +01:00
Riyad Preukschas
654f10102e Remove paging from all notes except the wall 2012-12-03 22:51:56 +01:00
Riyad Preukschas
06ea122840 Refactor diff notes creation 2012-12-03 22:51:56 +01:00
Riyad Preukschas
39834ec640 Move diff notes into the actual diff content column 2012-12-03 22:51:56 +01:00
Riyad Preukschas
4d2278e7c6 Rename commits/text_file partial to text_diff 2012-12-03 22:51:56 +01:00
Riyad Preukschas
6d5c29dc2b Inline diff_notes_reply_button partial 2012-12-03 22:51:56 +01:00
Riyad Preukschas
3bc507e5c5 Rename diff note partials 2012-12-03 22:51:56 +01:00
Riyad Preukschas
534bd5a268 Fix emoji generation and styling 2012-12-03 22:51:56 +01:00
Riyad Preukschas
bd60a4ed40 Make notes JS know which notes are new in a request 2012-12-03 22:51:56 +01:00
Riyad Preukschas
ae067ee322 Fix vote counting 2012-12-03 22:51:56 +01:00
Riyad Preukschas
6c6f415cae Fix appending diff line notes 2012-12-03 22:51:55 +01:00
Riyad Preukschas
5c2f6d7f05 Update notes views to support discussions 2012-12-03 22:51:55 +01:00
Riyad Preukschas
7971383d53 Rename the "Comments" tab for merge requests "Discussion" 2012-12-03 22:51:55 +01:00
Riyad Preukschas
a048c955fd Add JS behaviors 2012-12-03 22:51:55 +01:00
Riyad Preukschas
a58385247d Add discussions for merge requests to notes controller 2012-12-03 22:51:55 +01:00
Riyad Preukschas
9b919939a3 Fix parameter passing and wording for per line notes 2012-12-03 22:51:55 +01:00
Riyad Preukschas
b91d680257 Fix notes helper 2012-12-03 22:51:55 +01:00
Riyad Preukschas
fc1c250d40 Reorder Note methods and add helpers 2012-12-03 22:51:55 +01:00
Johannes Schleifenbaum
fddc0c29aa add help page for gitlab specific rake tasks 2012-12-03 17:19:33 +01:00
Dmitriy Zaporozhets
a5105ddf13 Fix broken CSS 2012-12-03 14:39:13 +02:00
Dmitriy Zaporozhets
6ea6ab7c8d Restyled services page in order to make it more usable 2012-12-02 08:41:06 +03:00
Koen Punt
61140b71cd overflow: auto so content won't break layout #1612 2012-12-05 01:22:30 +01:00
Dmitriy Zaporozhets
e376f31507 Admin can move project to ANY namespace. Updated permissions page 2012-12-04 22:48:24 +02:00
Dmitriy Zaporozhets
2a1c5cdf99 Only owner of current namespace can change project namespace 2012-12-04 22:06:55 +02:00
Dmitriy Zaporozhets
9acd7cf1bd Show namespaces when adding projects to user in admin area 2012-12-04 15:26:12 +02:00
Dmitriy Zaporozhets
d8398921eb Dont allow select block user as new team member 2012-12-04 15:22:22 +02:00
Dmitriy Zaporozhets
ba74fa1413 Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. 2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets
7f6bbf06f8 Fix bug getting started message when navigate to personal projects w/o them exist 2012-12-04 11:18:41 +02:00
Dmitriy Zaporozhets
f2a76228f2 Remove unsued css styles. Fixed Milestone preselected date. 2012-12-01 09:14:05 +03:00
Dmitriy Zaporozhets
2d076394aa Fix github issue #967 2012-12-03 13:22:28 +02:00
Dmitriy Zaporozhets
0530e5baae Add description to project features on edit project page 2012-12-02 19:28:23 +02:00
Dmitriy Zaporozhets
46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
Dmitriy Zaporozhets
f2e1c8b709 Merge pull request #2138 from jouve/refactor_flash 
refactor flash
 2012-12-02 02:18:34 -08:00
Johannes Schleifenbaum
0323610b72 commit diff - check if prev_commit is not nil 2012-12-01 19:31:39 +01:00
Cyril
a9a5497915 refactor flash 
* make unobtrusive js
* convert js to coffee
 2012-12-01 18:40:47 +01:00
Nihad Abbasov
24e172597a remove length limit from notes 2012-12-01 03:19:16 -08:00
Dmitriy Zaporozhets
c177593e2c Merge pull request #2059 from dolanor/feature-rewording-blocked-users 
Rewording for the account being blocked
 2012-11-30 12:50:06 -08:00
Dmitriy Zaporozhets
c19e766f1e Added vendor/bundle to gitignore. Removed project js slugify 2012-11-30 19:49:51 +02:00
Dmitriy Zaporozhets
eb3e07a509 Use project owner if no namespace. Restyled team page 2012-11-30 18:26:17 +02:00
Dmitriy Zaporozhets
3c13ef648b Fix MR comments 2012-11-30 16:03:10 +02:00
Dmitriy Zaporozhets
c38b9a2f80 Filter projects on dashboard 2012-11-30 13:40:34 +02:00
Valeriy Sizov
a03f318964 Merge pull request #2119 from erroric/fix_issue2118 
issue #2118: fix undefined method  for nil:NilClass exception
 2012-11-30 01:19:29 -08:00
Nihad Abbasov
eb061b9b06 fix label name 2012-11-29 14:26:18 -08:00
Nihad Abbasov
658f260e98 add docs for notes API 2012-11-29 12:32:05 -08:00
Dmitriy Zaporozhets
aaa1c94239 Manage team from groups page. Phase 1 2012-11-29 20:14:05 +03:00
Dmitriy Zaporozhets
08fded3fac Minor improvments to UI 2012-11-29 18:09:27 +02:00
Alexey Loktionov
c954f2d982 issue #2118: fix undefined method for nil:NilClass exception 2012-11-29 19:39:30 +04:00
Dmitriy Zaporozhets
9df6f7bfad authorized_projects and authorized_groups methods for user 2012-11-29 17:17:01 +02:00
Dmitriy Zaporozhets
83f2a387d6 Merge pull request #2117 from koenpunt/scss-cleanup 
Scss cleanup
 2012-11-29 06:51:27 -08:00
Dmitriy Zaporozhets
1d889a79fb Fix group duplication on dashboard and project order in group 2012-11-29 16:43:09 +02:00
Koen Punt
1481bae559 Selective responsive bootstrap 2012-11-29 15:37:28 +01:00
Koen Punt
0f31392712 Mixins are now all with dashes instead of underscores 
(there really should be some convention for all gitlab css)
 2012-11-29 12:18:44 +01:00
Koen Punt
d7e9eda24d renamed blue_link var to primary_color 2012-11-29 12:18:44 +01:00
Koen Punt
df0bd0c212 Removed bg-gradient, now directly using linear-gradient 2012-11-29 12:18:44 +01:00
Koen Punt
81175073a0 removed overqualified mixins round-borders-* 2012-11-29 12:18:44 +01:00
Koen Punt
238c214ac9 Forgot to rename var 2012-11-29 12:18:44 +01:00
Koen Punt
b825582eb1 replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
Koen Punt
84de1b71d1 Added some uniformity, all css properties and values are separated by a colon and a space : 2012-11-29 12:18:44 +01:00
Koen Punt
755e4a4700 Removed css declarations out of main.scss, so main is only a collector 
Fonts, variables and mixins are now all in their own stylesheets
 2012-11-29 12:18:44 +01:00
Dmitriy Zaporozhets
eb1004f789 Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces 2012-11-29 12:39:03 +02:00
Saito
a1ffc673b9 Merge pull request #2096 from panxiaoming/master 
can't open a chinese file name doc
 2012-11-29 02:02:22 -08:00
Dmitriy Zaporozhets
cf8b3692cd Merge pull request #2105 from jouve/improve_admin_views 
Improve admin section
 2012-11-29 00:39:50 -08:00
Dmitriy Zaporozhets
ff9a2e2a93 Improve admin logs 2012-11-29 07:49:11 +03:00
Dmitriy Zaporozhets
a0aa0212a9 Removed feature: comments on wiki 2012-11-29 06:14:05 +03:00
Alex Denisov
34c2d8e82e authorized_for scope added to project 2012-11-28 20:09:13 +02:00
Dmitriy Zaporozhets
c873cf81f6 Restyled error messages in common way. Added title to head partial 2012-11-28 19:40:54 +02:00
Cyril
e0a9ffcdaa Improve admin views for project and groups 
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
 2012-11-28 18:04:28 +01:00
Robert Speicher
4db362f519 Add a link to each project on the Issues dashboard 2012-11-28 11:00:02 -05:00
panxiaoming
e2b73513f4 fixed the bug of URIDECODE error 
if link to a chinese file name, it will jump to error page;
for example, the chinese file name called "消息文档.md", when after urlencode, it will be "%E6%B6%88%E6%81%AF%E6%96%87%E6%A1%A3.md", but after use History.pushState, will jump to a bad decode link.
 2012-11-28 10:09:55 +08:00
Riyad Preukschas
dc99b19af7 Fix CSS for code highlighting 2012-11-27 22:51:10 +01:00
Riyad Preukschas
184a9ecaf6 Add user_color_scheme_class helper 2012-11-27 22:51:05 +01:00
Dmitriy Zaporozhets
4340112398 Remove unused responsive formats 2012-11-27 21:30:39 +02:00
Dmitriy Zaporozhets
cfeddb554e Fix user creation cause of dual namespace build 2012-11-27 18:27:13 +00:00
Dmitriy Zaporozhets
81f8114f24 NamespacesHelper 2012-11-27 17:48:25 +02:00
Dmitriy Zaporozhets
039996bd0a Fix invalid method call for gitolite 2012-11-27 16:35:00 +02:00
Dmitriy Zaporozhets
f5551efdfd Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues 2012-11-27 09:31:15 +03:00
Tanguy Herrmann
70ef433e09 Rewording for the account being blocked 
When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked'

They should get the idea this might be only temporary and not because of a technical problem
 2012-11-24 18:21:57 +01:00
Dmitriy Zaporozhets
9e8aadb0f0 Merge pull request #2026 from koenpunt/extended-image-diff 
Added bg for transparent images
 2012-11-21 12:56:06 -08:00
Dmitriy Zaporozhets
7392d28dca Merge pull request #2030 from tsigo/theme_feedback 
Improve user feedback on the Profile > Design page
 2012-11-21 12:54:22 -08:00
Robert Speicher
30a66c065a Improve user feedback on the Profile > Design page 
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
 2012-11-21 15:01:40 -05:00
Riyad Preukschas
d7ce2c5c07 Fix rendering template for invalid notes 2012-11-21 20:26:37 +01:00
Riyad Preukschas
3e800c3bb1 Refactor GFM JS naming and access 2012-11-21 20:25:49 +01:00
Riyad Preukschas
1cda62465f Fix GFM JS code style 2012-11-21 20:05:37 +01:00
Koen Punt
1de0ea28b9 added bg for transparent images 
added width and height below images in diff
 2012-11-21 18:27:21 +01:00
Dmitriy Zaporozhets
4c6c24856c Themes refactored 2012-11-21 18:19:03 +02:00
Dmitriy Zaporozhets
9477448ac0 Merge pull request #2023 from martinsp/master 
fixes :notice after project is created in projects_controller
 2012-11-21 06:25:16 -08:00
Martins Polakovs
8c5b79a923 Fixes :notice after project is created 
When projects were created in projects_controller
create.js.haml passed notice as url parameter and
therefore notice was not displayed in the page after
redirect to the project page
 2012-11-21 14:30:35 +02:00
Dmitriy Zaporozhets
898d09a21e Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed 2012-11-21 12:45:15 +02:00
Dmitriy Zaporozhets
70bf7f6e19 Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo 2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets
cc52eed981 Show namespace in search autocomplete 2012-11-27 07:29:11 +03:00
Dmitriy Zaporozhets
285743eee1 Merge pull request #2070 from jouve/fix_destroy_project 
fix destroy project from admin
 2012-11-27 01:53:24 -08:00
Dmitriy Zaporozhets
d7c5885c3d Improved Issues and MR filters 2012-11-27 07:29:11 +03:00
Cyril
b382ce4d91 fix destroy project from admin 2012-11-26 01:22:44 +01:00
Dmitriy Zaporozhets
1d857aae17 project admin area - show project name with namespace 2012-11-25 18:52:12 +02:00
Dmitriy Zaporozhets
97a92f8ae7 Fixed user.namespace_id exception if namespace is nil 2012-11-25 12:26:34 +02:00
Dmitriy Zaporozhets
c31d48dd25 Allow project creation in scope of group for non-admin but group owners 2012-11-25 11:57:01 +02:00
Dmitriy Zaporozhets
2f22874ba6 Fix group assoc. Show namespace in project list 2012-11-24 22:39:51 +02:00
Dmitriy Zaporozhets
65c470e843 Reannotated 2012-11-24 22:16:51 +02:00
Dmitriy Zaporozhets
3f1d6d6ab3 move namespace dir after path changed 2012-11-24 22:11:46 +02:00
Dmitriy Zaporozhets
f37fa968b2 add ability to change namespace from project edit page 2012-11-24 22:00:30 +02:00
Dmitriy Zaporozhets
f997947664 Project can be transfered to namespace and out now 2012-11-24 12:37:30 +02:00
Dmitriy Zaporozhets
d405c8fc60 Create namespace on username init. Raise exception if project cannot be moved 2012-11-24 12:25:04 +02:00
Dmitriy Zaporozhets
4023d9f852 class for moving project 2012-11-24 11:46:19 +02:00
Dmitriy Zaporozhets
0e1635a68a Fixing requests after namespaces. Fixed admin bug with access to project 2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
9304d049de Fixed some tests and snippet colorize 2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets
470aa7675e Fix project.code-related functionality 2012-11-23 21:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52 Deprecate code for Project. Use title and path 2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
ab9d023651 Create dir with namespace. Create namespace with user 2012-11-23 09:11:09 +03:00
Dmitriy Zaporozhets
f17ddeb394 Make admin project list more useful 2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets
552b3105fb Fixed admin area. Create project only from one place 2012-11-23 07:31:09 +03:00
Dmitriy Zaporozhets
2b683b0d0b Ability to create project with namespace 2012-11-23 07:11:09 +03:00
Dmitriy Zaporozhets
96105e214f Update namespace if user changed username. Dont move project if new record 2012-11-23 06:39:09 +03:00
Dmitriy Zaporozhets
26622f4c8f Improve routing. Project access via namespace 2012-11-22 23:34:06 +03:00
Dmitriy Zaporozhets
71214bee75 Move directory with project. Fixed all related path methods to use namespace 2012-11-22 22:41:26 +03:00
Dmitriy Zaporozhets
e29ccece33 Namespace model added. Migration to convert exit project/groups 2012-11-22 21:34:26 +03:00
Dmitriy Zaporozhets
ab42370af0 Fix sattellites 2012-11-21 09:14:05 +03:00
Dmitriy Zaporozhets
23734a715e Dashboard filters for events 2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets
899afd0067 Fix snippet render issue cause of haml preserve 2012-11-26 07:14:05 +03:00
Dmitriy Zaporozhets
29636d4dab Fix snippet render error 2012-11-26 06:14:05 +03:00
Dmitriy Zaporozhets
e750efd9fc Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests 
Diff and patch for commits and merge requests
 2012-11-26 04:40:49 -08:00
Dmitriy Zaporozhets
2d5a6fc850 Fix dir permission on creation 2012-11-26 13:07:16 +02:00
Dmitriy Zaporozhets
7ae851f642 Fix critical issue with dir permission for namespaces 2012-11-26 12:43:32 +02:00
Dmitriy Zaporozhets
585eb70588 Fix http push with namespaces. Allow use of username as login 2012-11-26 11:23:08 +02:00
Riyad Preukschas
79a4ed15ce Change "Get Patch" buttons to dropdowns orffering patches and diffs 2012-11-25 00:36:19 +01:00
Riyad Preukschas
b3834bc9b0 Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch 2012-11-25 00:05:47 +01:00
Riyad Preukschas
2b1afa0e62 Remove merge_request#raw and replace it with formats to #show 
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
 2012-11-25 00:05:44 +01:00
Riyad Preukschas
3b7c2adf0a Add diff format to commit#show 2012-11-22 20:49:44 +01:00
Riyad Preukschas
246faa3d7a Add Commit#to_diff for raw diff 2012-11-22 20:49:01 +01:00
Riyad Preukschas
6ddf4567f4 Don't escape Html in patches 
Fixes #2036
 2012-11-22 12:45:39 +01:00
Dmitriy Zaporozhets
0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
6bf656970d Use fieldset. Improved profile 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
f614ae8ef7 Increased test coverage 2012-11-21 07:14:05 +03:00
Dmitriy Zaporozhets
47234ab367 Validate username. Gitlab::Regex added 2012-11-28 06:14:05 +03:00
Dmitriy Zaporozhets
d18e2bd59d styled error message 2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets
c1c1a1eeee Restored old h6 of bootstrap. Fixed buttons line-height 2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets
ec7a1c504f Fix tabs line height 2012-11-21 00:18:36 +02:00
Dmitriy Zaporozhets
dc9916b474 Merge pull request #1998 from erroric/gitlabhq_issue1669 
fix for issue #1669
 2012-11-20 14:10:45 -08:00
Dmitriy Zaporozhets
4d846c09b1 Fixed spec 2012-11-20 23:18:44 +02:00
Dmitriy Zaporozhets
942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets
236584c2f8 update bootstrap to 2.2.1.1 2012-11-20 20:01:25 +02:00
Dmitriy Zaporozhets
ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03:00
Dmitriy Zaporozhets
ed92cfdebd Fix method call for service hook 2012-11-20 16:46:22 +02:00
Dmitriy Zaporozhets
f6248c255e User custom method for services array 2012-11-20 14:22:00 +02:00
Dmitriy Zaporozhets
93fdc4ca9d Reannotated 2012-11-20 14:19:55 +02:00
Dmitriy Zaporozhets
9f65c274ef Fix ci service creation logic 2012-11-20 14:16:04 +02:00
Dmitriy Zaporozhets
406a0c809b GitLabCi Service imtegration 2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets
8500743464 Post Receive Refactored. Service hooks also triggered now 2012-11-19 21:44:05 +03:00
Dmitriy Zaporozhets
95c23b2f97 Annotated. schema updated 2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets
c3b074acab Service model and service hook 2012-11-20 11:33:49 +02:00
Dmitriy Zaporozhets
4eef112462 Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner 
Cannot remove user that owns a project.
 2012-11-19 04:12:31 -08:00
Dmitriy Zaporozhets
cd15e89135 Merge pull request #2008 from Partugal/patch-default-order 
add order for projects admin page
 2012-11-19 04:11:18 -08:00
Dmitriy Zaporozhets
6878f55620 Bigger file name for commits diff 2012-11-19 14:01:40 +02:00
Dmitriy Zaporozhets
86b181398c Merge pull request #2011 from koenpunt/extended-image-diff 
Optimized commit diff views, now showing file size and file mode changes
 2012-11-19 04:01:49 -08:00
Sergey Linnik
bb3fc1e04e add order to projects admin page 2012-11-18 22:36:22 +04:00
Valeriy Sizov
e226551e81 Fix hooks for merge request which were accepted by web-interface 2012-11-18 19:56:29 +02:00
Koen Punt
3ac1f9459a Optimized commit diff views, now showing file size and file mode changes 
Replaced commit status images (diff_file_*.png) with fontawesome icons
 2012-11-18 17:41:41 +01:00
Riyad Preukschas
51f48392ab Fix type error if there is a different location hash 2012-11-17 22:26:22 +01:00
Riyad Preukschas
98e938bdb0 Fix editor form, styles and JS 2012-11-17 15:43:13 +01:00
Riyad Preukschas
7caf4de2cf Fix setting Ace mode 2012-11-17 15:28:32 +01:00
Riyad Preukschas
6c1b44859d Fix Haml indenting file content 2012-11-17 01:00:26 +01:00
Alexey Loktionov
31bf0cd876 fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance 2012-11-16 22:31:17 +04:00
Marin Jankovski
19e8473eb7 Cannot remove user that owns a project. 
Cannot remove user that owns a project.

Make lines shorter, set alert, use path instead of url.
 2012-11-16 14:47:07 +01:00
Dmitriy Zaporozhets
b339c747a9 Merge pull request #1937 from riyad/add-file-line-links 
Add file line links
 2012-11-16 03:46:43 -08:00
Riyad Preukschas
ece563296b Fix Notes JS 
Also fixes #1983
 2012-11-14 14:36:51 +01:00
Riyad Preukschas
578cf89812 Fix specs 2012-11-14 01:20:37 +01:00
Dmitriy Zaporozhets
f0a6fbaae3 Improve Commits stats code 2012-11-13 21:26:57 +02:00
Dmitriy Zaporozhets
9d499b86f8 Fix loader hiding when create new project 2012-11-13 12:36:41 +02:00
Dmitriy Zaporozhets
3c7806c3f2 Improve lists. Remove unneccessary padding 2012-11-11 00:08:42 +02:00
Dmitriy Zaporozhets
283a9c7b7d Fix margin-right for some avatars 2012-11-10 23:45:13 +02:00
randx
3e04673334 Added feature test for stats 2012-11-10 23:33:10 +02:00
randx
1c5b2a5153 Stats page 2012-11-10 23:08:47 +02:00
Riyad Preukschas
c42ada9bee Allow linking to file lines 
Supported formats: "L12" for single lines and "L12-34" for multiple lines
 2012-11-10 00:03:46 +01:00
Riyad Preukschas
45dcb1b5c4 Add jQuery.ScrollTo 2012-11-09 23:35:02 +01:00
Saito
b664b784f1 linguist and web browser will take care of mimetype and encoding problem. 2012-11-10 01:06:20 +08:00
jdamick
12c0408ef5 Update app/views/notify/project_access_granted_email.html.haml 
changing wording to sound more better.
 2012-11-09 11:03:42 -05:00
Saito
f1ac2a616b remove encode lib, clean all encoded area. 2012-11-09 01:41:07 +08:00
Dmitriy Zaporozhets
784cb886cf Sign in screen: removed hr, added clearfix 2012-11-07 17:49:52 +02:00
Dmitriy Zaporozhets
b7445bb006 Fix github issue #1946 2012-11-07 17:15:41 +02:00
Dmitriy Zaporozhets
8114d36caf Merge pull request #1720 from coagulant/wiki_search 
Wiki search
 2012-11-07 03:51:20 -08:00
Riyad Preukschas
10d881c9ca Line anchors for file view 2012-11-07 13:31:26 +02:00
Riyad Preukschas
be4138af75 Log caught exceptions 2012-11-06 21:16:47 +01:00
Dmitriy Zaporozhets
96b2959fe3 Styled chosen css. Lighter box shadow for blocks 2012-11-06 19:31:01 +02:00
Dmitriy Zaporozhets
949233aa1f Changed default icon for gravatar. Moved filter out of layout 2012-11-06 13:47:43 +02:00
Dmitriy Zaporozhets
f555578414 Added EventFilter class. Compeleted first version of dashbaord filtering 2012-11-05 20:12:26 +02:00
Dmitriy Zaporozhets
ba567c8d76 Merge pull request #1914 from tsigo/issue/1910 
Fix double icon on header button hover
 2012-11-05 03:27:48 -08:00
Valeriy Sizov
4f04d7df66 Merge pull request #1915 from tsigo/issue/1912 
Fix rendered action for password change failure
 2012-11-05 01:29:03 -08:00
Robert Speicher
89d9319a79 Fix rendered action for password change failure 
Closes #1912
 2012-11-04 16:47:37 -05:00
randx
f082c8ae2a Decouple and refactor GraphCommit 2012-11-04 23:43:33 +02:00
Robert Speicher
97bf7ac397 Fix double icon on header button hover 2012-11-04 16:29:44 -05:00
Dmitriy Zaporozhets
f8e27b92bf Merge pull request #1902 from tsigo/breadcrumbs 
Fix breadcrumb links on Commits page
 2012-11-02 03:46:27 -07:00
Riyad Preukschas
48de0ba867 Fix source for iframe on Resque admin page 2012-11-01 23:34:16 +01:00
Robert Speicher
e60185699b Add 'breadcrumbs' helper for Commit breadcrumb links 
Closes #1731
 2012-11-01 17:58:13 -04:00
Robert Speicher
badb092a2d Don't initialize Tree History unless tree-slider is present 
This was breaking breadcrumb links on non-Tree pages
 2012-11-01 17:57:12 -04:00
Robert Speicher
57e6777b3c Remove "remote" attribute from Tree breadcrumb links 
See https://github.com/gitlabhq/gitlabhq/pull/1665#discussion_r1804447
 2012-11-01 17:56:39 -04:00
Dmitriy Zaporozhets
d9c20cf5a6 Fix 404 errors on Merge Request -> new 2012-10-31 14:29:42 +02:00
Dmitriy Zaporozhets
404040d7ae Fix invalid template path for huge commit 2012-10-30 13:35:57 +02:00
Dmitriy Zaporozhets
8272e18e57 Project path validation: array of not allowed paths 2012-10-30 13:27:15 +02:00
randx
36dbac2fd9 More seeds 2012-10-30 10:03:21 +02:00
randx
e4cf99db46 Refactor milestones related functionality. Added seeds for Milestine and MR 2012-10-30 09:22:24 +02:00
Valeriy Sizov
53a3be03fc Update app/views/profile/account.html.haml 
TYPO #1870
 2012-10-30 00:32:32 +02:00
Valeriy Sizov
9d56c7f657 Update app/views/shared/_no_ssh.html.haml 
TYPO
 2012-10-30 00:29:13 +02:00
randx
a8398e5124 Fix merge request count for milestone index 2012-10-29 23:50:35 +02:00
randx
e705344daa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-10-29 23:46:46 +02:00
randx
f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +02:00
Riyad Preukschas
0a9adbbe4a Fix no SSH key warning 2012-10-29 21:51:28 +01:00
randx
d4e070cfad Improve styles. Add merge request completness to milestone percentage 2012-10-29 22:40:00 +02:00
randx
ecdf778e80 Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr 
Conflicts:
	app/views/merge_requests/_form.html.haml
 2012-10-29 21:37:46 +02:00
Dmitriy Zaporozhets
50a6c614b5 Merge pull request #1818 from riyad/refactor-satellite-actions 
Refactor Satellite Code
 2012-10-29 04:12:26 -07:00
Sergio Visinoni
263282dec9 Show Milestone information in MR Listing 
When a MR belongs to a Milestone, show this information in the listing
with a small box telling the Milestone title.
 2012-10-28 09:31:52 +01:00
Riyad Preukschas
646bad43e9 Fix styles 2012-10-27 18:27:51 +02:00
Riyad Preukschas
3d0197246e Use #author_link for blame, commits and tree 2012-10-27 18:27:47 +02:00
Riyad Preukschas
c78359a84b Generalize CommitDecorator#author_link to #person_link 2012-10-27 18:15:00 +02:00
Riyad Preukschas
17cec05087 Make new/edit issue forms use containers on the page instead of adding their own 
Fixes #1830
 2012-10-27 17:54:24 +02:00
Riyad Preukschas
2f5e44a02d Enable/disable from buttons on all input events (not just key events) 
Fixes #1836
 2012-10-27 17:00:51 +02:00
randx
3c5a3fe0ae Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end 
Conflicts:
	app/views/issues/_form.html.haml
 2012-10-27 11:24:11 +03:00
randx
72f984e3d3 Prevent grit from caching graph commits 2012-10-26 21:52:26 +03:00
Dmitriy Zaporozhets
1c9351abf0 Restyle branches list. Remove unneccesary styles from tree avatar 2012-10-26 19:00:09 +03:00
Dmitriy Zaporozhets
b4708d006c Restyled git tags page. Added truncated tags message 2012-10-26 18:37:12 +03:00
Sergio Visinoni
e51c37bdbd Display Merge Requests <-> Milestone relations 
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
 2012-10-26 16:12:40 +02:00
Sergio Visinoni
a7d0816933 Add Milestone information in Merge Requests 
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
  Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
  Merge Requests listing page
 2012-10-26 16:12:40 +02:00
Riyad Preukschas
700a784bc9 Refactor EditFileAction#update and rename it to commit! 2012-10-26 01:59:50 +02:00
Riyad Preukschas
fba8ad5607 Move Gitlab::Satellite into the Satellite module 2012-10-26 00:56:24 +02:00
Riyad Preukschas
5f16687805 Update arguments for Gitlab::Satellite::EditFileAction#initialize 2012-10-26 00:39:23 +02:00
Riyad Preukschas
55779b00ea Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction 2012-10-26 00:33:53 +02:00
Riyad Preukschas
8c89beb6f9 Change argument order for satellite actions to always start with the user 2012-10-26 00:26:47 +02:00
Riyad Preukschas
78235edda8 Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction 2012-10-26 00:19:01 +02:00
Riyad Preukschas
0447ab375a Extract shared/clone_panel partial 2012-10-25 23:39:02 +02:00
Riyad Preukschas
ff396e0a7e Extract search field into a partial 2012-10-25 23:39:02 +02:00
hardchor
b5ced56ba4 Some grammatical improvements 
Nothing too dramatic, just some improvements.
 2012-10-25 22:11:06 +02:00
Dmitriy Zaporozhets
11452c903f Fix 500 error on tree view woth submodule 2012-10-25 12:30:09 +03:00
Dmitriy Zaporozhets
6d0dcb6614 Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE 2012-10-25 12:16:14 +03:00
Scott Holden
2335d7b9cf Fix broken Note scopes with lambdas, 4.0 compat 
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
 2012-10-24 21:54:15 -07:00
Valery Sizov
38175209c5 Merge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq 2012-10-24 12:56:47 +00:00
Dmitriy Zaporozhets
a7efeb3781 Fix chrome issues list 2012-10-24 15:25:28 +03:00
Dmitriy Zaporozhets
6f4576b743 Spinach feature 2012-10-24 15:23:04 +03:00
Dmitriy Zaporozhets
b7a9e41bd2 Handle perfomance issue with team import. Model specs 2012-10-24 14:52:17 +03:00
Dmitriy Zaporozhets
fd0aca1225 Feature implemented 2012-10-24 14:20:53 +03:00
Staicu Ionut
2d7062d8fc Added autofocus for issue title 2012-10-24 14:06:10 +03:00
Dmitriy Zaporozhets
b2df61d85a Fix 500 error on admin project if empty 2012-10-23 11:29:47 +03:00
randx
9902f1af6e Reduce line-height for commits diff lines 2012-10-22 23:49:21 +03:00
randx
e51b2d58e7 Restyled last push widget. Increased line-height for td in tables 2012-10-22 23:37:50 +03:00
randx
83dc5f9362 Fix issue with removing group 2012-10-22 21:21:34 +03:00
Marin Jankovski
d75cc7eafd Display https as repo clone indicator and prevent modification of web_protocol variable. 
Rewrite build_url, use web_protocol for repo indicator.

Explicitly initialize custom port to make the logic obvious.
 2012-10-21 15:48:34 +02:00
Dmitriy Zaporozhets
cd9f135a66 Merge pull request #1717 from riyad/add-author-to-tree-listing 
Update author info in tree listing
 2012-10-21 04:08:45 -07:00
randx
0189ee97ed Security for online editor. Replace dev_access?, master_access? with can? method usage 2012-10-21 12:12:14 +03:00
Riyad Preukschas
d4e3664067 Fix bug in MergeRequest#mark_as_unmergable 2012-10-20 15:27:34 +02:00
Riyad Preukschas
122769e358 Refactor Gitlab::Merge 
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
 2012-10-20 15:25:48 +02:00
Nihad Abbasov
414080cb03 remove unnecessary snippets.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
c28722689d merge graph.js into projects.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
41ec540033 remove unnecessary loader.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
57c134c39a cleanup coffeescript code for mentions auto-complete 2012-10-19 03:41:10 -07:00
Nihad Abbasov
ec1bccb261 use 'js-' prefix for behavioral 'gfm-input' class 2012-10-19 03:41:10 -07:00
Nihad Abbasov
46921e690e cleanup main.coffee 2012-10-19 03:41:10 -07:00
Riyad Preukschas
4fd73683d9 Update author info in tree view 2012-10-18 20:53:35 +02:00
Riyad Preukschas
aef2031ad6 Add CommitDecorator#author_link 2012-10-18 20:16:52 +02:00
Riyad Preukschas
b3a5f0a78d Fix wrong parameter order in Team#team_member_by_name_or_email 2012-10-18 20:16:52 +02:00
Dmitriy Zaporozhets
c007325451 Merge pull request #1712 from riyad/use-gem-for-emoji 
Use gem for Emoji
 2012-10-18 00:28:47 -07:00
Riyad Preukschas
413778b645 Rename NoteObserver methods and clarify things 2012-10-18 01:14:10 +02:00
Riyad Preukschas
853c69c48a Reorder and group methods in Notify mailer 2012-10-18 01:14:09 +02:00
Riyad Preukschas
ce91014730 Fix use of Emoji 2012-10-18 01:10:35 +02:00
randx
e0c43c46dd Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard 2012-10-17 22:02:52 +03:00
Valeriy Sizov
8e989d4863 revert all wiki changes 2012-10-17 16:14:20 +03:00
Valeriy Sizov
31f1cebe4b Wiki style: move styles to right place 2012-10-17 15:17:27 +03:00
Valeriy Sizov
607d8b7970 Wiki Style Fixing 2012-10-17 15:09:16 +03:00
Valeriy Sizov
7166739086 Merge pull request #1715 from riyad/use-font-awesome 
Use Font Awsome for icons
 2012-10-17 03:08:12 -07:00
Valeriy Sizov
372220d35b WebEditor: Cancel button. Confirm #1705 2012-10-17 00:27:47 +03:00
Valeriy Sizov
234eb7a8e4 WebEditor: rename button save -> commit #1705 2012-10-17 00:15:56 +03:00
Valeriy Sizov
ec05d9daf9 WebEditor: show branch #1705 2012-10-17 00:13:45 +03:00
Valeriy Sizov
d21443d1c6 Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons 
Fix issue close and reopen button text and styles
 2012-10-16 14:05:53 -07:00
Valeriy Sizov
8ee8f36f6e WebEditor: fix unknown theme in production mode 2012-10-16 23:52:44 +03:00
Ilya Baryshev
e6524a919e Wiki search 
Very basic, using LIKE, and no search snippets.
 2012-10-16 23:05:11 +04:00
Riyad Preukschas
789e4b848c Import Font Awesome styles 2012-10-16 20:48:32 +02:00
Riyad Preukschas
fa4c38f32b Fix issues close and reopen button text and styles 2012-10-16 19:17:48 +02:00
Riyad Preukschas
8e8d82d49a Only allow editing text files 2012-10-16 12:45:48 +02:00
Riyad Preukschas
ad5a6a4ae1 Improve flash messages in tree#update 2012-10-16 12:45:30 +02:00
randx
76e1ca6430 tree.readme method added 2012-10-16 09:48:55 +03:00
randx
453b2ae68b Fix plain text readme 2012-10-16 09:43:22 +03:00
Dmitriy Zaporozhets
e8d6c3c1b6 Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency 
Refactor tree views and improve consistency
 2012-10-15 23:33:49 -07:00
Riyad Preukschas
866b9f6d91 Make history link for trees look like action links for blobs 2012-10-16 00:57:15 +02:00
Riyad Preukschas
763022d698 Remove redundant branch labels from MR form 
Fixes #1525
 2012-10-16 00:46:48 +02:00
Riyad Preukschas
536eb8e828 Remove #history_path and #mb_size from TreeDecorator 2012-10-15 23:42:44 +02:00
Riyad Preukschas
d40d2dd809 Fix offered links in tree/blob_actions partial 2012-10-15 23:42:08 +02:00
Riyad Preukschas
b80a019598 Use tree/blob_actions partial for blame view and fix file name encoding 2012-10-15 23:40:56 +02:00
Riyad Preukschas
3304262c3d Display more accurate file size in tree/blob/download partial 2012-10-15 23:40:21 +02:00
Riyad Preukschas
d96a807db7 Display file size instead of mode in tree/blob partial 2012-10-15 23:40:18 +02:00
Riyad Preukschas
d060856044 Extract out tree/blob/* partials 2012-10-15 23:40:06 +02:00
Riyad Preukschas
1f4d8eac24 Extract tree/readme partial 2012-10-15 23:40:02 +02:00
Riyad Preukschas
5cff72ad1e Extract tree/blob_actions partial 2012-10-15 23:39:49 +02:00
Riyad Preukschas
2f05ab1491 Rename tree/tree_file partial to tree/blob 2012-10-15 23:38:35 +02:00
Dmitriy Zaporozhets
e84d90c1e7 Merge pull request #1692 from riyad/saner-note-methods 
Small Note code cleanup
 2012-10-15 10:11:00 -07:00
randx
bd5dbe14e4 Merge branch 'web_editor' 2012-10-15 19:52:10 +03:00