32
1
mirror of https://github.com/joomla-extensions/weblinks.git synced 2024-10-31 19:02:30 +00:00
Commit Graph

399 Commits

Author SHA1 Message Date
Yves Hoppe
e495804688 testing if vendor folder is mounted 2016-08-26 11:39:04 +02:00
Yves Hoppe
3322e761b5 Moved composer install to the top so caching can work 2016-08-26 10:53:53 +02:00
Yves Hoppe
9a754e4484 Merge remote-tracking branch 'upstream/master' into dronecache 2016-08-26 10:52:04 +02:00
javier gomez
e76489b19c Merge pull request #266 from yvesh/composerupdate20160824
Updated composer.json and composer.lock
2016-08-26 10:16:45 +02:00
Yves Hoppe
3042a7e918 Updated composer.json and composer.lock to latest versions 2016-08-24 20:05:07 +02:00
Yves Hoppe
d58e03e3d2 Merge remote-tracking branch 'upstream/master' into dronecache 2016-08-24 19:47:22 +02:00
javier gomez
41cebd1b24 Add sleep time to allow fluxbox and Xvfb launch on Drone.io (#263)
* pipe the output of fluxbox to /dev/null like we do with xvfb
2016-08-24 19:43:45 +02:00
Yves Hoppe
5241470c5e Enable cache for vendor folder 2016-08-24 19:37:44 +02:00
Yves Hoppe
3f6f2396cd Drone.io integration for Weblinks (#260)
* Started integration of drone.io scripts

* Started integration of drone.io scripts

* Started integration of drone.io scripts

* Removed curl testing

* Skipping frontend tests for drone

* Skipping frontend tests for drone

* Updated scenario skip comment and removed time from .drone.yml
2016-08-24 19:17:27 +02:00
Puneet Kala
f470766616 Merge pull request #258 from yvesh/travishosts
Forcing 127.0.0.1 for /etc/hosts in travis
2016-08-15 17:46:46 +05:30
Yves Hoppe
c15fd94d46 Forcing 127.0.0.1 for /etc/hosts in travis 2016-08-15 13:52:01 +02:00
Robert Deutz
97d3c26513 Merge pull request #228 from chrisdavenport/showon-groupby
Add showon behaviour to group by subcategory config fields.
2016-08-15 08:14:59 +02:00
Robert Deutz
64a377e570 Merge pull request #255 from andrepereiradasilva/acl-edit-own
[com_weblinks] Make ACL core.edit.own work (PR for 11466)
2016-08-15 08:14:36 +02:00
andrepereiradasilva
cfd842f5e4 missing comma 2016-08-07 09:22:04 +01:00
andrepereiradasilva
0af9354e1e correct variable 2016-08-07 08:24:33 +01:00
andrepereiradasilva
70012793dc fix conflicts final 2016-08-07 02:17:04 +01:00
andrepereiradasilva
ed336b0466 Merge remote-tracking branch 'refs/remotes/joomla-extensions/master' into acl-edit-own 2016-08-07 02:16:42 +01:00
andrepereiradasilva
50f6900439 fix conflicts 1 2016-08-07 02:16:40 +01:00
andrepereiradasilva
2b3ec8fdb3 correct core.edit.own 2016-08-07 02:08:21 +01:00
zero-24
8ef77771e7 Add patchtester description to README.md
* Update README.md
2016-08-05 13:17:35 +02:00
Puneet Kala
42fdd5b4cc Merge pull request #227 from yvesh/phpcs
Running phpcs check with travis on php 5.6
2016-08-02 21:51:00 +05:30
Yves Hoppe
c4a202ade1 Merge remote-tracking branch 'upstream/master' into phpcs 2016-08-02 16:28:14 +02:00
zero-24
8416e19d63 CodeStyle in doc comments
```
FILE: ...oomla-extensions/weblinks/src/components/com_weblinks/helpers/route.php
--------------------------------------------------------------------------------
FOUND 1 ERROR(S) AFFECTING 1 LINE(S)
--------------------------------------------------------------------------------
 183 | ERROR | Missing comment for param "$needles" at position 1
--------------------------------------------------------------------------------
UPGRADE TO PHP_CODESNIFFER 2.0 TO FIX ERRORS AUTOMATICALLY
--------------------------------------------------------------------------------
```

hopfully the last on to go with: https://github.com/joomla-extensions/weblinks/pull/227
2016-08-02 14:33:26 +02:00
Yves Hoppe
b97d472f8f Merge remote-tracking branch 'upstream/master' into phpcs 2016-08-01 19:50:42 +02:00
zero-24
4332a3d7b4 CodeStyle again 2016-08-01 19:47:09 +02:00
Yves Hoppe
0d11295440 Merge remote-tracking branch 'upstream/master' into phpcs 2016-08-01 19:26:17 +02:00
Jelle Kok
d09319ad78 Merge pull request #249 from joomla-extensions/php72
Add PHP7 Check Travis
2016-07-31 13:30:06 +02:00
Tito Alvarez
fc32eea69e Improved Travis system tests including multiple PHP versions and PHP 7 support
* Added PHP 7 support
* Improved test system including multiple PHP versions
* Removed unused php extensions
* Improved Travis script readability
2016-07-31 09:33:59 +02:00
Yves Hoppe
778a84e568 Merge remote-tracking branch 'upstream/master' into phpcs 2016-07-30 19:32:37 +02:00
andrepereiradasilva
afa26265d8 use JLoader (#247) 2016-07-28 21:17:26 +01:00
Jelle Kok
a258f6aa61 Update firefox and remove failure php 7 2016-07-27 23:22:42 +02:00
Jelle Kok
bbef568eb8 Add PHP7 Check Travis 2016-07-27 23:19:52 +02:00
Yves Hoppe
00ddf5b2e6 Changing collation to utf8mb4 (#226)
* Changing collation to utf8mb4

* Increased Joomla version requirement
2016-07-27 20:37:46 +01:00
RolandD
93f8892458 Merge pull request #242 from wderuijter/patch-1
Get the correct target param from the item
2016-07-26 07:46:11 +02:00
Puneet Kala
aa0a41abe7 Merge pull request #245 from yvesh/ordering
Fixed ordering of available tabs in acceptance tests for new staging
2016-07-19 22:04:20 +05:30
Yves Hoppe
4123437d72 Fixed ordering of available tabs in acceptance tests for new staging 2016-07-18 22:18:53 +02:00
Wim de Ruijter
5a8135fc3c Changed it at both locations 2016-07-18 21:30:17 +02:00
zero-24
353300bc2f Fix CS for com_weblinks frontend models (#229)
* Update category.php

* Update weblink.php

* Update form.php

* Update categories.php

* Update category.php

* Update categories.php
2016-07-08 19:55:07 +01:00
Wim de Ruijter
3fc4d984d1 Get the correct target param from the item
Get the correct target param from the item instead of the component target param
2016-07-08 08:08:25 +02:00
javier gomez
c2b4bd1dc7 Temporarilly skip smart search tests
Thank you @javigomez - Travis working again
2016-07-07 10:37:55 +02:00
javier gomez
e4a0b0fc41 Merge pull request #238 from yvesh/composer-selenium
Updated selenium-server-standalone to v2.53.1
2016-07-07 10:02:41 +02:00
Yves Hoppe
74b200a632 Updated the contribution / release guide from Phing to JoRobo (#224) 2016-07-04 22:56:22 +01:00
Nicola Galgano
1680ec7b49 Allow captcha when submit a webllink (#223)
* allow captcha  on submit web link

allow captcha  on submit web link (1/5)

* allow captcha  on submit web link

allow captcha  on submit web link (2/5)

* allow captcha  on submit web link

allow captcha  on submit web link (3/5)

* allow captcha  on submit web link

allow captcha  on submit web link (4/5)

* allow captcha  on submit web link

allow captcha  on submit web link (5/5)

* CS fix

CS fix

* XML CS for https://github.com/joomla-extensions/weblinks/pull/223

Simple XML CS https://github.com/joomla-extensions/weblinks/pull/223

* update captcha message

update captcha message like com_user, com_contatct #10931

* handle session data

handle session data 1(/2)

* handle session data

handle session data (2/2)

* move buttons down

move buttons down

* fix conflicts with #231

fix conflicts with #231

* fix conflicts with #231 

fix conflicts with #231
2016-07-04 22:32:27 +01:00
Yves Hoppe
ddfa026180 Updated selenium-server-standalone to v2.53.1 2016-07-04 20:17:33 +02:00
zero-24
77d2b1fbf9 View and router frontend CS (#231)
* Update view.html.php

* Update default_items.php

* Update default.php

* Update view.html.php

* Update edit.php

* Update router.php

* Update router.php

* Update default_items.php

* Update view.html.php

* Update view.html.php
2016-07-03 11:07:25 +01:00
zero-24
8688bfd9cc Update view.html.php (#234)
* Update view.html.php

* Update edit_params.php

* Update view.html.php

* Update default.php

* Update view.html.php

* Update view.html.php
2016-07-03 11:04:21 +01:00
zero-24
276c32922e Fix CS for com_weblinks frontend helpers and global controler file (#230)
* Update route.php

* Update icon.php

* Update controller.php

* Update route.php
2016-07-02 12:02:00 +01:00
zero-24
1fd0653eb6 Update script.php (#233) 2016-06-28 22:08:56 +01:00
zero-24
5270b206cc Fix Cs for weblinks backend (#232)
* Update weblinks.php

* Update weblink.php

* Update controller.php
2016-06-28 22:05:31 +01:00
andrepereiradasilva
258f337d59 Implements searchtools, filters, dropdown actions and counting (#208)
* implements searchtools, filters and merge the other two PR

* just to force travis to run

* revert

* filter is published

* filter is published 2

* modify filter test thanks to yvesh

* code style

* elseif , not else if
2016-06-28 10:45:18 +01:00