github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-05 09:03:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,269 Commits 85 Branches 50 Tags 182 MiB
42ecee42a1
Commit Graph

2269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toby Zerner
a9969119d2 Merge branch 'master' of https://github.com/flarum/core 2017-07-08 21:52:01 +09:30
Toby Zerner
94a8eaec64 Update dependencies 2017-07-08 21:50:54 +09:30
Franz Liedke
8ea13dc826
Flatten implementation of SelfDemotionGuard listener 
Refs #736 and #1195.
 2017-07-06 21:57:47 +02:00
David Sevilla Martín
99d42372c3 Prevent yourself from locking yourself out of admin group (#1195) 2017-07-06 21:43:01 +02:00
Franz Liedke
01b56eecdb Merge pull request #1201 from Luceos/patch-3 
Update AbstractSerializer.php
 2017-06-23 00:02:16 +02:00
Franz Liedke
bcdcb8c20e Merge pull request #1202 from Luceos/patch-4 
Update WebAppView.php
 2017-06-23 00:02:02 +02:00
Daniël Klabbers
d6c99eccdb Update WebAppView.php 
Added argument type hinting where absent.
 2017-06-22 16:27:10 +02:00
Daniël Klabbers
01cb8ab79d Update AbstractSerializer.php 
Fixes missing argument in method. Verified it has to be a string.
 2017-06-22 14:28:51 +02:00
Franz Liedke
877aed215b Merge pull request #1199 from Luceos/patch-2 
Update StartSession.php
 2017-06-20 08:17:39 +02:00
Daniël Klabbers
57570d960e Update StartSession.php 
Fixed CookieFactory typo in phpdoc.
 2017-06-19 16:47:20 +02:00
Daniël Klabbers
04c4806f6f making posts and discussions private (#1153) 
* flagrow/byobu#11 making posts and discussions private

* tested migrations and tested setting is_private on discussion and post manually

* added phpdoc for Post and Discussion and added the casting for these attributes

* satisfying styleci

* fixes for review

* added new private discussion event and included it in the access policy

* added new private post event and included it in the access policy
 2017-05-27 14:19:15 +09:30
Davis
4c0339c30e Allow JSON to be used for Install Command (#1193) 
* Allow JSON to be used for Install Command

* Return configuration as array instead of object.

* Update InstallCommand.php
 2017-05-27 14:18:09 +09:30
David Sevilla Martín
e64dc4ea45 Add viewUserList permission (#1190) 2017-05-24 22:06:56 +09:30
Franz Liedke
305076814f Merge pull request #1189 from datitisev/762-exclude-files-from-distribution 
Update .gitattributes to exclude files for distribution
 2017-05-20 13:42:34 +02:00
David Sevilla Martin
e31edd29d2
Exclude files for distribution using .gitignore 2017-05-18 18:46:55 -04:00
David Sevilla Martín
23b423c6ce #1184 Fix /api/posts returning 500 (#1188) 
* Fix ListPostsController::applyFilters not receiving array if argument not present

* Whoops! Use `[]` instead of `array()`

* Update AbstractSerializeController.php

* Update ListPostsController.php
 2017-05-18 22:04:00 +02:00
Franz Liedke
1af1f472f9
Recompile dist JavaScript 2017-05-18 09:14:06 +02:00
Franz Liedke
7c86f7a34c Merge pull request #1186 from flarum/Luceos-patch-1 
Update UserControls.js
 2017-05-18 09:13:28 +02:00
Daniël Klabbers
14e49269d6 Update UserControls.js 
Possibly c/p mistake with argument name. UserControls using argument discussion in controls method.
 2017-05-17 14:07:38 +02:00
Zeokat
7837fff107 Support PNG avatars with transparent backgrounds and fix EXIF rotation (#1168) 
As `orientate` requires the EXIF extension, we can only call it if the extension is installed.

Fixes #1161 and #1163.
 2017-05-10 21:23:08 +02:00
Franz Liedke
3dfa6bc8cb Merge pull request #1179 from flarum/Luceos-patch-1 
Update mixin.js
 2017-05-09 23:07:16 +02:00
Daniël Klabbers
e47fe288fa Update mixin.js 
Typo fixed
 2017-05-09 13:58:07 +02:00
Franz Liedke
03e30d7d4f Merge pull request #1178 from flarum/Luceos-patch-1 
Update HandleErrors.php
 2017-05-09 08:57:26 +02:00
Daniël Klabbers
9836ff6c54 Update HandleErrors.php 
@franzliedke forgot to make variables available to the method, just triggered this but got a warning that all three variables are undefined.
 2017-05-08 16:45:58 +02:00
issyrocks12
bb1c655c90
Change to switch to fit style 2017-05-04 22:36:37 +02:00
Franz Liedke
bf20fe595a
Fix incorrect sort field name 
Closes #1175.
 2017-05-04 21:37:03 +02:00
Franz Liedke
b5db57156b Merge pull request #1172 from tpokorra/fixDefaultLanguageSelection 
Admin: fix default language selector
 2017-05-02 08:37:32 +02:00
Timotheus Pokorra
a7d3bdf244 Admin: fix default language selector 
the binding of the control to the value was missing
fixes #1164
 2017-05-01 18:46:12 +02:00
Franz Liedke
c82f0bde61 Merge pull request #1155 from ssfinney/feature/mediumtext_for_post_content_column 
Change content column from TEXT to MEDIUMTEXT
 2017-04-13 08:04:05 +02:00
Stephen Finney
986102c1d3 Change content column from TEXT to MEDIUMTEXT 
Fixes #1044
 2017-04-09 16:12:34 -04:00
Franz Liedke
2140619c0b
Prevent reverting editable user bio on click 
Turns out the click handler was bound to the surrounding element
rather than the one that wraps the rendered bio when it is not
being edited.

Fixes #1145.
 2017-03-17 22:14:51 +01:00
Franz Liedke
2f714a01ed
Cookies: Set expires flag for remember cookies 
Without this, session remembering would not work in Internet
Explorer (and Edge?).

Fixes #1127.
 2017-03-14 22:25:20 +01:00
Franz Liedke
231d018de5
Add link() and setCanonicalUrl() methods to the WebAppView 
These make it easier for controllers to define relationships from
the current to other pages, which is important for SEO mostly.
 2017-03-13 18:08:32 +01:00
Franz Liedke
5d62231004
Fix comment typo 2017-03-13 12:52:25 +01:00
Franz Liedke
123c3a93f5
Fix indentation 2017-03-12 23:05:04 +01:00
Franz Liedke
c1eec2b261
Fix indentation 2017-03-12 23:03:46 +01:00
David Sevilla Martín
60d3d6ef99 Add option to hide the language selector (#1106) 
* Added option to hide the language selector in the header
* Added `hide_language_selector` Switch to BasicsPage
* Added `hideLanguageSelector` property to ForumSerializer
* Apparently fixed the "Add Extension" button locale.... someone must not have compiled their changes :P

* Changed hideLanguageSelector (and such) to showLanguageSelector

* Change `core.admin.basics.show_language_selector_heading` to be `_label`

* Change showLanguageSelector in ForumSerializer to be boolean, default: true

* Ooops! Remove console.log 🤦‍♂️
 2017-03-07 10:04:44 +10:30
Toby Zerner
7862bd32dd Merge pull request #1141 from sijad/fix-logout-redirect 
prevent unsafe redirect via logout controller
 2017-03-04 22:10:18 +10:30
Sajjad Hashemian
92b555a246 prevent unsafe redirect via logout controller 2017-03-04 14:51:21 +03:30
Toby Zerner
687ec6a199 Merge pull request #1131 from flarum/866/affixSidebar-resize 
Affix sidebar when window is resized
 2017-03-03 15:24:13 +10:30
Franz Liedke
f788a0a972
Fix nesting of rename_discussion translations 
Refs flarum/flarum-ext-english#98.
 2017-02-28 22:42:41 +01:00
Franz Liedke
e7bec9fe29 Merge pull request #1135 from sijad/add-noindex-header 
Prevent crawlers to index nojs pages
 2017-02-27 18:13:38 +01:00
Franz Liedke
57da4e24cb
Rename translation key 2017-02-26 23:47:20 +01:00
Franz Liedke
7d1a22bcb5
Rename modal component 2017-02-26 23:44:57 +01:00
Sajjad Hashemian
8cc117d89d Prevent crawlers to index nojs pages 2017-02-26 19:48:33 +03:30
Franz Liedke
31ef02dc2c
Compile dist JS 2017-02-17 00:19:33 +01:00
Franz Liedke
95c9ff9243
Affix sidebar when window is resized 
Fixes #866.
 2017-02-17 00:08:20 +01:00
Franz Liedke
9718f54683 Merge pull request #1130 from clarkwinkelmann/patch-1 
Fix asset path when unpublishing
 2017-02-16 09:17:32 +01:00
Clark Winkelmann
bb1e3278de Fix asset path when unpublishing 2017-02-16 01:51:33 +01:00
Franz Liedke
bbcc33b5b5
Turn a few setters/getters into public attributes 
There were no type hints etc. going on, and we would have needed
the getters anyway.

See https://github.com/flarum/core/pull/1105#issuecomment-279310998.
 2017-02-14 22:56:17 +01:00