Stefan Talen
|
347dff7e75
|
Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
modules/backend/behaviors/RelationController.php
modules/backend/classes/WidgetManager.php
modules/cms/classes/CmsCompoundObject.php
modules/cms/twig/Extension.php
modules/cms/twig/PlaceholderNode.php
modules/cms/widgets/TemplateList.php
|
2014-10-18 11:07:17 +02:00 |
Sam Georges
|
df98ae9196
|
Use getQualifiedKeyName when finding existing IDs
|
2014-10-17 08:15:16 +11:00 |
Kris Arnold
|
c75df3a120
|
when building belongsToMany relationships in controllers, the lack of a table name
alias causes an sql ambigious Id error
|
2014-10-16 14:28:36 -05:00 |
|
Stefan Talen
|
b01d3e540f
|
Updating backend/behaviours
|
2014-10-10 22:34:57 +02:00 |
|
Sam Georges
|
bf47eb94ed
|
Str::getRealClass -> class_basename
|
2014-09-29 13:12:34 +10:00 |
|
Sam Georges
|
04462f5b4c
|
The manage form should not share its session key with the parent
|
2014-09-17 09:46:48 +10:00 |
|
Sam Georges
|
001a9f92ff
|
Fixes manage form so widgets fileupload can work correctly inside
|
2014-09-16 17:40:06 +10:00 |
|
Sam Georges
|
347e25babc
|
Add search capability to manage mode (lists)
|
2014-09-06 13:18:55 +10:00 |
|
Sam Georges
|
c916c40fc2
|
Add search support to the view mode
|
2014-09-06 12:51:39 +10:00 |
|
Sam Georges
|
fe3f0bd34e
|
More silly logic errors
|
2014-09-06 12:11:42 +10:00 |
|
Sam Georges
|
2460e54028
|
Update changelog, move relation config under view/manage array respectively
|
2014-09-06 12:09:00 +10:00 |
|
Sam Georges
|
31447df5d4
|
Minor bug - this should be getKeyName
|
2014-09-06 11:45:19 +10:00 |
|
Sam Georges
|
a1998e4348
|
Fixes #500 - Handle custom related key names, don't use session keys for existing parent models
|
2014-08-05 17:40:49 +10:00 |
|
Sam Georges
|
56d0c3351b
|
private -> protected
|
2014-08-01 14:54:16 +10:00 |
|
Sam Georges
|
6388ecef52
|
private -> protected
|
2014-08-01 13:58:59 +10:00 |
|
Sam Georges
|
3c1e6ea846
|
Fixes #481 - Native widget handlers should still initialize
|
2014-07-29 19:22:18 +10:00 |
|
Sam Georges
|
a19cd6f76b
|
For Kerensky
|
2014-07-11 22:24:43 +10:00 |
|
Sam Georges
|
3e1932e7ff
|
Minor
|
2014-07-11 18:52:48 +10:00 |
|
Sam Georges
|
1d4d4c0899
|
Bugfix to relation controller now allowing multiple relations in the same instance
|
2014-07-11 18:51:01 +10:00 |
|
Sam Georges
|
ca529d19d4
|
Use fully qualified primary key name
|
2014-07-07 19:50:07 +10:00 |
|
Sam Georges
|
d912b73aab
|
Clean up event parameters to dev standards
|
2014-07-04 19:14:14 +10:00 |
|
Sam Georges
|
1221faae62
|
Session key fix to relation manager
My Settings context now uses correct breadcrumb
|
2014-07-02 20:49:45 +10:00 |
|
Sam Georges
|
3a275216e2
|
Add styles and readonly mode to relation controller
|
2014-06-30 17:01:53 +10:00 |
|
Sam Georges
|
ca30c3cef0
|
Fixes minor bug
|
2014-06-24 18:53:05 +10:00 |
|
Sam Georges
|
24f7e3eda4
|
Allow override of relation partials
|
2014-06-20 21:36:44 +10:00 |
|
Sam Georges
|
8961906459
|
Add sessionKey support to RelationController.php
|
2014-06-20 20:57:51 +10:00 |
|
Sam Georges
|
d2eb4e2141
|
Add noRecordsMessage to RelationController behavior
|
2014-06-20 19:30:20 +10:00 |
|
Sam Georges
|
d229fb287e
|
Fixes #216 - hasMany related models can now be deleted
|
2014-05-28 22:07:00 +10:00 |
|
Sam Georges
|
dbc4043a90
|
Refs #216 - hasMany related model can now be updated
|
2014-05-28 21:58:39 +10:00 |
|
Sam Georges
|
9e2a76d821
|
Add core build tag to core assets
|
2014-05-24 16:57:38 +10:00 |
Pascal Borreli
|
459c8e0cfa
|
Fixed typos
|
2014-05-17 18:08:01 +02:00 |
|
Sam Georges
|
bdff075058
|
Improve event emitter trait
|
2014-05-15 17:23:46 +10:00 |
|
Sam Georges
|
71a5dd67ab
|
Welcome to the world, October :-)
|
2014-05-14 23:24:20 +10:00 |