Commit graph

3559 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
2be5e6d443 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-12-02 12:18:48 +02:00
Dmitriy Zaporozhets
f2e1c8b709 Merge pull request #2138 from jouve/refactor_flash
refactor flash
2012-12-02 02:18:34 -08:00
Valeriy Sizov
1dfbce20d1 Merge pull request #2148 from jojosch/fix-2147
commit diff - check if prev_commit is not nil
2012-12-01 14:02:53 -08:00
Johannes Schleifenbaum
0323610b72 commit diff - check if prev_commit is not nil 2012-12-01 19:31:39 +01:00
Dmitriy Zaporozhets
e9212b0aa2 Merge pull request #2141 from NARKOZ/notes-text-limit
remove length limit from notes
2012-12-01 10:30:10 -08: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
Nihad Abbasov
270a43370a API: get a single wall note 2012-12-01 02:20:45 -08:00
Nihad Abbasov
b17e94c37b update contents of API README 2012-12-01 02:07:57 -08:00
Nihad Abbasov
42ef89c98a API: expose created date for project hooks and user SSH keys 2012-12-01 02:04:44 -08:00
Nihad Abbasov
968c09ae91 API version returns last version set
* fixed in grape v0.2.2
2012-12-01 02:03:51 -08:00
Dmitriy Zaporozhets
35f0566e08 gitlab meta to 4.0 2012-11-30 23:08:08 +02: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
10ec9b2293 Merge pull request #2017 from duksis/backup_restore
bugfix: backup data retrieved with the same type keys as saved
2012-11-30 12:48:27 -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
8bf340f568 change version to 4.0.0pre 2012-11-30 16:47:04 +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
Valeriy Sizov
cf12763d5b Merge pull request #2127 from NARKOZ/notes-api
API: don't expose 'updated_at' for notes
2012-11-30 01:09:49 -08:00
Nihad Abbasov
ee6187bd55 API: ability to create a wall note 2012-11-29 15:52:56 -08:00
Nihad Abbasov
2a98a060ca API: don't expose 'updated_at' for notes 2012-11-29 14:41:24 -08:00
Nihad Abbasov
eb061b9b06 fix label name 2012-11-29 14:26:18 -08:00
Dmitriy Zaporozhets
2d17d6f1bc Merge pull request #2123 from NARKOZ/notes-api
Notes API
2012-11-29 13:05:57 -08:00
Nihad Abbasov
24047e1e8d update CHANGELOG 2012-11-29 12:35:16 -08:00
Nihad Abbasov
658f260e98 add docs for notes API 2012-11-29 12:32:05 -08:00
Nihad Abbasov
961cb285b0 API: restore broken merge request commenting 2012-11-29 12:11:01 -08:00
Nihad Abbasov
c946bf886c API: create new notes 2012-11-29 12:11:00 -08:00
Nihad Abbasov
1c5aa848ce API: get a single note 2012-11-29 12:11:00 -08:00
Nihad Abbasov
9a4974b760 correct example 2012-11-29 12:11:00 -08:00
Nihad Abbasov
01eab583d0 API: list wall, snippet and issue notes 2012-11-29 12:11:00 -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