Flavio Copes
be3a2b8f46
Move inside if
2015-12-10 18:12:12 +01:00
Flavio Copes
23c6e262ef
Indent properly
2015-12-10 18:03:10 +01:00
Flavio Copes
ca2c251aa4
Add missing {% set value = form.value(field.name) %}
2015-12-10 18:02:12 +01:00
Andy Miller
87aa4b36c9
Merge branch 'develop' into feature/admin_registration
2015-12-10 09:47:37 -07:00
Flavio Copes
1d5093f4ff
Tweak messages.html.twig to include form error messages
2015-12-10 13:05:06 +01:00
Flavio Copes
86ea5893fa
Drop unneeded method
2015-12-10 13:04:49 +01:00
Flavio Copes
4c109d002c
Admin registration working
2015-12-10 12:07:36 +01:00
Flavio Copes
11557780f1
Fix issue in base_url_relative_frontend on sites not running on a subfolder
2015-12-10 10:17:32 +01:00
Flavio Copes
5dda11e6b3
Fix #334 didn't use param sep
2015-12-10 10:17:02 +01:00
Andy Miller
c1311567b4
more progress with the registration
2015-12-09 21:37:34 -07:00
Andy Miller
03fd601a49
cleaned up the buttons
2015-12-09 18:56:39 -07:00
Andy Miller
3ca0c17f27
slowly prettying up the registration form
2015-12-09 18:07:51 -07:00
Andy Miller
cb3127f545
Merge branch 'develop' into feature/admin_registration
2015-12-09 17:22:32 -07:00
Flavio Copes
069ff8fe7c
Merge pull request #332 from MATsxm/patch-10
...
Update languages.yaml
2015-12-09 08:54:07 +01:00
Marc-Antoine Thevenet
1446a6a29e
Update languages.yaml
...
few /fr adjustments
Thanks
2015-12-08 18:41:56 -04:00
Matias Griese
593ca0eeb0
Merge pull request #331 from getgrav/feature/gantry
...
Add support for Gantry into Grav admin
2015-12-08 10:16:40 +02:00
Matias Griese
25b1fd5be9
Merge branches 'develop' and 'feature/gantry' of https://github.com/getgrav/grav-plugin-admin into feature/gantry
...
# Conflicts:
# themes/grav/css-compiled/template.css
# themes/grav/css-compiled/template.css.map
2015-12-08 10:15:18 +02:00
Flavio Copes
c274270c94
Add CSS fix for tabs in plugin/theme settings
2015-12-07 10:40:47 +01:00
Matias Griese
afe830c0c7
Merge branches 'develop' and 'feature/gantry' of https://github.com/getgrav/grav-plugin-admin into feature/gantry
2015-12-07 10:45:52 +02:00
Flavio Copes
b2140c5814
Merge pull request #328 from getgrav/feature/allow-to-hide-markdown-preview
...
Allow to set hidePreview: true on `markdown` field type when defining blueprints. Since the preview is based around the concept of a page, and renders its content, we cannot use it there
2015-12-04 20:43:17 +01:00
Flavio Copes
828b0e7f78
Instead of requiring an option to disable preview, disable by default. Enable on demand.
2015-12-04 20:43:04 +01:00
Flavio Copes
f0da78f0a6
Allow to set hidePreview: true on markdown field type when defining blueprints. Since the preview is based around the concept of a page, and renders its content, we cannot use it there
2015-12-04 20:23:41 +01:00
Flavio Copes
b06800bc16
Clean unused code
2015-12-04 20:01:49 +01:00
Flavio Copes
1b0285836d
Fix #323 , regression introduced in b7caab8677
...
@w00fz I partially reverted b7caab8677
2015-12-04 20:01:49 +01:00
Andy Miller
fb30324187
started work on admin registration logic
2015-12-04 11:58:28 -07:00
Andy Miller
065e01926d
updated admin login page
2015-12-04 11:24:30 -07:00
Flavio Copes
0f63953d83
Merge pull request #327 from diomed/patch-1
...
Update languages.yaml
2015-12-04 17:57:11 +01:00
Kruno H
0771c8b87a
Update languages.yaml
2015-12-04 17:54:26 +01:00
Flavio Copes
59f6fdc0e4
Translate the "Activate" string
2015-12-04 17:42:24 +01:00
Andy Miller
32e66e2114
Merge pull request #326 from MATsxm/patch-9
...
Update languages.yaml
2015-12-03 20:18:55 -07:00
Andy Miller
71bad4b194
Merge branch 'develop' into feature/gantry
2015-12-03 17:55:06 -07:00
Andy Miller
74923aba86
Force timestamp on assets based on GRAV_VERSION
2015-12-03 16:57:27 -07:00
Marc-Antoine Thevenet
cf37b99e11
Update languages.yaml
...
and here comes the /fr ;)
Thanks
2015-12-03 18:38:14 -04:00
Andy Miller
bce9df726c
Merge pull request #325 from tcsizmadia/develop
...
Updated languages.yaml
2015-12-03 14:54:13 -07:00
Tamas Csizmadia
a1ff8245ca
Updated languages.yaml
...
Hungarian translation of new string (INVALID_SECURITY_TOKEN).
2015-12-03 22:51:22 +01:00
Andy Miller
71872d607a
Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into develop
2015-12-03 14:47:40 -07:00
Andy Miller
1f3ef3aebb
Use new methods to disable CSS/JS Pipeline if available (without effecting config) #318
2015-12-03 14:47:34 -07:00
Djamil Legato
4486acbdd1
Merge pull request #324 from CoolGoose/patch-1
...
fixed cli user creation
2015-12-03 12:16:32 -08:00
Alexandru Bucur
855bc1985e
fixed cli user creation
2015-12-03 21:21:58 +02:00
Flavio Copes
71e1fdfa7b
Return "Invalid Security Token" instead of "Unauthorized". Also, return that string for AJAX calls
2015-12-03 17:44:56 +01:00
Flavio Copes
3af03e2f8e
Throw exception when used within the PHP builtin webserver
2015-12-03 17:29:46 +01:00
Flavio Copes
939eadce08
Merge pull request #320 from MATsxm/patch-8
...
Update languages.yaml
2015-12-03 16:19:09 +01:00
Marc-Antoine Thevenet
39b1bff4aa
Update languages.yaml
...
/fr improvements
2015-12-02 20:34:24 -04:00
Djamil Legato
9b439163ec
Added RocketTheme Apps font
2015-12-02 13:54:37 -08:00
Flavio Copes
3c45f97264
Remove noreply@getgrav.org default address
2015-12-02 18:42:33 +01:00
Flavio Copes
48f6da2bc3
Handle case where the email plugin "from" email is not configured
2015-12-02 18:11:24 +01:00
Matias Griese
f3506291a6
Add onAdminThemeInitialized event into admin Themes::init()
2015-12-02 17:22:48 +02:00
Andy Miller
09cbe091df
Merge pull request #317 from tcsizmadia/develop
...
Fixed typos and some corrections in Hungarian translation.
2015-12-01 18:46:18 -07:00
Tamas Csizmadia
a104b71250
Updated languagaes.yaml
...
Tweaks and a fixed typo in Hungarian translation.
2015-12-01 22:43:14 +01:00
Tamas Csizmadia
fd304ede76
Updated languages.yaml
...
Fixed translations for ADMIN_ACCESS and SITE_ACCESS (better meaning)
2015-12-01 21:58:47 +01:00
