0b74db5ad7
remove feedbrowser (other feeds)
2019-03-06 20:02:06 +03:00
54c1b5c611
fill in some missing doctypes; use short doctype where it wasn't
2019-02-23 13:49:40 +03:00
a366da90a6
add label.inline
2019-02-22 12:13:41 +03:00
335147e572
dialogs: use semantic markup instead of dlgsec stuff
...
continue unifying quoting style for html strings
2019-02-22 10:48:56 +03:00
4e253add8c
UI: add some more info links to relevant wiki pages; minor layout updates
2019-02-21 16:21:16 +03:00
26e57604c0
simplify layout of search and subscribe dialogs
2019-02-21 13:22:31 +03:00
f8836ec080
search dialog fixes
...
pgsql: get FTS languages list from the database
2019-02-20 15:12:37 +03:00
4d9141d762
simplify dlgSec-related markup
2019-02-20 14:37:59 +03:00
9e7bbf6809
debugger: use narrow fieldsets for checkboxes
2019-02-19 21:24:00 +03:00
55d2e5871a
feed debugger: dojoify controls
2019-02-19 21:00:15 +03:00
8cd7f31bde
utility css updates
2019-02-19 19:46:09 +03:00
8b26b8629f
headlines-frame: set is-vfeed attribute if result is virtual feed
2019-01-16 21:33:59 +03:00
4729bdb132
queryFeedHeadlines: fix published field not returned when browsing by tag
2018-12-25 16:19:42 +03:00
215c9f0f88
fail better if Feeds.view() data failed encoding to JSON
2018-12-24 12:28:11 +03:00
eda4ac2a2b
add fallback colors for headline feed titles based on feed name if favicon color is not available
2018-12-12 07:57:37 +03:00
f3c04fc5d8
sync modified scores via mutation observer
2018-12-11 10:30:32 +03:00
25ca144bb7
score: get correct classes for rows/score icons on the client
2018-12-11 10:00:54 +03:00
a5813bb766
mysql: use date_format() for yyiw part in queryFeedHeadlines()
2018-12-09 20:38:02 +03:00
3484ad2aaf
Use IYYY in combination with IW
...
Otherwise, we could end up with a wrong date, see:
https://community.oracle.com/thread/997899
2018-12-09 18:28:15 +01:00
fa538a6c86
implement year-week sorting window if headlines buffer is grouped by feed titles
2018-12-09 13:35:37 +03:00
8f5b5ae09e
if not enabled, set content_preview to "" instead of null
2018-12-09 04:24:48 +03:00
bd66a9ef28
render article on the client using headlines data
2018-12-08 09:32:14 +03:00
41e967136f
format headlines list: normalize booleans for pdo mysql
2018-12-08 08:23:18 +03:00
811e1514a3
remove uuid from headlines JSON output
2018-12-07 22:14:32 +03:00
3b7a9219f6
viewfeed: cleanup unneeded stuff from server JSON output
2018-12-07 21:52:41 +03:00
76885fc5ad
viewfeed: general code cleanup
2018-12-07 21:22:51 +03:00
8f75b06835
implement feed grouping display, remove unneeded server vgrlf passing
2018-12-07 21:11:50 +03:00
0b84d1d0dc
viewfeed: add orig_feed object
2018-12-07 18:38:27 +03:00
e075e6141b
json-viewfeed updates
2018-12-07 18:24:56 +03:00
249c93a228
initial for js templates
2018-12-07 16:00:11 +03:00
e9cf8e8e35
normalize archived articles output in headlines
2018-12-06 19:00:11 +03:00
26c074ed7e
rework article header to use flexbox
2018-12-06 16:35:57 +03:00
b4c2b26822
remove collapse.png
2018-12-06 15:28:11 +03:00
0b8cbc9156
remove some bitmaps and rework stuff using it to use iconfont instead
2018-12-06 15:22:52 +03:00
d2d2cb7e7d
rework scoring display, JS processing and icons
2018-12-06 14:23:45 +03:00
8b2286305e
and again
2018-12-06 13:18:14 +03:00
1de1426114
Revert "change fresh feed icon"
...
This reverts commit 69da55b945
2018-12-06 13:16:53 +03:00
69da55b945
change fresh feed icon
2018-12-06 13:13:25 +03:00
c700345c96
trgm: use vector icon, replace recently read icon
2018-12-05 22:48:14 +03:00
cad6d1d7fd
various icon updates; use new icons in feed tree
2018-12-05 20:26:27 +03:00
a0778577ac
remove pub_{set,unset}.png usage in main code
2018-12-05 14:18:03 +03:00
cbd7328cb4
minor fixes to pub/mark icons etc
2018-12-05 14:11:40 +03:00
b65d8384c2
update headlines to use vector icons
2018-12-05 13:58:18 +03:00
89b213b4bb
initial for material-icons
2018-12-05 10:50:50 +03:00
edd348b16c
rework not-cdm headline rows to use flex-box
2018-12-05 09:08:02 +03:00
88c2da72d5
combined mode: use flex-box for header/footer layout
2018-12-05 08:31:13 +03:00
2621180b54
in three panel mode, attach context menu to the title, instead of entire headlines row
2018-12-05 07:34:16 +03:00
2ab097b2e5
initial work for flat modern theme
2018-12-04 22:24:31 +03:00
6befff30d7
updates for flat theme (mostly disable old dijit overrides)
2018-12-04 19:03:42 +03:00
0b8fef8262
combined unexpanded: respect 'SHOW_CONTENT_PREVIEW' preference
2018-12-04 10:47:50 +03:00
27b93988e7
add placeholder loading indicator to CDM entries
...
restore missing "originally from" for archived articles
2018-12-03 20:05:11 +03:00
e76d1fb995
plugins: mail, mailto: remove code from global context
2018-12-03 14:21:50 +03:00
6100392bd5
Fix an `onclick` (`Article.editArticleTags` --> `Article.editTags`)
2018-12-02 16:02:03 -06:00
5ead558e43
move Utils to AppBase where it belongs
2018-12-02 22:08:18 +03:00
ad1b6f0a86
bring back excerpts in unexpanded mode
2018-12-02 19:04:53 +03:00
874560db54
remove obsolete row selection functions
...
move getUrlParam() to Utils
2018-12-02 10:33:58 +03:00
0a18d0b1ed
Feeds: shorten some method names
...
finally rename "view as rss"
2018-12-02 08:57:22 +03:00
6e625555c9
Headlines: shorten selectArticles
2018-12-02 08:34:08 +03:00
3678315bea
Article, Headlines: shorten several method names
2018-12-02 08:32:13 +03:00
cc26be0793
migrate tt-rss.js contents to App
2018-12-01 21:51:00 +03:00
ab0fadf60d
fix vfeed group title CSS in not combined mode
2018-12-01 21:08:15 +03:00
642c37ea61
further effocts to wrap JS stuff into objects
2018-12-01 21:01:53 +03:00
4bed9be57d
js-ification: start on some common dialogs
2018-12-01 18:25:32 +03:00
97df81d8d9
even more objectification of JS
2018-12-01 17:54:16 +03:00
d86ddbc635
further objectification of JS code
2018-12-01 17:21:26 +03:00
049a37aa0e
WIP reshuffling of JS global context into separate logical objects
2018-12-01 17:05:35 +03:00
195180b64d
minor refactoring: normalize some function names; cleanup; etc
2018-12-01 11:18:35 +03:00
a2ef54cd92
toggleMark, togglePub: refactor implementation
...
shorten marked/published img CSS classes
2018-12-01 08:20:09 +03:00
5aa9c60494
bring back (debloated) version of unexpanded combined mode
2018-12-01 01:03:01 +03:00
2e01a1d41d
css updates; night theme fixes for changed CSS classes
2018-11-30 17:42:38 +03:00
07fd4f8d9d
minor css fixes (mostly for zoom mode)
2018-11-30 17:22:30 +03:00
8359ca6dad
combined mode (and more) css class name updates
2018-11-30 15:48:17 +03:00
5f211e37a4
remove FTITLE- id
2018-11-30 14:53:58 +03:00
67cdf4cf12
remove some unnecessary element IDs
...
rework plugins/note to use xhrJson()
2018-11-30 14:39:06 +03:00
b9585004e6
packed headlines: no point in using JSON here
2018-11-30 13:56:33 +03:00
7673331850
headlines: remove collapseBtn
2018-11-30 13:53:58 +03:00
9563e3bcd6
remove expandable CDM headlines
2018-11-30 13:51:54 +03:00
c8c9a26f30
move to simpler CDM handling of encoded content (instead of CENCW... etc)
2018-11-30 13:26:41 +03:00
c10a43069e
debug logging system rework:
...
* support various logging levels per-message
* remove hacks like debug_suppress, DAEMON_EXTENDED_DEBUG, etc
* _debug() is kept as a compatibility shim for plugins
2018-11-30 08:34:29 +03:00
4508e3103d
some more eslint-related stuff
2018-11-29 21:03:55 +03:00
3a0292303e
php: remove trailing whitespaces
2018-11-03 15:08:43 +03:00
2aef804f4b
split transparent rewriting of locally cached media URLs to execute after both sanitize() and HOOK_RENDER_ARTICLE to allow plugins work on original source URLs consistently
2018-08-20 12:12:32 +03:00
5d95676ecc
Call the subscription hook from the plugins even if fetch_file_contents returned no data
...
This allows a plug-in to override the fetch when the core fetch method fails for some feeds (eg. Tumblr feeds when requested from an EU IP).
2018-05-23 09:00:04 +00:00
c30f5e1811
subscribe_to_feed: force-cast login and password to string
2018-01-05 06:50:37 +03:00
8dedacf497
remove synchronous feed refreshing on ForceUpdate
2017-12-31 07:37:49 +03:00
bed2d6e054
force-cast some variables used in queries to integer
...
do not display SQL query in headlines debug mode
2017-12-17 16:24:13 +03:00
0f05147531
properly highlight search keywords containing forward slash
2017-12-15 08:33:59 +03:00
ef1feb3610
subscribe dialog: add primary action
2017-12-11 18:43:53 +03:00
6fb5ce5e35
add some primary dialog actions; update css
2017-12-11 18:36:36 +03:00
5f7be9957f
filter,label dlg: use default action
2017-12-11 18:23:30 +03:00
320a3ba529
search form: set default action
2017-12-11 18:14:45 +03:00
1c1fc17120
synchronous feed update: catch PDO exceptions as to not break headlines output
2017-12-10 21:10:19 +03:00
8f92a67e6f
some (very minor) code cleanup in feeds class
2017-12-04 10:39:50 +03:00
003a7447c3
format_headlines_list: prevent warning on first_id changed check
2017-12-04 10:26:22 +03:00
7c6f7bb0aa
fix some minor issues found by code analyzer
2017-12-03 23:08:04 +03:00
fa3bcfa379
queryfeedheadlines: there's no need to quote order_by/override_order
...
else: feedicon cache busting etc
2017-12-03 22:49:57 +03:00
5f5b0de423
style feed icon and opml file upload controls
2017-12-03 22:35:12 +03:00
1f16f9b8ae
feed debugger: only allow debugging users own feeds
2017-12-03 13:35:18 +03:00
09bc54c690
further stylesheet simplification related fixes
2017-12-03 13:25:34 +03:00
64312bfd71
feeds: remove sql_bool_to_bool()
2017-12-03 09:44:08 +03:00
187abfe732
main classes: remove sql_bool_to_bool() kludge
2017-12-03 09:35:59 +03:00
aee3f0e6d9
fix typo
2017-12-01 22:07:39 +03:00
7fc303e6ab
query feed headlines: fix limit/offset
2017-12-01 21:07:55 +03:00
3623ebb1a1
feeds: handle escaping
2017-12-01 20:52:30 +03:00
c9b6ca8b70
feeds: remove escaping
2017-12-01 20:26:51 +03:00
b5791f11c5
queryfeedheadlines: PDOize (1)
2017-12-01 20:25:13 +03:00
29f1908e03
feeds: right before queryfeedheadlines()
2017-12-01 20:15:25 +03:00
cc9450c309
ccache, misc: fixes
...
feeds: start PDO transition
2017-12-01 19:42:02 +03:00
81d96c0dee
makes 'order by title' to sort by title and by ascending date
...
* this allows to chronologically browse all articles with the
same title.
2017-10-09 22:50:03 +02:00
51b521c326
fix batch feed editor using wrong SQL syntax when saving feed password
...
remove uses of auth_pass_encrypted in several other places
2017-10-06 09:22:04 +03:00
e50a647916
add HOOK_FORMAT_ARTICLE & HOOK_FORMAT_ARTICLE_CDM
...
Feeds::format_headlines_list: add some comments for cdm article closing tags
2017-05-26 23:22:00 +03:00
e6c886bf66
wrap rssfuncs into rssutils class
2017-05-05 18:10:07 +03:00
7c9b5a3fe4
move label stuff to Labels class
...
fix some unresolved functions
2017-05-04 15:57:40 +03:00
0086a89740
move some label stuff to labels.php
...
move getfeedcategory() to Feeds
2017-05-04 15:36:36 +03:00
4a0da0e5bf
move get_article_labels to Article
2017-05-04 15:26:21 +03:00
2ed0d6c433
move counter cache to a separate class
...
fix references to get_article_tags
2017-05-04 15:22:57 +03:00
aeb1abedb2
move a bunch of functions into Feeds/Article namespaces
...
+ static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
+ static function getLastArticleId() {
+ static function queryFeedHeadlines($params) {
+ static function getParentCategories($cat, $owner_uid) {
+ static function getChildCategories($cat, $owner_uid) {
move the rest of functions2.php back to functions.php as it is of more manageable size, remove the former
2017-05-04 15:13:02 +03:00
a230bf88a9
move to Article:
...
+ static function purge_orphans($do_output = false) {
move to Feeds
+ static function getGlobalUnread($user_id = false) {
+ static function getCategoryTitle($cat_id) {
+ static function getLabelUnread($label_id, $owner_uid = false) {
2017-05-04 15:00:21 +03:00
86a8351ca2
move the following to Feeds:
...
+ static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
+ static function getFeedArticles($feed, $is_cat = false, $unread_only = false,
+ static function subscribe_to_feed($url, $cat_id = 0,
+ static function getFeedIcon($id) {
+ static function getFeedTitle($id, $cat = false) {
+ static function getCategoryUnread($cat, $owner_uid = false) {
+ static function getCategoryChildrenUnread($cat, $owner_uid = false) {
2017-05-04 14:50:56 +03:00
7e5f8d9fb3
move the following to Article:
...
+ static function format_article_enclosures($id, $always_display_enclosures,
+ static function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
+ static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
+ static function format_tags_string($tags) {
+ static function format_article_labels($labels) {
+ static function format_article_note($id, $note, $allow_edit = true) {
+ static function get_article_enclosures($id) {
2017-05-04 14:38:45 +03:00
4122da0290
move getArticleFeed to Article
...
move print_label_select to controls
2017-05-04 14:26:44 +03:00
7b55001eee
fix various issues reported by static analysis
...
update gitlab-ci config
2017-04-26 15:29:22 +03:00
337535416f
filter by search results while marking feed as read
2017-03-31 11:21:35 +03:00
63f0ed3d9c
cdmClicked: do not use event.target.parents to figure out if clicked on a heading
2017-03-06 12:19:13 +03:00
b835a52814
rework the way headlines menus identify calling row
2017-02-17 09:01:45 +03:00
5161460048
bind headlines menu to a selector to avoid remaking it unnecessarily
2017-02-13 23:36:58 +03:00
ba2853caac
Prevent target='_blank' vulnerability on dynamic link
2017-02-12 11:01:36 +01:00
328118d12e
use print_hidden() for hidden dojo form fields
2017-02-10 14:36:21 +03:00
24c7e4132d
subscribe dialog: do not report errors via alert()
...
fetch_file_contents: reset all globals on start, return error message body when not using curl
subscribe_to_feed: report if cloudflare is in the error message
2017-01-28 12:45:49 +03:00
ad326dbf78
unpackVisibleHeadlines: do not iterate over all RROWs all the time
2017-01-22 20:57:16 +03:00
967f0619c7
force ngettext() count argument type to string
2017-01-22 10:18:43 +03:00
6b06a609af
headlines toolbar: move selection links into the dropdown
2017-01-07 17:03:58 +03:00
c9a5903bcc
disable autocomplete in subscription dialog
2016-05-18 14:48:51 +03:00
b6b5554db4
normalize some html5 custom attributes
2016-03-22 23:43:32 +03:00
2d052e42b5
getLoadedArticleIds: consider visible rows only
...
catchupFeedInGroup: hide articles when catching up, with caveats
2016-03-22 23:22:28 +03:00
d9de136c39
inline feed update: set feed as needing update if open_basedir is set + plugins need curl
2016-01-30 13:40:56 +03:00
71b75bb7fa
fix multiple issues with archived feeds
2016-01-26 19:03:05 +03:00
41245888f1
only stop inline feed updates with open_basedir enabled if there are any plugins that require CURL enabled
...
add plugin->flags() returning array with additional plugin information, currently only CURL requirement (optional)
2016-01-26 11:45:47 +03:00
29c92d7b08
prevent frontend updating of feeds on view if open_basedir is set to prevent plugins potentially not working correctly (i.e. if backend system has open_basedir disabled)
2016-01-23 12:13:03 +03:00
f61f2a2699
format_headlines_list: fix pg_num_rows() called incorrectly when firstid check failed
2015-12-05 04:04:44 +03:00
1bd552ee31
compat patches for php7
2015-12-04 09:29:58 +03:00
19e47ad60b
queryFeedHeadlines: don't check first_id when sorting by oldest first
2015-11-21 22:20:00 +03:00
dcbe36b2a2
fix some remaining old-style viewfeed() calls
2015-08-13 09:51:39 +03:00
90da4ada66
move attachments back to cdm content
2015-08-12 08:29:09 +03:00
6901ec6659
fix subtoolbar links lack of margin
2015-08-11 18:19:04 +03:00
bc20cb9fad
move attachment dropdown to cdmFooter, use table styles for cdmFooter
2015-08-11 15:30:17 +03:00
6810a1de42
use dijit form widget for attachments dropdown
2015-08-11 14:53:07 +03:00
60e680599d
allow selecting stemming language in search dialog
2015-08-04 13:53:48 +03:00
0d0cb8fe1e
fix missing cdmFeedTitle
2015-07-13 23:06:42 +03:00
33c4bd8968
fix error feed (i.e. when requested feed no longer exists) not display properly
2015-07-13 22:04:21 +03:00
f17069960c
roll back separate headline transport
2015-07-13 22:01:29 +03:00
6b954c0a83
fix dashboard feed
2015-07-13 18:43:54 +03:00
9f5eca992b
headlines: fix whitebox reply not returned in an updated format
2015-07-13 13:29:13 +03:00
ac4c1383ae
bring cdmFeedTitle style in line with the rest of the UI
...
send headline rows as separate JSON objects
2015-07-13 01:19:52 +03:00
48fefe2f6b
fixes for first_id stuff
2015-07-12 18:08:02 +03:00
ec57104d6e
apparently it's a bad idea to do is_resource() on a mysqli result
2015-07-12 14:23:32 +03:00
3444020100
report top id changed in headlines buffer
2015-07-12 12:01:34 +03:00
f5a0fb8b64
queryFeedHeadlines: move to array-based arguments, optionally check if first element changed when paginating
2015-07-12 01:29:36 +03:00
9090b874ab
simplify search, remove search_mode as useless
...
remove dialog to select by tags, simplify browsing by tag query
2015-07-07 15:59:32 +03:00
b6714c77d2
limit smart_date_time stuff to headlines only
2015-07-03 23:36:47 +03:00
5a45821ec9
prevent event propagation when clicking on CDM article footer
2015-06-18 16:00:03 +03:00
86b05f8661
better feed debugger ui for f D
2015-06-12 13:06:36 +03:00
415a3b50c9
fix some minor typos and stuff
2015-06-07 18:41:18 +03:00
469d9ad16a
Added a "title" attribute in the link to an article.
...
Added a "title" attribute in the link to an article.
Makes TTRSS more usable on a small windows, allowing to see the complete title of an article in the tooltip, without opening the article.
2015-03-21 14:49:38 +01:00
7eb87b80d5
add pluginhost HOOK_HEADLINES_BEFORE (refs #814 )
2014-08-19 14:24:34 +04:00
647a39ddf3
Copypaste error fix
2014-08-18 15:22:02 +04:00
baaf4c3043
Make search mechanism pluggable
...
Currently, TinyTinyRSS can use raw SQL or the Sphinx search engine
for searching. It would be nice if other search engines (such as
Xapian) could be used, or if features of the underlying SQL engine
(such as MySQL's FULLTEXT indexes) could be leveraged. This commit
makes searching into a plugin hook, falling back to the builtin behavior
if no search plugin is active. The Sphinx search behavior has been
broken out into a plugin.
2014-04-23 04:49:54 +00:00
8993937d13
fix alignment of a feed error icon in headlines subtoolbar
2014-03-26 14:30:54 +04:00
a0d9bc160f
Fix end tag for small feed icons when using combined display mode
2014-03-21 20:47:34 +10:30
ad593e4393
disable headlines grouping for recently read vfeed
2014-03-13 01:07:52 +04:00
4a80c57c50
remove some unused code reported by phpmd
2014-02-19 15:42:52 +04:00
878a0083ff
revert max ui feed title length, tweak truncate_string a bit
2014-02-02 23:17:13 +04:00
66684d8149
subtoolbar: layout fix, shorten max feed title length
2014-02-02 19:56:51 +04:00
029005c49b
minor style updates to make 3panel headlines mode look closer to cdm
2014-01-29 00:21:57 +04:00
4e2f219c16
fix selected prompt position
2014-01-27 22:27:31 +04:00
1bffd1068f
unify main and headlines toolbar
2014-01-27 22:03:42 +04:00
d44f3da4be
default theme updates
2014-01-27 19:03:35 +04:00
bf5bcb8e27
queryFeedHeadlines: remove obsolete content_preview
2013-11-29 13:54:30 +04:00
4ad04ee227
report all libxml errors in updater debug output
...
force utf8 encoding if devforceupdate is on
parser: try to convert non-unicode feeds with specified encoding to utf8
before trying to remove dangling utf8 characters in case of utf8-related
libxml errors because doing so produces garbage content
2013-10-29 12:15:26 +04:00
87065739cd
add context menu for cdmFeedTitle; change mark as read prompt for grouped headlines more clear
2013-10-17 13:38:48 +04:00
8f7a020e1b
add notification to subscribe dialog when multiple feeds are detected
2013-10-02 15:24:08 +04:00
19ab809633
add i18n to the search syntax link
2013-09-02 13:54:41 +04:00
ff04fe0625
use plurals for comment/comments link in article, properly translate comments string, add feed title to article in zoom mode
2013-09-02 12:58:14 +04:00
910592b49a
add plugin to cache images in starred articles; pass article_id to
...
sanitize
2013-08-02 14:04:14 +04:00
34dad84414
support term highlighting in cdm title
2013-07-31 16:41:06 +04:00
dd90eb2c7a
search keyword highlighting (combined mode only)
2013-07-31 14:53:34 +04:00
07eb36583c
lang: default to 'en'
2013-07-31 11:57:11 +04:00
6b4617970f
add text_languagedetect to guess article language for better hyphenation
...
(bump schema)
2013-07-31 10:30:17 +04:00
ac57b9dd19
add experimental css hyphens support for english language
2013-07-26 18:26:28 +04:00
12d17734f6
properly escape feed error message in headlines toolbar
2013-07-13 22:14:18 +04:00
7a7a0dc2dd
make cdmExcert respect SHOW_CONTENT_PREVIEW
2013-07-12 18:36:17 +04:00
1a545dcb44
mark feed with error in headlines toolbar, use error icon in feed editor
2013-07-12 12:38:50 +04:00
65f0eb01aa
support headlines context menu in floating title
2013-07-11 16:49:25 +04:00
6bd7913e20
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
2013-07-10 16:56:11 +04:00
4ab1eb9c94
move reassigning content_preview after hook to a more sensible place
2013-07-10 16:52:03 +04:00
f48d89fd58
Merge branch 'hookhead' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx-hookhead
2013-07-10 16:41:48 +04:00
6371963dbc
use error image for feed errors in headlines toolbar
2013-07-10 14:18:24 +04:00
2f20dd58d2
integrate silk icons by Mark James
2013-07-10 13:09:12 +04:00
425a6edc6b
forgot one file
2013-07-10 04:24:29 -04:00
3b96b0ed7c
Merge branch 'master' into hookhead
...
Conflicts:
include/functions.php
changes for conflicts with master
2013-07-07 13:57:06 -04:00
Andrew Dolgov
Michael Kuhn
wn_
MatthieuS
Andrew Dolgov
Gilles Grandou
Andrew Dolgov
Jérémy DECOOL
Matthieu Sarter
Pavel Voronin
Rob Hoelz
Grant Pannell
Andrew Dolgov
justauser