Harry Bomrah
|
25e74620c9
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-20 20:49:50 +08:00 |
Harry Bomrah
|
1107005e53
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-20 19:52:35 +08:00 |
Harry Bomrah
|
a0ee8bc3b8
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-20 17:30:46 +08:00 |
Harry Bomrah
|
da44ffc501
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-17 14:55:02 +08:00 |
Harry Bomrah
|
ee4f7e06e8
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-16 19:43:23 +08:00 |
Harry Bomrah
|
d2f21f5221
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-15 14:04:00 +08:00 |
Harry Bomrah
|
cc303fb93d
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-09 14:22:12 +08:00 |
Harry Bomrah
|
53d5dd7d38
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-08 20:19:01 +08:00 |
Harry Bomrah
|
d938e6b88d
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-08 20:05:33 +08:00 |
Harry Bomrah
|
41a1f83b08
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-06 18:37:25 +08:00 |
Harry Bomrah
|
e0d55ba507
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-07-03 20:40:17 +08:00 |
Harry Bomrah
|
a4e7a396dc
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-25 17:41:22 +08:00 |
Harry Bomrah
|
804fdd044d
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-25 17:05:49 +08:00 |
Harry Bomrah
|
f181332d86
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-25 15:30:10 +08:00 |
Harry Bomrah
|
2f04300030
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-25 13:40:34 +08:00 |
Harry Bomrah
|
cb1a40d8b3
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-24 16:56:23 +08:00 |
Harry Bomrah
|
262ee137a7
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-24 01:40:07 +08:00 |
Harry Bomrah
|
a577307a5c
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-05 19:07:45 +08:00 |
Harry Bomrah
|
480bbeeda0
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-05 18:57:15 +08:00 |
Harry Bomrah
|
1ee6b4cc67
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-05 14:25:32 +08:00 |
Harry Bomrah
|
427cb03ecf
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-06-02 19:56:54 +08:00 |
Harry Bomrah
|
3d04118037
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-28 20:13:19 +08:00 |
Harry Bomrah
|
9ca761b952
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-28 20:10:57 +08:00 |
Harry Bomrah
|
7638a95385
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-26 16:03:33 +08:00 |
Harry Bomrah
|
6a49fb58e7
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-23 03:50:10 +08:00 |
Harry Bomrah
|
ee121fa0aa
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-20 21:18:46 +08:00 |
Harry Bomrah
|
2af2a208ab
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-15 21:34:33 +08:00 |
Harry Bomrah
|
95e7403aaa
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-13 15:41:17 +08:00 |
Harry Bomrah
|
c5b39c7e45
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-12 17:31:54 +08:00 |
Harry Bomrah
|
aed6f7f34a
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-12 15:52:45 +08:00 |
Harry Bomrah
|
ba44a224d3
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-12 14:10:48 +08:00 |
Harry Bomrah
|
9cf3fab749
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-11 19:33:11 +08:00 |
Harry Bomrah
|
dc9bebd479
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-05 20:05:31 +08:00 |
Harry Bomrah
|
602ef183c0
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-05-05 18:13:13 +08:00 |
Harry Bomrah
|
52037fba2c
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-30 21:10:08 +08:00 |
Harry Bomrah
|
a281c8c748
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-30 20:36:05 +08:00 |
Harry Bomrah
|
42e4e377c4
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-30 18:54:23 +08:00 |
Harry Bomrah
|
c7f6c97789
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-30 14:39:43 +08:00 |
Harry Bomrah
|
245f355b75
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-29 17:36:04 +08:00 |
Harry Bomrah
|
3f48b5886f
|
updated name
|
2015-04-28 22:49:15 +08:00 |
Harry Bomrah
|
1495466b68
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-28 22:35:52 +08:00 |
Harry Bomrah
|
d3f1808147
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-28 17:56:58 +08:00 |
Harry Bomrah
|
8c2f10e59c
|
authorization fix for create and update of plugins
|
2015-04-28 17:56:01 +08:00 |
Harry Bomrah
|
d517e3c639
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-28 16:08:04 +08:00 |
Harry Bomrah
|
2f58c02ee5
|
cant select empty value in page parts
|
2015-04-28 16:07:43 +08:00 |
Harry Bomrah
|
84fd35c17c
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-27 21:41:00 +08:00 |
Harry Bomrah
|
f9dcf7db3a
|
removed mobile settings and also removed bundle update from server
|
2015-04-27 21:40:38 +08:00 |
Harry Bomrah
|
a833bfd606
|
page id cannot be chinese and also some module update fixes
|
2015-04-27 20:46:01 +08:00 |
Harry Bomrah
|
89c59f9673
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-23 17:20:34 +08:00 |
Harry Bomrah
|
0122f5aa23
|
small fix for member fields display
|
2015-04-23 17:20:08 +08:00 |
Harry Bomrah
|
e5810c9aa0
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-22 23:06:52 +08:00 |
Harry Bomrah
|
b27467c65d
|
sorting for role status fixed
|
2015-04-22 23:06:05 +08:00 |
Harry Bomrah
|
2cc97bc407
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-22 22:59:09 +08:00 |
Harry Bomrah
|
16389cb942
|
adding routes file
|
2015-04-22 22:58:51 +08:00 |
Harry Bomrah
|
094f8d93f4
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-22 22:53:24 +08:00 |
Harry Bomrah
|
97912d2d3a
|
now can add or delete fields for the member
|
2015-04-22 22:53:04 +08:00 |
Harry Bomrah
|
345fd0ed37
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-22 18:30:57 +08:00 |
Harry Bomrah
|
1a19b97258
|
user friendly for editing members
Conflicts:
app/views/admin/members/edit.html.erb
|
2015-04-22 18:30:37 +08:00 |
Harry Bomrah
|
20180a1662
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-22 16:32:46 +08:00 |
Harry Bomrah
|
dd5f7ed234
|
fixed bug in members frontend and also roles and role statuses sorted on key ascending
|
2015-04-22 16:32:24 +08:00 |
Harry Bomrah
|
2ceb55201b
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-21 17:44:09 +08:00 |
Harry Bomrah
|
0746250c46
|
removed update all button
|
2015-04-21 17:43:44 +08:00 |
Harry Bomrah
|
07f6b6aab2
|
module update stuff added to kernel
|
2015-04-21 17:43:33 +08:00 |
Harry Bomrah
|
0239342f9c
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-04-17 15:56:44 +08:00 |
Harry Bomrah
|
ef8728c6fa
|
modified debugging for frontend
|
2015-04-17 15:56:06 +08:00 |
Harry Bomrah
|
449d809b35
|
debug added for modules and widgets frontend
|
2015-04-17 15:55:58 +08:00 |
Harry Bomrah
|
61f45b5497
|
rails menu cache removed
|
2015-04-14 16:59:52 +08:00 |
Harry Bomrah
|
72c120c0ae
|
rails menu cache removed
|
2015-04-14 16:58:45 +08:00 |
Harry Bomrah
|
d58b993cb5
|
fix error for page submit
|
2015-04-10 18:41:36 +08:00 |
Harry Bomrah
|
4ecfb9bf80
|
fix error for page submit
|
2015-04-10 18:41:22 +08:00 |
Harry Bomrah
|
6c16e2aac8
|
fix for cache clear on page part submit
|
2015-04-10 16:35:55 +08:00 |
Harry Bomrah
|
b2a5e361e8
|
fix for cache clear on page part submit
|
2015-04-10 16:35:18 +08:00 |
Harry Bomrah
|
95a3e61080
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-30 19:19:30 +08:00 |
Harry Bomrah
|
ffc2d23cb9
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-30 16:49:01 +08:00 |
Harry Bomrah
|
d45f4eaf36
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-30 15:37:16 +08:00 |
Harry Bomrah
|
aad4436344
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-30 15:19:51 +08:00 |
Harry Bomrah
|
084ce700ec
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-18 18:00:40 +08:00 |
Harry Bomrah
|
ab4eefce87
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-18 15:42:39 +08:00 |
Harry Bomrah
|
0d8d6b24c3
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-13 17:07:19 +08:00 |
Harry Bomrah
|
940ed459d7
|
Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-06 18:04:19 +08:00 |
rulingcom
|
e70aefcccf
|
precompile fixes for orbit mobile template
|
2015-03-06 17:58:29 +08:00 |
Harry Bomrah
|
3aa4922632
|
Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-06 17:48:09 +08:00 |
Harry Bomrah
|
5232367c0f
|
fix
|
2015-03-04 20:41:21 +08:00 |
Harry Bomrah
|
ba7c610e8b
|
again small fix for js
|
2015-03-04 20:36:03 +08:00 |
Harry Bomrah
|
a6c7652851
|
Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
Conflicts:
app/views/admin/members/show.html.erb
|
2015-03-04 20:33:22 +08:00 |
Harry Bomrah
|
19190646f3
|
small fix in js for google connect
|
2015-03-04 20:15:02 +08:00 |
Harry Bomrah
|
686b402915
|
Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-03-04 19:58:38 +08:00 |
Harry Bomrah
|
297ed49447
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-02-26 14:55:05 +05:30 |
Harry Bomrah
|
66d40566b7
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
Conflicts:
built_in_extensions.rb
|
2015-01-09 17:37:07 +08:00 |
Harry Bomrah
|
f8a0b6128d
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2015-01-08 23:05:48 +08:00 |
Harry Bomrah
|
78cb06e3c0
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-28 14:44:46 +08:00 |
Harry Bomrah
|
c7f535c2f8
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-27 15:02:55 +08:00 |
Harry Bomrah
|
99b94ec889
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-19 16:38:48 +08:00 |
Harry Bomrah
|
e34b3599a2
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-10 18:11:28 +08:00 |
Harry Bomrah
|
bbb6bad20b
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-08 19:02:34 +08:00 |
Harry Bomrah
|
bec81bb837
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-08 18:31:27 +08:00 |
Harry Bomrah
|
c620d8d695
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-08 18:13:17 +08:00 |
Harry Bomrah
|
b1451a0620
|
Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-08 15:56:03 +08:00 |
Harry Bomrah
|
117a288155
|
fix
|
2014-12-08 15:36:04 +08:00 |
Harry Bomrah
|
12d95d5f26
|
small fix
|
2014-12-08 15:34:30 +08:00 |
Harry Bomrah
|
5d6e71fa09
|
built in extension modified
|
2014-12-08 15:30:01 +08:00 |
Harry Bomrah
|
e3b09c47f9
|
site type added to gravity
|
2014-12-08 15:11:01 +08:00 |
Harry Bomrah
|
6a871e0e58
|
Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity
|
2014-12-08 15:10:30 +08:00 |
Harry Bomrah
|
e8a00a70f5
|
first commit to gravity
|
2014-12-08 15:03:18 +08:00 |