337 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	aa49b7312e	Aliasing master as 1.x-dev	2016-09-06 14:19:16 +01:00
Daniel Hensby	25aab70810	Merge pull request #88 from xini/fix-edit-after-upload ... fix edit after upload (from @benmanu), fixes #53	2016-09-06 12:08:16 +01:00
Florian Thoma	fb08e472c6	fix edit after upload (from @benmanu), fixes #53	2016-08-30 12:04:08 +10:00
Daniel Hensby	ae38ac2332	Merge pull request #87 from jaedb/master ... Re-instating hide/show of document field when inserting link	2016-08-01 00:44:32 +01:00
James Barnsley	284cdbac13	Re-instating hide/show of document field when inserting link	2016-08-01 10:58:13 +12:00
Daniel Hensby	f46089d158	Merge branch '1.1'	2016-07-15 16:28:22 +01:00
Daniel Hensby	d83d71b1ba	Merge branch '1.0' into 1.1	2016-07-15 16:28:02 +01:00
Daniel Hensby	8c4f40df1b	Merge pull request #84 from dhensby/pulls/1.0/travis-update ... Adding more travis tests	2016-07-15 16:23:33 +01:00
Daniel Hensby	f16612d0ca	Adding more travis tests	2016-07-15 16:11:47 +01:00
Daniel Hensby	2152199128	Merge pull request #83 from xini/fix-ss-34 ... SS 3.2 fixes	2016-07-15 15:56:27 +01:00
Florian Thoma	e508d05382	fix js and styles for SS 3.2+	2016-07-15 17:15:03 +10:00
Daniel Hensby	029d9a1622	Merge pull request #82 from dhensby/pulls/1.1/join-link-fix ... FIX Backlink computed correctly	2016-06-05 00:57:14 +01:00
Daniel Hensby	6e62d65ca3	FIX Backlink computed correctly	2016-05-05 16:18:02 +01:00
Daniel Hensby	04a2be00ea	Merge pull request #77 from helpfulrobot/add-standard-scrutinizer-config ... Added standard Scrutinizer config	2016-03-22 10:46:14 +00:00
Daniel Hensby	cbd48d46a1	Merge branch '1.0'	2016-03-18 12:01:09 +00:00
helpfulrobot	d72a2b249a	Added standard Scrutinizer config	2016-02-17 05:52:13 +13:00
Daniel Hensby	28e5f2140b	Merge pull request #76 from helpfulrobot/add-standard-code-of-conduct-file ... Added standard code of conduct file	2016-02-16 09:42:17 +00:00
helpfulrobot	3a622e5936	Added standard code of conduct file	2016-02-16 12:28:21 +13:00
Daniel Hensby	8a7d25c1af	Merge pull request #75 from jeffwhitfield/66-folder-value-string-casting ... Fixed issue with folder path not being stored with document.	2016-01-22 12:19:48 +00:00
Jeff Whitfield	961de53364	Fixed issue with folder path not being stored with document. Value must be set as a string before being saved to the database.	2016-01-21 18:39:50 -06:00
Damian Mooyman	b17fde4978	Merge pull request #74 from helpfulrobot/add-standard-gitattributes-file ... Added standard .gitattributes file	2016-01-18 17:32:44 +13:00
helpfulrobot	308ed0a752	Added standard .gitattributes file	2016-01-16 17:51:31 +13:00
Damian Mooyman	68e269900b	Merge pull request #72 from helpfulrobot/convert-to-psr-2 ... Converted to PSR-2	2015-12-18 10:15:59 +13:00
helpfulrobot	bd707c4ffc	Converted to PSR-2	2015-12-18 07:48:37 +13:00
Damian Mooyman	1aebe7e8d5	Merge pull request #71 from helpfulrobot/add-standard-editorconfig-file ... Added standard .editorconfig file	2015-12-17 14:05:39 +13:00
helpfulrobot	a55bb664e6	Added standard .editorconfig file	2015-12-17 10:21:22 +13:00
Damian Mooyman	957c00ff17	Merge pull request #67 from jakedaleweb/cwp1.1.1 ... version compatible with cwp 1.1.1	2015-10-08 09:54:35 +13:00
Jake Ovenden	b7258bbc66	suggested syntax fix	2015-10-07 16:34:01 +13:00
Jake Ovenden	f8ed92446a	include newer version of gridfield	2015-10-07 16:20:47 +13:00
Jake Ovenden	02c17fa2b9	removed gridfield from dependencies to stop clash in versions for cwp clients using cwp basic recipe > 1.1.1	2015-10-07 15:13:27 +13:00
Damian Mooyman	5a9f925be3	Merge pull request #65 from dhensby/patch-1 ... Move to new travis containerised infrastructure	2015-07-22 08:56:08 +12:00
Daniel Hensby	e8fd41059b	Move to new travis containerised infrastructure	2015-07-21 11:10:19 +01:00
Damian Mooyman	e6e8cc2422	Merge pull request #64 from kinglozzer/patch-1 ... Use tagged releases of gridfieldextensions as dependency	2015-07-02 12:29:08 +12:00
Loz Calver	bb0fd5413f	Use tagged releases of gridfieldextensions as dependency	2015-06-04 15:32:08 +01:00
Michael Strong	7ce81cf769	Merge pull request #63 from spekulatius/patch-1 ... Update DMSDocumentAddExistingField.php	2015-05-18 22:12:53 +12:00
Peter Thaleikis	08ea258e50	Update DMSDocumentAddExistingField.php ... removing closing php tag as it isnt required and is excluded in the code style	2015-05-12 20:51:07 +12:00
☃ Stephen Shkardoon ☃	8a6e580270	Merge pull request #59 from normann/master ... BUG fix composer dependencies due to one of the depending module has its...	2015-02-26 15:10:42 +13:00
Normann Lou	ac3b7d2b4a	BUG fix composer dependencies due to one of the depending module has its name-space and ownership changed.	2015-02-26 13:32:05 +13:00
☃ Stephen Shkardoon ☃	a3deafb669	Merge pull request #54 from ss23/sort_fix ... Sort documents on front-end - Fixes #44	2015-02-03 15:55:21 +13:00
Stephen Shkardoon	3453e51255	Sort documents on front-end - Fixes #44	2015-02-03 15:54:06 +13:00
☃ Stephen Shkardoon ☃	da642ddaf3	Merge pull request #51 from xini/1.0 ... Front end sorting of documents - Fixes #44	2015-02-03 15:48:36 +13:00
Florian Thoma	ec0ecdda6d	fix front end sorting of documents ... fixes #44 for 1.0 branch	2014-07-23 08:56:08 +10:00
Will Rossiter	8638440660	Merge pull request #50 from sheadawson/master ... Fix issues with document actions panel ui in cms	2014-07-10 18:49:51 +12:00
Shea Dawson	66bcf54b1d	Fix issues with document actions panel ui in cms	2014-07-10 09:44:13 +10:00
Julian Seidenberg	2f24a251a3	MINOR: adding reference to tags module for DMS	2014-05-19 12:54:16 +12:00
Ingo Schommer	fc1b7a4104	Added min stability for composer ... Required for scrutinizer runs	2014-03-13 10:28:01 +13:00
TeamCity	ea4baa6e73	Updated master strings	2014-02-10 23:06:48 +13:00
Ingo Schommer	e862e02cf1	Only test 5.4 on 3.0	2014-02-07 13:28:04 +13:00
Ingo Schommer	88896712ff	Only test against supported core releases	2014-02-07 13:20:14 +13:00
Will Rossiter	425e68b22d	Add default searchable_fields	2014-02-03 11:54:34 +13:00