b3e0c1f6c6
Backport 941c920ff67fbaa9f318826b547bb21661c91dc4
...
References #276
2015-01-24 14:07:23 +01:00
2606595416
Backport f223db6
...
References #276
2015-01-24 12:38:50 +01:00
0a7c38a685
Backport 9117b48176
2015-01-23 13:59:26 +01:00
143df857f5
upport
2015-01-23 12:21:34 +01:00
b0e168816d
fix failing error if no freetags installed
2015-01-23 11:10:35 +01:00
e2e16d2a5f
move news to old
2015-01-23 09:40:17 +01:00
33c5a32153
backport
2015-01-23 09:30:57 +01:00
24655cc34f
Prep release
2015-01-23 09:23:23 +01:00
b0f5d30904
Match RELEASE file of 2.0 with master.(This got merged to master, which is why master pointed to 1.6)
2015-01-22 20:23:04 +01:00
e0b361b2a4
sync NEWS
2015-01-22 20:19:42 +01:00
7ba9622a50
Use better search identifier to fix #269
2015-01-22 19:50:42 +01:00
ba7de46d62
extend last smarty bugfix patch
...
References 762283cef90f8e8d5fa36a80
2015-01-22 10:59:53 +01:00
3c63d42ac3
Fix search page order when stable archive is on ( #269 )
2015-01-21 18:57:44 +01:00
762283c937
integrate Smarty 3.1.22-dev fix to clearCompiledTemplate() to avoid purging a wrong directory fallback on dir permission issues
...
7a1df12afa
2015-01-21 11:38:55 +01:00
9418f806d3
cleanup and note once
2015-01-20 15:13:53 +01:00
2efc58c03d
cleanup nl2br
2015-01-20 15:05:26 +01:00
37843bc1bb
Branch out support tree 2.0.x
2015-01-20 10:04:02 +01:00
dad7daf429
Slight tweak for the cats/tags elements
...
References #239
2015-01-19 12:24:20 +01:00
ed880162cb
Tweak taxononmy quick view baseline
...
References #239
2015-01-19 12:11:04 +01:00
24bdb147e0
Move taxonomy quick view back
...
References #239
2015-01-19 11:51:30 +01:00
d375a00046
Move cats/tags quick view below Entry Body
...
References #239
2015-01-19 11:23:50 +01:00
3d2b77e1b5
Revise cats/tags quick view styles
...
(Apparently, I totally misread the comment by @garvinhicking.
Oops.)
References #239
2015-01-19 11:18:39 +01:00
5b640b575c
Add styles to seperate taxonomy sections in entry editor
...
References #239
2015-01-19 10:23:47 +01:00
62d8cce314
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
2015-01-19 09:40:54 +01:00
1a0e039f6f
Add proper lang constants for tags quick view
...
– Also translated the new constants to German
- Also removed duplicate tagsList function (remnant of the merge
conflict)
References #239
2015-01-19 09:38:51 +01:00
2fbf1e32ff
clarify constant
2015-01-19 09:35:44 +01:00
5c5eb9101d
addlang-run for @yellowled
2015-01-19 09:23:12 +01:00
4b83f8dcce
JS-uploader can't download, don't try
2015-01-18 21:00:11 +01:00
dcb044fb28
Set image-owner to all authers with js-upload ( #264 )
2015-01-18 20:33:41 +01:00
4e8a896f84
markup for msg notices
2015-01-18 18:21:19 +01:00
8a464c060f
cleanup prepare
2015-01-18 17:42:12 +01:00
1025ec5748
fix default open ML if in image properties form - give option to jump to ML w/o submittng form
...
References #264 (was not really mentioned there, bur related)
2015-01-18 16:38:03 +01:00
254ecb4c6a
cleanup prepare
2015-01-18 15:38:09 +01:00
3902c88916
fix Resize before Upload not respecting target_filename
...
References #264 (was not really mentioned there)
2015-01-18 14:17:11 +01:00
f6438592c4
one more respect highlighter
2015-01-18 12:51:29 +01:00
7fe1264f00
respect githubs highlighter
2015-01-18 12:47:18 +01:00
1448313fb8
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
...
Conflicts:
templates/2k11/admin/entries.tpl
templates/2k11/admin/serendipity_editor.js.tpl
templates/2k11/admin/style.css
2015-01-17 18:12:15 +01:00
1480e0a88b
ups how come?
2015-01-17 18:11:42 +01:00
4ecc125adb
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
...
Conflicts:
templates/2k11/admin/entries.tpl
templates/2k11/admin/serendipity_editor.js.tpl
templates/2k11/admin/style.css
2015-01-17 18:10:41 +01:00
709253498a
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
...
Conflicts:
include/functions_entries.inc.php
2015-01-17 18:08:19 +01:00
0dc96ec9b8
Fix showing cats/tags list overlay on clicking cats/tags list
...
This was broken due to my recent markup changes. Also added lang
constants for the tags list, but since we could label it better,
introduced new lang constants for it.
References #239
2015-01-17 18:05:20 +01:00
ee50524242
cleanup
2015-01-17 17:53:15 +01:00
47afba18cb
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
2015-01-17 17:43:38 +01:00
7c4f1f1052
Add a 'quick view' for assigned tags to the entry editor
...
Basically replicates the same functionality as for categories. JS
only. Also revised the markup and JS of that for consistency. Too
lazy to make a generic function for it, we can do that later.
References #239
2015-01-17 17:41:35 +01:00
148c67bf9b
Publish now + minor cleanup ( closes #262 )
2015-01-17 17:26:33 +01:00
d80deeb364
to the langs
2015-01-17 16:44:35 +01:00
ba8eb7eea8
New iconfont build with new 'Publish now' icon
...
References #262
2015-01-17 16:42:26 +01:00
6287ce8f7e
Remove text-shadow for 'Publish now' button
...
References #262
2015-01-17 16:35:58 +01:00
d626281228
Introduce new lang constant for 'Publish now' button
...
Add this as title attribute and (hidden) button text for said
button
References #262
2015-01-17 16:25:24 +01:00
b295e617df
Change 'Publish now' button to be a 'normal' icon button
...
- grey, not green
- new icon, button text hidden
- includes new icon build
References #262
2015-01-17 16:21:42 +01:00
