github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-29 04:33:47 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity
2,180 Commits 87 Branches 50 Tags 181 MiB
687ec6a199
Commit Graph

2180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Franz Liedke
30076547e5 Merge pull request #1126 from janga1997/hideCompiledDiff 
Hide diff for compiled diff files
 2017-02-12 17:46:12 +01:00
janga
7b710d5898 Hide diff for compiled diff files 2017-02-12 10:26:10 +05:30
Franz Liedke
d02b5c9db7 Merge pull request #1124 from Luceos/master 
fixed issues with $extension visibility and typehinting
 2017-02-12 00:53:50 +01:00
Daniël Klabbers
cd70819fd5
fixed issues with $extension visibility and typehinting 2017-02-11 21:14:44 +01:00
Franz Liedke
20b4619e75
Fix Stratigility deprecation, for real this time 2017-02-07 20:52:06 +01:00
Franz Liedke
fdec2fd094
Recompile dist JS 2017-02-04 00:08:16 +01:00
Franz Liedke
d7e4ae09b3 Merge pull request #1113 from oanhnn/patch-1 
Correct image orientation according to Exif data
 2017-02-03 23:50:04 +01:00
David Sevilla Martín
fcfc1b2a37 Add more attributes in app.blade.php and add a setDescription method. (#1105) 
* Added `language` and `direction` properties to WebAppView

* Use properties `language` and `direction` in app.blade.php

* Added WebAppView::setDescription to set the meta description

* Whoops! Changed "ltr" to \'ltr\'. Thanks StyleCI :)

* Removed unnecessary `= null` for

* Changed `.. ? .. : ..` to `.. ?: ..`. Useful thing right there ;)
 2017-02-03 23:09:22 +01:00
Franz Liedke
01eba18164 Merge pull request #1100 from flarum/stratigility-update 
Update to Zend Stratigility 1.3
 2017-02-03 22:03:55 +01:00
Franz Liedke
0dcf7d6aa9
Travis: Run tests on PHP 7.1 as well 2017-02-03 21:53:39 +01:00
Franz Liedke
015967a76c
Require PHP 5.6 2017-02-03 21:53:20 +01:00
renyuneyun
3cd59e12f5 Allow to manually activate users (#1093) 
* Allow to manually activate users

* Use resources instead of hard-coded strings
 2017-02-03 21:13:32 +01:00
David Sevilla Martín
26d07699e9 Turn "Rename Discussion" dialog into a modal, closes #616 (#1083) 
* Changed "Rename Discussion" prompt into a modal.
* Added DiscussionRenameModal component (Modal)
* Changed DiscussionControls.renameAction to use the modal (I may have removed the ability to return a promise)

* Added punycode.js back to js/forum dist

* Fixed some formatting, removed some unnecessary variables
 2017-02-03 20:56:28 +01:00
Franz Liedke
b7d6ba4893
Trim lines 2017-02-03 20:28:04 +01:00
Franz Liedke
d3753d94ae
Throw HTTP 403 on extension validation error 
The way I read it, HTTP 405 is a generic statement about the
resource. Once a language pack is not the default, this is not
true anymore, so I figured 403 is more correct.
 2017-02-03 20:25:21 +01:00
Franz Liedke
9349ed13fc
Make event attributes public 
Without this, reading the extension information would not be
possible for the validator.
 2017-02-03 20:23:24 +01:00
Franz Liedke
91ace15f6d Merge pull request #1032 from dav-is/patch-1 
Prevent deletion of default/all locale(s)
 2017-02-03 20:21:19 +01:00
Franz Liedke
7c1b0bfcf2
Clarify condition 
I want to make it a little more clear that we are checking exactly
for these two values. That may also help preventing further confusion
as to why we are not using empty() here.

Amendment to PR #1033.
 2017-02-03 18:53:21 +01:00
Franz Liedke
542bae6277 Merge pull request #1033 from dav-is/patch-2 
Prevent Overwriting of User's Attributes on Register (#897)
 2017-02-03 18:51:11 +01:00
Franz Liedke
275c14ee7f
Merge pull request #1009 2017-02-03 18:44:03 +01:00
Franz Liedke
bccc970231
Try to extract port from host when installing in console 
The very last suggestion broght up in pull request #989.
 2017-02-03 18:15:52 +01:00
Franz Liedke
da6f79b34a
Ask for database port when installing via console 2017-02-03 18:15:15 +01:00
Franz Liedke
a3cbec25db
Make MySQL port field optional 
Last fix for pull request #989.
 2017-02-03 17:56:02 +01:00
Franz Liedke
2225fdec72 Merge pull request #989 from nielstholenaar/master 
Fixes #825
 2017-02-03 17:51:07 +01:00
Oanh Nguyen
6a532ec14e Correct image orientation according to Exif data 
When using mobile, take a photo and upload it as avatar, it's orientation is incorrect.
This commit will fix this problem.
 2017-01-25 11:49:14 +07:00
Franz Liedke
9416d16ebb Clean up gambit 2017-01-03 21:22:19 +01:00
Li Ji
d6857b0fe5 Add group gambit to support search user by group name (#1073) 
Add group gambit to support search user by group name

/api/users?filter[q]=group:admin
/api/users?filter[q]=group:admin,mod

refer to #256
 2017-01-03 21:13:58 +01:00
Franz Liedke
2c7e7f5b39 Merge pull request #1094 from milescellar/patch-1 
Make Add Extension modal's title translatable
 2017-01-03 21:02:38 +01:00
Franz Liedke
b5b18dd436 Update to Zend Stratigility 1.3 
* Fix dependency version constraint. (Reverts #1066.)
* Allow exceptions to be raised when dispatching middleware.
* Fix our error handler middleware (do not implement Stratigility's
  error handler interface, catch exceptions instead).

See https://docs.zendframework.com/zend-stratigility/migration/to-v2/.

Closes #1069.
 2017-01-02 22:57:09 +01:00
Daniël Klabbers
4778ae5f74 Merge pull request #1099 from milescellar/patch-3 
Update year
 2017-01-02 08:22:43 +01:00
Miles Cellar
0936a630ef Update year 2017-01-01 22:41:35 +01:00
Franz Liedke
ec8ae6e03b Remove unnecessary method call 
This is already the default value in the base SetCookie class.
 2016-12-29 11:17:27 +01:00
Franz Liedke
9ffdeff608 Make StyleCI happy 2016-12-29 11:07:23 +01:00
Franz Liedke
8540932638 Clean up and document code 2016-12-28 23:01:49 +01:00
Franz Liedke
974f45e4e8 Remove unnecessary parameters 2016-12-28 23:01:27 +01:00
Miles Cellar
32ac48c6a9 Make Add Extension modal's title translatable 2016-12-27 01:52:54 +01:00
Toby Zerner
af5b86806a Merge pull request #1092 from sijad/cookie-helper 
Add cookie helper
 2016-12-22 20:30:46 +10:30
Sajjad Hashemian
aeef45b3cd Add cookie factory 2016-12-22 12:00:56 +03:30
Toby Zerner
8aa70de765 Merge pull request #1085 from krnch/krnch-patch-2 
Cookies set with Secure flag in HTTPS mode #1084
 2016-12-11 18:16:04 +10:30