Ingo Schommer
|
c55c7c33f8
|
Merge branch '3.0'
Conflicts:
admin/code/CMSProfileController.php
composer.json
tests/model/DataObjectTest.php
|
2012-11-22 23:51:28 +01:00 |
|
Sean Harvey
|
aec59de955
|
Adding title to CMSProfileController so translations get default
|
2012-11-07 11:41:48 +13:00 |
|
Ingo Schommer
|
08832261c1
|
Fixed merge errors in CMSProfileController
|
2012-10-30 18:03:49 +01:00 |
|
Ingo Schommer
|
efabde1416
|
Merge remote-tracking branch 'origin/3.0'
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
security/Member.php
|
2012-10-30 17:52:49 +01:00 |
|
Saophalkun Ponlu
|
e3a27ea7da
|
CMS member profile now is no longer in a popup (#7880)
|
2012-10-08 12:57:55 +02:00 |
|
Ingo Schommer
|
e2f073f38a
|
Method visibility according to coding conventions
|
2012-09-20 10:46:59 +02:00 |
|
Simon Welsh
|
f8082e4814
|
MINOR Add newline to end of files without one
|
2012-04-15 10:50:19 +12:00 |
|
Ingo Schommer
|
2abb021efb
|
BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code.
|
2012-03-05 17:41:49 +01:00 |
|
Ingo Schommer
|
02e728fa08
|
BUGFIX Fixed visibility of admin/myprofile for non-admins by moving it to a new CMSProfileController class and overloaded canView()
|
2012-03-02 20:46:22 +01:00 |
|