github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
951 Commits 13 Branches 7 Tags 15 MiB
5a4a9f5475
Commit Graph

951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Grove
5a4a9f5475 BUSHIDO_FIX: Adds bushido hooks user.added user.removed, and updates app.claimed to work with bushido_user_id as the permanent id 
Conflicts:

	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-16 11:37:30 -08:00
Sean Grove
b2bfec1bc4 BUSHIDO_FIX: Adds hooks for user.added and user.removed, updates app.claimed event, switches to using bushido_user_id as permanent unchanging user id 2011-11-16 11:32:00 -08:00
did
a3f66e19b5 fix issue #243 (Kaminari causing error on Bushido) 2011-11-05 15:18:15 +01:00
Mario Visic
e309b62386 Merge branch '236_paginate_has_many' 2011-11-05 19:19:18 +11:00
Mario Visic
4d9c77d41a Tidy up cucumbers a tad. 2011-11-05 19:17:30 +11:00
Mario Visic
ad0adc7153 Added a cucumber feature to paginate through models. 2011-11-05 19:10:26 +11:00
Mario Visic
c3c5d8e754 Tests are passing for has many pagination with Kaminari. 2011-11-05 18:42:04 +11:00
Mario Visic
45d4b7cb60 Merge branch 'master' into 236_paginate_has_many 2011-11-05 18:03:27 +11:00
Mario Visic
06ab49ecec Replaced will_paginate with kaminari 2011-11-05 16:45:43 +11:00
did
732f8f76f3 revert to bson_ext (1.3.1) because the last versions (1.4.x) have been yanked recently (temporary solution) 2011-10-30 14:58:13 +01:00
Mario Visic
fda3382300 No Site now renders a 404 error, this will prevent indexing of pages 
that do not exist. Fixes #237
 2011-10-29 23:44:28 +11:00
Mario Visic
9f8906d840 Merge branch 'master' into 236_paginate_has_many 2011-10-29 14:36:01 +08:00
Mario Visic
4939017f8d No Site now renders a 404 error, this will prevent indexing of pages that do not exist. 2011-10-29 14:35:23 +08:00
Mario Visic
786d2d9693 Added will paginate to liquid. 2011-10-24 23:44:35 +08:00
Mario Visic
e6abd6bbe0 Path fix for pagination. 2011-10-24 23:37:39 +08:00
Mario Visic
2bb9f5ed05 Revert "Arrays now paginate correctly." 
This reverts commit 25441ff60a.
 2011-10-24 23:34:43 +08:00
Mario Visic
25441ff60a Arrays now paginate correctly. 2011-10-24 22:35:21 +08:00
Mario Visic
2c5407d588 Merge branch 'master' into 236_paginate_has_many 2011-10-24 21:40:44 +08:00
Mario Visic
a2303f40f0 Only test the master branch on travis. 2011-10-24 21:24:27 +08:00
Mario Visic
d574939e2c Added a failing test for paginating has many associations. 2011-10-24 20:52:43 +08:00
did
99386f8866 new version of plupload (fixing bug #232) 2011-10-21 11:11:17 +02:00
did
ca44edd58f Merge branch 'master' of github.com:locomotivecms/engine 2011-10-18 18:46:03 +02:00
did
8298b2a4bf preventing recursive loop when used as engine in an app 2011-10-18 18:45:45 +02:00
Mario Visic
fcac15c6b1 Fixed a failing cucumber scenario, bumped cucumber-rails. 2011-10-18 23:55:21 +08:00
Mario Visic
dc7b83d6b7 Merge branch 'master' of https://github.com/locomotivecms/engine 2011-10-18 22:56:18 +08:00
Mario Visic
4088500795 Fixed syntax for a cucumber scenario. 2011-10-18 22:55:31 +08:00
did
32f7552a50 typo in the French translation for Norway + remove crack from Gemfile 2011-10-17 19:15:08 +02:00
Didier Lafforgue
05e3e73210 Merge pull request #230 from Sharagoz/master 
Norwegian translations
 2011-10-17 10:07:43 -07:00
Didier Lafforgue
b655431ea6 Merge pull request #228 from pacifists/master 
added published? and listed? methods for Page drop
 2011-10-17 10:03:35 -07:00
did
e0707a8f0a Merge branch 'master' of github.com:locomotivecms/engine 2011-10-17 19:00:31 +02:00
did
443606f0f3 fix issue #216 2011-10-17 19:00:10 +02:00
Mario Visic
4d19117351 Print cucumber backtraces for travis on failure. 2011-10-17 23:53:21 +08:00
Mario Visic
70dacfcef2 Set the hostname on travis. 2011-10-17 23:47:51 +08:00
Mario Visic
6b9ccf3854 Updated travis config. 2011-10-17 23:37:33 +08:00
Mario Visic
930a67429d Added a travis CI config. 2011-10-17 22:55:09 +08:00
Mario Visic
dd118a7147 Only use autotest with MRI (doesnt work on rbx). 2011-10-16 13:21:12 +08:00
Sharagoz
35e2fd2d57 Merge branch 'master' of git://github.com/locomotivecms/engine 2011-10-08 21:17:03 +02:00
Sharagoz
f864980685 norwegian JS translations 2011-10-08 21:09:08 +02:00
Rytis Lukoševičius
6b9d2317da adding .published? and .listed? methods for the liquid Page drop class 2011-10-04 04:35:40 +03:00
Mario Visic
85cabafe67 Merge pull request #218 from corgibytes/ensure_rails_3_0 
Rails 3.1 is getting used as a dependency when installing as a gem
 2011-10-01 08:52:01 -07:00
did
016d773b2d fix issue #217 (memberships not correctly removed) 2011-09-28 18:27:29 +02:00
did
544e9e5c3c fix issue #225 (bson_ext version) 2011-09-28 11:57:48 +02:00
did
718b3c67bb improve the with_scope tag based on the work on the editor 2011-09-27 00:25:47 +02:00
M. Scott Ford
c18dfa035e Prevent rails 3.1 from getting pulled in as a dependency. 2011-09-25 21:03:50 -04:00
did
ce24270948 fix issue #193 2011-09-22 01:38:23 +02:00
Sharagoz
a843f16be0 norwegian locale 2011-09-19 17:43:23 +02:00
Sharagoz
2b474626b6 add crack to gemspec 2011-09-19 16:28:21 +02:00
Sharagoz
ffc7057669 "no" locale added to config options 2011-09-19 16:15:25 +02:00
Sharagoz
cb43a878c8 add crack to gemfile 2011-09-19 16:10:29 +02:00
Sharagoz
c6ab499664 added norwegian locale 2011-09-19 15:48:43 +02:00