Jeremy Benoist
79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1
2016-08-22 23:03:16 +02:00
Alexandr Danilov
474b086656
Simplify the initialization of the plugin dotdotdot
2016-08-22 23:59:20 +03:00
Alexandr Danilov
e32aea53ab
Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows you to clip a text on the second line and fixed cut entries title in card view
2016-08-22 23:34:44 +03:00
Thomas Citharel
9c545fe028
Added name on client
...
- Fix typos in field name
- Added migration for name field in API client table
Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
2016-08-22 20:18:27 +02:00
Nicolas Lœuillet
c649d43381
Merge pull request #2222 from wallabag/add-date-on-article-view
...
Added creation date and reading time on article view
2016-08-22 09:40:21 +02:00
Jeremy Benoist
d35ba2c3d6
Display text on baggy
...
Instead of using icons (which aren't available) display real text for reading time & creation date
2016-08-21 22:22:34 +02:00
Nicolas Lœuillet
e7732deb1f
Changed code indentation
2016-08-18 15:37:44 +02:00
Nicolas Lœuillet
eecd7e406d
Fixed some translations
2016-08-18 15:30:28 +02:00
Nicolas Lœuillet
4e1be104ab
Added creation date and reading time on article view
...
Fix #2034
2016-08-18 15:23:19 +02:00
Nicolas Lœuillet
519ba0b5e7
Replaced favorite word/icon with star one
...
Fix #2041
2016-08-18 14:27:17 +02:00
Jeremy Benoist
0cecfa2536
CS
2016-08-17 14:36:20 +02:00
Nicolas Lœuillet
e49c62fac8
Fix form user display for baggy theme
2016-08-17 11:41:46 +02:00
Nicolas Lœuillet
8f5e220327
Fix form user display when 2FA is disabled
2016-08-17 11:41:46 +02:00
Thomas Citharel
8cb869ea95
add some missing phpdoc parameters
2016-07-24 11:47:03 +02:00
charno6
75ac3e6289
Fixed typo in entry:notice:entry_saved
...
"Eintag" to "Eintrag"
2016-07-23 22:40:23 +02:00
Jeremy Benoist
8c7d7c0300
Merge pull request #2199 from Simounet/facto/social-links
...
Handling socials links into a config file
2016-07-21 16:17:53 +02:00
Simounet
57c608fa94
php-cs-fixer pass
2016-07-20 23:08:04 +02:00
Simounet
40288b7166
Chrome extension URL updated
2016-07-20 22:55:43 +02:00
Simounet
0e1abf392c
FIX image inside a figure element max-width (baggy theme)
2016-07-20 20:23:55 +02:00
Simounet
f64472e9f8
FIX image inside a figure element max-width
2016-07-20 19:39:24 +02:00
Simounet
39f27d6370
Handling socials links into a config file
2016-07-20 19:36:01 +02:00
Jeremy Benoist
0faeabefa7
Merge remote-tracking branch 'origin/master' into 2.1
2016-07-20 12:02:02 +02:00
benages
57b62cbf79
Fixed spelling Artúclos --> Artículos
2016-07-18 21:53:53 +02:00
Thomas Citharel
8d4152f70d
Remove fr part
2016-07-02 11:56:14 +02:00
Thomas Citharel
baef8ea26c
Fix 3rd-Party Apps links (Chrome & Firefox)
2016-07-02 11:50:32 +02:00
Thomas Citharel
1d4d9aaf29
Bring tags on entries view to baggy
...
Also, a couple of UI improvement and CSS fixing
2016-07-01 13:59:30 +02:00
Thomas Citharel
4f0558a0d4
fix merge issue
2016-06-29 20:52:37 +02:00
Thomas Citharel
28803f106b
Add filter for tags on API
2016-06-29 09:55:57 +02:00
Thomas Citharel
e5fb89e5d3
Add since parameter
2016-06-25 21:05:50 +02:00
Thomas Citharel
e7aed21b33
add line to other languages
2016-06-24 11:45:42 +02:00
Thomas Citharel
a15022db96
minor ui fixes
2016-06-23 23:13:25 +02:00
Thomas Citharel
91826e3ca2
fix typo on icons
2016-06-23 22:51:09 +02:00
Thomas Citharel
25dc07d3c9
Add tags on entries view
...
Should be tested on old browsers
2016-06-23 22:50:39 +02:00
Jeremy Benoist
f49d9ca383
Merge branch 'master' into 2.1
2016-06-23 11:47:46 +02:00
Jeremy Benoist
fb5c17a9ab
Merge pull request #2157 from wallabag/lower-upper-readingtime
...
Handle only upper or only lower reading filter
2016-06-23 11:38:10 +02:00
Jeremy Benoist
2c00dddf01
fixup! Handle only upper or only lower reading filter
2016-06-23 09:41:30 +02:00
Jeremy Benoist
1bdbc39f02
Handle only upper or only lower reading filter
...
When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).
2016-06-23 09:41:30 +02:00
Thomas Citharel
b46124cb9b
Fix a few french translations typos
2016-06-23 09:38:49 +02:00
Nicolas Lœuillet
49e2854d5c
Merge pull request #2142 from wallabag/v2-use-npm
...
Manage assets through npm
2016-06-23 09:25:01 +02:00
Jeremy Benoist
4e411208cc
Try to find bad redirection after delete
...
Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
2016-06-23 09:15:50 +02:00
Jeremy Benoist
e42b13bcff
Change ManyToMany between entry & tag
...
Following https://gist.github.com/Ocramius/3121916
Be sure to remove the related entity when removing an entity.
Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:
- before that commit, the EntryTag will stay (at least using SQLite).
- with that commit, the related entity is removed
2016-06-23 09:15:50 +02:00
Jeremy Benoist
6334f2cac1
Display a message when saving an entry failed
...
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
2016-06-23 09:15:50 +02:00
Jeremy Benoist
f06f840c9d
Move fixtures to the right place
2016-06-23 09:15:50 +02:00
Nicolas Lœuillet
af95c09c80
Fix the deletion of Tags/Entries relation when delete an entry
...
Fix #2121
2016-06-23 09:15:50 +02:00
Daniel Bartram
26ed851f52
Add unread filter test to EntryControllerTest
...
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
2016-06-23 09:15:50 +02:00
Daniel Bartram
710f8e69d7
Add unread filter to entries pages
...
Add the ability to filter for unread pages in the filters menu.
2016-06-23 09:15:50 +02:00
Jeremy Benoist
23634d5d84
Jump to Symfony 3.1
2016-06-22 17:59:35 +02:00
Jeremy Benoist
ce0e9ec31b
Try to find bad redirection after delete
...
Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
2016-06-17 22:18:48 +02:00
Thomas Citharel
2e24d12027
remove block added twice
2016-06-09 19:07:41 +02:00
Thomas Citharel
5ecdfcd041
manage assets through npm
...
first draft
remote assetic totally
work
nearly there
use at least nodejs > 0.12
use proper version of grunt
bump nodejs version for travis
update npm
workaround for materialize
install node 5.0
add grunt-cli
baggy theme & cache node modules
cache bower & npm
make travis build assets on php7 only
exclude installing node & npm if not needed & use bash
clean & try to make icomoon work on baggy
ready
config for travis
rebase
make travis work
more travis work
impove travis & update deps
add missing pixrem deps
add module through oddly lost
ui updates
install latest nodejs
add install_dev.sh, link local binaries for npm/bower/grunt
ui improvements (mostly baggy)
fix travis build
no need to install on travis
Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
Add unread filter test to EntryControllerTest
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
Improve English translation
Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
Update installation instructions
-Fix grammar
-Add SELinux section
add screenshots of android docu in English
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
Move fixtures to the right place
Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
Change ManyToMany between entry & tag
Following https://gist.github.com/Ocramius/3121916
Be sure to remove the related entity when removing an entity.
Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:
- before that commit, the EntryTag will stay (at least using SQLite).
- with that commit, the related entity is removed
Prepare wallabag 2.0.5
enforce older materialize version
2016-06-09 17:12:51 +02:00
Nicolas Lœuillet
f329e769fd
Merge pull request #2122 from wallabag/fix-tags-deletion
...
Fix the deletion of Tags/Entries relation when delete an entry
2016-05-31 11:31:16 +02:00
Jeremy Benoist
3be047456d
Change ManyToMany between entry & tag
...
Following https://gist.github.com/Ocramius/3121916
Be sure to remove the related entity when removing an entity.
Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:
- before that commit, the EntryTag will stay (at least using SQLite).
- with that commit, the related entity is removed
2016-05-31 10:01:03 +02:00
Jeremy Benoist
39ba51ca1a
Display a message when saving an entry failed
...
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
2016-05-30 14:32:43 +02:00
Jeremy Benoist
2c045a210a
Move fixtures to the right place
2016-05-30 14:18:47 +02:00
Nicolas Lœuillet
f41c840b8c
Fix the deletion of Tags/Entries relation when delete an entry
...
Fix #2121
2016-05-28 13:38:59 +02:00
Jeremy Benoist
839475776b
Merge pull request #2052 from danbartram/feature-filter-unread
...
Add unread filter to entries pages
2016-05-27 09:57:51 +02:00
Poorchop
8fef96ee9f
Improve English translation
2016-05-23 01:04:17 -04:00
Baptiste Mille-Mathias
4b2774f8db
Don't cut entries title in card view
...
Stop cutting titles arbitrary at caracter 42.
2016-05-21 10:39:49 +02:00
Nicolas Lœuillet
9b40422594
Replace vertical dots in material theme with horizontal dots
2016-05-18 14:29:41 +02:00
Merouane Atig
5f2971e1d4
Do not specify language in Firefox addon link
2016-05-13 11:58:10 +02:00
Daniel Bartram
30334567a3
Add unread filter test to EntryControllerTest
...
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
2016-05-09 19:48:28 +01:00
Daniel Bartram
733b2cf19b
Add unread filter to entries pages
...
Add the ability to filter for unread pages in the filters menu.
2016-05-09 14:56:52 +01:00
Nicolas Lœuillet
1221f5315d
Fix translation for validators
...
Fix #2003
2016-05-07 13:24:14 +02:00
Jeremy Benoist
f54de6817e
Merge pull request #2020 from wallabag/fix-number-entries-per-tag
...
Fix number of entries in tag/list
2016-05-07 11:09:37 +02:00
Daniele Conca
a0640406b4
Update messages.it.yml
...
other translations added
2016-05-05 17:32:49 +02:00
Daniele Conca
bb7a39d1ed
Update messages.it.yml
2016-05-04 11:59:07 +02:00
Nicolas Lœuillet
d9926005b1
Rename getEntriesByUser method to getEntriesByUserId
2016-05-04 11:42:52 +02:00
Nicolas Lœuillet
09e5b9391e
Add pagination bar at the bottom of the page
...
Fix #2021
2016-05-03 21:44:57 +02:00
Nicolas Lœuillet
e7cd089fa6
Fix pagination bar on small devices
...
Fix #2008
2016-05-03 21:27:07 +02:00
Nicolas Lœuillet
12c697562e
Fix number of entries in tag/list
...
Fix #2006
2016-05-03 21:12:40 +02:00
Daniele Conca
439c7e41a3
Create messages.it.yml
...
baseline for italian translations (cloned from english)
2016-05-03 18:16:36 +02:00
Jeremy Benoist
97c8eb3c23
Merge pull request #2013 from wallabag/fix-display-all-tags
...
Fix tags listing
2016-05-03 10:07:34 +02:00
Nicolas Lœuillet
e9023a16eb
Remove useless method
2016-05-03 09:39:34 +02:00
Jeremy Benoist
2142c714ef
Merge pull request #1976 from wallabag/fix-filter-readingTime
...
Fix filter reading time
2016-05-03 09:05:31 +02:00
Nicolas Lœuillet
2a007fe43d
Fix tags listing
...
Fix #1994
* Remove unused method in tag repository
2016-05-02 21:32:47 +02:00
Nicolas Lœuillet
c4c062cce0
Add test to check reading time filter
2016-05-02 21:14:23 +02:00
Nicolas Lœuillet
8389074180
Add test for creation of new user in config page
2016-05-02 20:19:57 +02:00
Nicolas Lœuillet
823397f2d6
Fix reading speed not defined when user was created via config page
...
Fix #2004
2016-04-30 15:06:31 +02:00
Jeremy Benoist
10cc2785a0
Fix indentations in ES translation
2016-04-24 20:53:11 +02:00
jami7
acc371a129
Update messages.es.yml
2016-04-24 20:48:16 +02:00
jami7
ef37b9af71
Update messages.es.yml
2016-04-24 20:48:16 +02:00
Nicolas Lœuillet
d6a9e139dc
Fix tests
2016-04-24 20:46:25 +02:00
Nicolas Lœuillet
d8f8a59010
Fix wrong reading time when apply filters
2016-04-24 20:24:23 +02:00
Nicolas Lœuillet
4a25bef077
Update links in documentation
2016-04-19 20:03:34 +02:00
Thomas Citharel
0907a72c64
Merge pull request #1938 from wallabag/hide-pagination
...
Display pagination only if we have more than one page
2016-04-18 09:41:56 +02:00
Nicolas Lœuillet
188b74b6df
Display pagination only if we have more than one page
2016-04-18 09:03:21 +02:00
jami7
5c2c1a6434
Update messages.es.yml
2016-04-16 14:04:39 -10:00
Nicolas Lœuillet
1f034a3316
Hide pagination if we only have one entry to display
2016-04-16 07:19:30 +02:00
Nicolas Lœuillet
d1f4996b77
Merge pull request #1925 from wallabag/fix-redirect-without-referer
...
Redirect to homepage if referer is null
2016-04-15 17:52:33 +02:00
Nicolas Lœuillet
2d899e8d30
Change guid and link in RSS feeds to give original entry URL
...
Fix #1926
2016-04-15 16:07:34 +02:00
Nicolas Lœuillet
345d74268b
Fix redirect when delete entry
2016-04-15 15:39:00 +02:00
Nicolas Lœuillet
4086e0782e
Fix tests
2016-04-15 09:58:29 +02:00
Nicolas Lœuillet
af497a641c
Redirect to homepage if referer is null
...
Fix #1924
2016-04-15 07:58:01 +02:00
Nicolas Lœuillet
f2e5fdc366
Merge pull request #1916 from wallabag/cleanup
...
Convert array + phpDoc
2016-04-13 09:43:14 +02:00
Jeremy Benoist
a417b86923
Merge pull request #1918 from wallabag/improve-pagination
...
Improve pagination when user has lot of entries
2016-04-13 09:42:18 +02:00
Nicolas Lœuillet
18078ded12
Fix indentation
2016-04-13 09:20:01 +02:00
Nicolas Lœuillet
c31ea8a409
Remove useless dependancy
2016-04-12 21:47:16 +02:00
Nicolas Lœuillet
c95e39c51a
Lost in translation pager
2016-04-12 20:38:56 +02:00
Nicolas Lœuillet
63995be5ee
Fix display for Next/Previous link when they are disabled
2016-04-12 18:03:40 +02:00
Nicolas Lœuillet
1880da7420
Restore old behavior for OutOfRangeCurrentPageException
2016-04-12 16:40:18 +02:00
Nicolas Lœuillet
76cd8dbb05
Fix tests
2016-04-12 16:32:01 +02:00
Nicolas Lœuillet
624a7c6df1
Improve pagination when user has lot of entries
...
Fix #1905
* Usage of whiteoctober/WhiteOctoberPagerfantaBundle
2016-04-12 16:04:17 +02:00
Nicolas Lœuillet
80bd17f00d
Merge pull request #1911 from wallabag/title-on-title-entry
...
add title hover on entry titles
2016-04-12 14:54:59 +02:00
Thomas Citharel
1b8b3859c0
Add title hover on entry titles
2016-04-12 14:30:42 +02:00
Jeremy Benoist
443cff9840
Fix MySQL tests on HHVM
2016-04-12 12:37:10 +02:00
Jeremy Benoist
4094ea4771
Convert array + phpDoc
...
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
2016-04-12 12:25:29 +02:00
Jeremy Benoist
637dc4bb21
Move setup config outside setupAdmin
...
If user doesn't want to create a new admin (even if it's recommended) the internal config weren't created resulting in error when using the interface.
2016-04-11 19:37:29 +02:00
Nicolas Lœuillet
15e9483323
Merge pull request #1823 from wallabag/translation-fa
...
Translation fa
2016-04-10 20:00:03 +02:00
Nicolas Lœuillet
c5dede8445
Merge pull request #1903 from wallabag/force-server-version
...
Force server version to avoid connexion error
2016-04-10 19:57:45 +02:00
Nicolas Lœuillet
e9497f6fc0
Merge pull request #1901 from wallabag/spanish
...
Update Spanish translation
2016-04-10 15:43:40 +02:00
Jeremy Benoist
c71d83b60c
Merge pull request #1887 from wallabag/v2-duplicate-bookmarklet
...
Fix duplicate article when added via the bookmarklet
2016-04-10 15:37:33 +02:00
Jeremy Benoist
69c21157ba
Force server version to avoid connexion error
...
When installing a new project with MySQL, if the database doesn't exist before installation will fail because DBAL will try to get the server version by querying it.
And since this query is done using the default database connexion and since the database doesn't exist, DBAL can't connect to the server.
2016-04-10 15:34:32 +02:00
Jeremy Benoist
b351d0494b
Fix FA translations indentation
2016-04-10 14:33:11 +02:00
Masoud Abkenar
6d0db75328
Update messages.fa.yml
2016-04-10 14:33:11 +02:00
Jeremy Benoist
eaec84fcd3
Uncommented translated ES lines
...
Also, turn yaml lint into a more versbose check
2016-04-10 14:21:42 +02:00
Nicolas Lœuillet
834efe84ac
Change visibility of checkIfEntryAlreadyExists method to private
2016-04-10 14:20:39 +02:00
jami7
661d5ae0cf
Update messages.es.yml
...
On line 103, I'm not sure what symbol that is that looks like this (<<) but it looks smaller? Where is that? Should I just copy and paste it? And just to clarity, please look at line 101 too cause I'm not too sure if/how I change the stuff within <...> I stopped mid line in 103 just until I get clarification on this. Thanks.
2016-04-10 14:18:03 +02:00
jami7
dd4997d705
Update messages.es.yml
2016-04-10 14:17:35 +02:00
Jeremy Benoist
54ecbb41d6
Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material
...
Fix estimated reading time in material view
2016-04-10 14:12:13 +02:00
Jeremy Benoist
19a7ea2a44
Merge pull request #1896 from wallabag/v2-fix-internal-settings
...
Fix internal settings
2016-04-10 09:49:10 +02:00
Jeremy Benoist
2504fe46ed
Merge pull request #1894 from wallabag/v2-fix-doc-link
...
Fix documentation link in developer page
2016-04-10 09:44:48 +02:00
Nicolas Lœuillet
7ead8a0d9d
Fix estimated reading time in material view
...
Fix #1893
2016-04-10 08:48:53 +02:00
Nicolas Lœuillet
cb48a569e0
Fix internal settings
...
Fix #1867 : remove download_picture setting and manage show_printlink in material theme
2016-04-09 21:34:50 +02:00
Nicolas Lœuillet
808f541ea9
Fix documentation link in developer page
2016-04-09 20:43:22 +02:00
Nicolas Lœuillet
7a2157b8d7
Fix typo on configuration page
2016-04-09 14:04:43 +02:00
Nicolas Lœuillet
b00a89e08f
Refactor EntryController
2016-04-09 13:44:54 +02:00
Nicolas Lœuillet
f652f41dab
Fix duplicate article when added via the bookmarklet
2016-04-08 15:41:05 +02:00
Jeremy Benoist
e969c2a7ef
Merge pull request #1879 from wallabag/v2-tag-field-position
...
Move tag form in Material theme
2016-04-08 13:51:20 +02:00
Nicolas Lœuillet
77b9db87b8
Merge pull request #1804 from wallabag/j0k3r-patch-1
...
Force user-agent for iansommerville.com
2016-04-08 11:18:44 +02:00
Jeremy Benoist
6a986910b6
Merge pull request #1868 from wallabag/v2-tagrule-baggy
...
Remove keyboard shortcut and add tagging rule panel in baggy
2016-04-07 14:10:08 +02:00
Nicolas Lœuillet
c6cbe75b2e
Move tag form in Material theme
2016-04-07 13:47:35 +02:00
Nicolas Lœuillet
c802181126
Documentation about wallabag API
2016-04-06 11:30:41 +02:00
Nicolas Lœuillet
8687bcd0c9
Remove keybaord shortcut and add tagging rule panel in baggy
2016-04-05 22:29:47 +02:00
Nicolas Lœuillet
4a749cad8d
Round estimated time and add reading speed for Baggy
2016-04-05 15:35:01 +02:00
Nicolas Lœuillet
b5cf84bdf6
Fix Archive page title translation
2016-04-04 08:00:31 +02:00
Thomas Citharel
a119acd15d
Merge pull request #1835 from wallabag/v2-prepare-v2
...
🚀 Prepare v2.0.0 🎂
2016-04-03 22:11:17 +02:00
Nicolas Lœuillet
163517da79
Remove useless CSS
2016-04-03 20:35:53 +02:00
Nicolas Lœuillet
0795d04916
Hide search buttons
2016-04-03 20:25:43 +02:00
Nicolas Lœuillet
eff75729a1
🚀 Prepare v2.0.0 🎂
2016-04-03 18:56:53 +02:00
Jeremy Benoist
c61b68e8a6
Check selected PDO driver on install
...
Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists.
2016-04-01 16:44:51 +02:00
Jeremy Benoist
1695a6fecd
Fix quotes for OC
2016-04-01 10:34:51 +02:00
Jeremy Benoist
69726ec78e
Fix simple quote
2016-04-01 10:16:06 +02:00
Quent-in
dc89968c58
Update oc version
...
Complet
2016-04-01 08:51:29 +02:00
Quent-in
9191d8a640
Trad. Occitan
...
WIP
2016-03-30 13:17:40 +02:00
jami7
4063d821a3
Update messages.es.yml
2016-03-28 10:53:35 -10:00
Nicolas Lœuillet
e2dda63152
Merge pull request #1820 from wallabag/import-refacto
...
Refacto wallabag import
2016-03-28 18:52:22 +02:00
jami7
ff6b683bb3
Update messages.es.yml
2016-03-28 05:34:56 -10:00
Jeremy Benoist
0e49487bb0
Remove some complexicity in InstallCommand
2016-03-28 14:18:50 +02:00
Nicolas Lœuillet
ba2157b270
Merge pull request #1805 from wallabag/v2-assign-comma-tags
...
Fix #1768 Split tags with commas from UI
2016-03-28 09:42:13 +02:00
Jeremy Benoist
8f336fda64
Tags were not imported in wallabag v2 import
...
Also, simplify exportAs matching format
2016-03-27 23:58:37 +02:00