Commit graph

21 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
bea14d6c28 remove unnecessary %br/%hr and styles 2013-07-13 09:05:28 +03:00
Dmitriy Zaporozhets
36fd4de825 Replace page_title with page-title. Correct margin for some blocks/layouts 2013-07-13 08:45:48 +03:00
Dmitriy Zaporozhets
f438bd415f Merge branch 'master' into 6-0-dev
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
2013-06-30 11:35:40 +03:00
Izaak Alpert
c1b05e7b86 Gravatar image fixes when gravatar unavailable
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar  wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)

Conflicts:
	app/assets/stylesheets/themes/ui_bb.scss
	app/views/snippets/_snippet.html.haml

Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets
db03bfa868 Apply user project limit only for personal projects. We should not include group projects for user limit 2013-06-26 14:41:03 +03:00
Dmitriy Zaporozhets
3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Dmitriy Zaporozhets
e1882b535c More userteam links removed. Removed teams spinach tests 2013-06-18 21:54:31 +03:00
Sytse Sijbrandij
a42bfe6f08 Improving grammar. Hat tip Jan Mauritz Faber. 2013-04-12 17:17:29 +02:00
Dmitriy Zaporozhets
9f4fde04f5 Dont show project limit sidebar if user can own 100+ more projects 2013-04-03 18:36:37 +03:00
Marin Jankovski
1734611181 Count owned projects, not just personal 2013-02-18 13:15:35 +01:00
Dmitriy Zaporozhets
b742f47e89 remove old alert messages 2013-01-30 16:53:18 +02:00
Dmitriy Zaporozhets
e2fb18a3ec replace right with pull-right 2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
fb617c61b9 refactor buttons pt2 2013-01-29 22:29:21 +02:00
Dmitriy Zaporozhets
033aa1a885 refactor buttons pt1 2013-01-29 22:18:19 +02:00
Dmitriy Zaporozhets
74e329064a teams refactoring and cleanup pt.1 2013-01-25 16:36:14 +02:00
Dmitriy Zaporozhets
1c88fbb391 show new group, new team links in profile 2013-01-25 16:25:43 +02:00
GitLab
232d61d598 Refactor project creation. Added logout link to profile page 2013-01-17 17:35:57 +02:00
Dmitriy Zaporozhets
d431e43392 Fix few bugs and tests after refactoring ownership logic 2013-01-02 19:32:34 +02:00
Riyad Preukschas
757c7a5291 Fix gravatar and ldap config 2012-12-20 16:54:28 +01:00
Riyad Preukschas
19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01: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
Renamed from app/views/profile/show.html.haml (Browse further)