vozmob:vozmob.git
6 years agoMerge branch 'hotfix/i18n-disabled_languages'
kristin [Thu, 21 Jun 2012 05:37:38 +0000 (22:37 -0700)]
Merge branch 'hotfix/i18n-disabled_languages'

6 years agoapplied patch from https://drupal.org/node/842572
kristin [Thu, 21 Jun 2012 05:36:03 +0000 (22:36 -0700)]
applied patch from https://drupal.org/node/842572

6 years agomoving i18n to patch directory for patch
kristin [Thu, 21 Jun 2012 05:29:39 +0000 (22:29 -0700)]
moving i18n to patch directory for patch

6 years agoMerge branch 'hotfix/1218'
kristin [Thu, 21 Jun 2012 03:53:37 +0000 (20:53 -0700)]
Merge branch 'hotfix/1218'

Conflicts:
html/sites/all/libraries/jquery.ui/AUTHORS.txt
html/sites/all/libraries/jquery.ui/GPL-LICENSE.txt
html/sites/all/libraries/jquery.ui/MIT-LICENSE.txt
html/sites/all/libraries/jquery.ui/version.txt

6 years agoMerge branch 'hotfix/1218' into production
kristin [Thu, 21 Jun 2012 03:41:04 +0000 (20:41 -0700)]
Merge branch 'hotfix/1218' into production

6 years agofixes #1218 header image
kristin [Thu, 21 Jun 2012 03:39:50 +0000 (20:39 -0700)]
fixes #1218 header image

6 years agoadd jQuery UI 1.6
mark burdett [Mon, 21 May 2012 07:45:40 +0000 (00:45 -0700)]
add jQuery UI 1.6

6 years agoadd jwplayer module - #1120 html5 video and audio player
mark burdett [Mon, 21 May 2012 07:37:10 +0000 (00:37 -0700)]
add jwplayer module - #1120 html5 video and audio player

6 years agorestore Drupal 6 version of jQuery UI
mark burdett [Mon, 21 May 2012 07:36:02 +0000 (00:36 -0700)]
restore Drupal 6 version of jQuery UI

6 years agofixes #946 - registration name is "T-Mobile"
mark burdett [Mon, 21 May 2012 07:15:24 +0000 (00:15 -0700)]
fixes #946 - registration name is "T-Mobile"

6 years agoDrupal 6.26
mark burdett [Mon, 21 May 2012 06:00:00 +0000 (23:00 -0700)]
Drupal 6.26

6 years agorewrite title from new body - fixes #1069 (T-mobile)
mark burdett [Fri, 11 May 2012 06:41:16 +0000 (23:41 -0700)]
rewrite title from new body - fixes #1069 (T-mobile)

6 years agorewrite node title from json caption - fixes #1069 (Sprint)
mark burdett [Fri, 11 May 2012 06:21:16 +0000 (23:21 -0700)]
rewrite node title from json caption - fixes #1069 (Sprint)

6 years agofixes #946 - registration - username set to "T-Mobile" due to html markup.
mark burdett [Thu, 10 May 2012 06:46:33 +0000 (23:46 -0700)]
fixes #946 - registration - username set to "T-Mobile" due to html markup.

6 years agoAdd support for Credo
mark burdett [Fri, 27 Apr 2012 02:35:34 +0000 (19:35 -0700)]
Add support for Credo

6 years agorevert my accidental push of vojo-production to production
Rahul Bhargava [Thu, 26 Apr 2012 19:00:35 +0000 (15:00 -0400)]
revert my accidental push of vojo-production to production

6 years agoMerge branch 'production' of git://gitorious.org/vozmob/vozmob into vojo-production
Rahul Bhargava [Thu, 26 Apr 2012 18:21:41 +0000 (14:21 -0400)]
Merge branch 'production' of git://gitorious.org/vozmob/vozmob into vojo-production

6 years agoMerge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production
Rahul Bhargava [Thu, 26 Apr 2012 18:20:19 +0000 (14:20 -0400)]
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production

6 years agosubmodule update
Rahul Bhargava [Thu, 26 Apr 2012 17:38:15 +0000 (13:38 -0400)]
submodule update

6 years agosubmoduleupdates
Rahul Bhargava [Thu, 26 Apr 2012 17:12:33 +0000 (13:12 -0400)]
submoduleupdates

6 years agoaudio field work
Rahul Bhargava [Thu, 26 Apr 2012 16:14:19 +0000 (12:14 -0400)]
audio field work

6 years agoMerge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev
squiggy rubio [Thu, 26 Apr 2012 15:35:21 +0000 (08:35 -0700)]
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev

6 years agoremoving blog node edit tpl in vojo_generic
squiggy rubio [Thu, 26 Apr 2012 15:34:43 +0000 (08:34 -0700)]
removing blog node edit tpl in vojo_generic

6 years agosubmodule updates
Rahul Bhargava [Thu, 26 Apr 2012 14:57:38 +0000 (10:57 -0400)]
submodule updates

6 years agoupdate empty map css
squiggy rubio [Thu, 26 Apr 2012 06:14:19 +0000 (23:14 -0700)]
update empty map css

6 years agoupdate empty map text
squiggy rubio [Thu, 26 Apr 2012 06:12:41 +0000 (23:12 -0700)]
update empty map text

6 years agoadd zen back as base theme
squiggy rubio [Thu, 26 Apr 2012 05:14:23 +0000 (22:14 -0700)]
add zen back as base theme

6 years agopull vojo_generic change - set vozmob_white_label as base theme
squiggy rubio [Thu, 26 Apr 2012 03:37:04 +0000 (20:37 -0700)]
pull vojo_generic change - set vozmob_white_label as base theme

6 years agoMerge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev
squiggy rubio [Thu, 26 Apr 2012 02:19:27 +0000 (19:19 -0700)]
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev

6 years agoremove unset for attachements on blog entries
squiggy rubio [Thu, 26 Apr 2012 02:18:40 +0000 (19:18 -0700)]
remove unset for attachements on blog entries

6 years agoadding voipvoice to translate audio greetings (#1128)
Rahul Bhargava [Wed, 25 Apr 2012 18:47:00 +0000 (14:47 -0400)]
adding voipvoice to translate audio greetings (#1128)

6 years agoadding auto_nodetitle to name voice nodes (#1062)
Rahul Bhargava [Wed, 25 Apr 2012 18:46:37 +0000 (14:46 -0400)]
adding auto_nodetitle to name voice nodes (#1062)

6 years agosubmodule update
Rahul Bhargava [Wed, 25 Apr 2012 17:14:36 +0000 (13:14 -0400)]
submodule update

6 years agomore voip script fixes
Rahul Bhargava [Wed, 25 Apr 2012 16:53:50 +0000 (12:53 -0400)]
more voip script fixes

6 years agomore script updates
Rahul Bhargava [Wed, 25 Apr 2012 16:52:24 +0000 (12:52 -0400)]
more script updates

6 years agovoice script work
Rahul Bhargava [Wed, 25 Apr 2012 16:38:29 +0000 (12:38 -0400)]
voice script work

6 years agoadd browse stories back to group menu
squiggy rubio [Sat, 21 Apr 2012 04:28:23 +0000 (21:28 -0700)]
add browse stories back to group menu

6 years agopull feature changes to show empty message for map viewe. issue 1103
squiggy rubio [Sat, 21 Apr 2012 04:00:30 +0000 (21:00 -0700)]
pull feature changes to show empty message for map viewe. issue 1103

6 years agopull fixes for issue 1072, 1108 and 1103.
squiggy rubio [Sat, 21 Apr 2012 03:39:55 +0000 (20:39 -0700)]
pull fixes for issue 1072, 1108 and 1103.

6 years agoMerge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production vojo-0.5.3-b
Rahul Bhargava [Thu, 19 Apr 2012 18:11:37 +0000 (14:11 -0400)]
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production

6 years agoupdate vojo submodule
squiggy rubio [Thu, 19 Apr 2012 18:05:28 +0000 (11:05 -0700)]
update vojo submodule

6 years agoupdate vojo submodule - add imagecache presets
squiggy rubio [Thu, 19 Apr 2012 17:52:09 +0000 (10:52 -0700)]
update vojo submodule - add imagecache presets

6 years agoupdate vojo_generic
squiggy rubio [Thu, 19 Apr 2012 17:49:18 +0000 (10:49 -0700)]
update vojo_generic

6 years agoupdate vojo_generic submodule - adds new logo
squiggy rubio [Thu, 19 Apr 2012 17:11:41 +0000 (10:11 -0700)]
update vojo_generic submodule - adds new logo

6 years agoMerge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production
Rahul Bhargava [Thu, 19 Apr 2012 16:42:01 +0000 (12:42 -0400)]
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production

6 years agoMerge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production
Rahul Bhargava [Thu, 19 Apr 2012 16:21:18 +0000 (12:21 -0400)]
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production

6 years agoedit help text for logo upload field.
squiggy rubio [Thu, 19 Apr 2012 16:17:46 +0000 (09:17 -0700)]
edit help text for logo upload field.

6 years agoupdate vojo and vojo_generic submodules
squiggy rubio [Thu, 19 Apr 2012 04:17:41 +0000 (21:17 -0700)]
update vojo and vojo_generic submodules

6 years agowork on voice UX
Rahul Bhargava [Wed, 18 Apr 2012 19:52:41 +0000 (15:52 -0400)]
work on voice UX

6 years agoupgrading filefield module to work with voipnode/voipextension #1098 (moving into...
Rahul Bhargava [Wed, 18 Apr 2012 19:17:15 +0000 (15:17 -0400)]
upgrading filefield module to work with voipnode/voipextension #1098 (moving into contrib)

6 years agovojo submodule update
Rahul Bhargava [Wed, 18 Apr 2012 19:14:12 +0000 (15:14 -0400)]
vojo submodule update

6 years agoupdated vojo_generic submodule to fix #1073
Rahul Bhargava [Tue, 17 Apr 2012 20:45:56 +0000 (16:45 -0400)]
updated vojo_generic submodule to fix #1073

6 years agopull change in vojo submodule - display audio player on blog nodes
squiggy rubio [Fri, 13 Apr 2012 20:12:12 +0000 (13:12 -0700)]
pull change in vojo submodule - display audio player on blog nodes

6 years agoimproved map presets & styles, browse stories view and added icons from vojo and...
squiggy rubio [Fri, 13 Apr 2012 19:54:01 +0000 (12:54 -0700)]
improved map presets & styles, browse stories view and added icons from vojo and vojo_generic submodules

6 years agoMerge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production vojo-0.5.3-a
Rahul Bhargava [Thu, 12 Apr 2012 20:38:30 +0000 (16:38 -0400)]
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production

6 years agoadd browse stories changes in vojo and vojo_generic
squiggy rubio [Thu, 12 Apr 2012 20:16:46 +0000 (13:16 -0700)]
add browse stories changes in vojo and vojo_generic

6 years agoMerge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production
Rahul Bhargava [Thu, 12 Apr 2012 18:57:35 +0000 (14:57 -0400)]
Merge branch 'vojo-dev' of git://gitorious.org/vozmob/vozmob into vojo-production

6 years agoupdated vojo submodule for new voice script from ekes
Rahul Bhargava [Thu, 12 Apr 2012 17:04:33 +0000 (13:04 -0400)]
updated vojo submodule for new voice script from ekes

6 years agopulled in php tags fix
Rahul Bhargava [Thu, 12 Apr 2012 16:59:14 +0000 (12:59 -0400)]
pulled in php tags fix

6 years agoupdate vojo submodule
squiggy rubio [Thu, 12 Apr 2012 09:02:54 +0000 (02:02 -0700)]
update vojo submodule

6 years agoupdate vojo and vojo_generic submodules for updated group pages, per #895
squiggy rubio [Thu, 12 Apr 2012 08:37:45 +0000 (01:37 -0700)]
update vojo and vojo_generic submodules for updated group pages, per #895

6 years agoupdating vojo_feature in vojo submodule
squiggy rubio [Wed, 11 Apr 2012 20:24:10 +0000 (13:24 -0700)]
updating vojo_feature in vojo submodule

6 years agore-adding about panels node override to vojo_feature
squiggy rubio [Wed, 11 Apr 2012 19:25:11 +0000 (12:25 -0700)]
re-adding about panels node override to vojo_feature

6 years agoadd lastest changes in vojo
squiggy rubio [Wed, 11 Apr 2012 18:40:37 +0000 (11:40 -0700)]
add lastest changes in vojo

6 years agorecord submodule changes: typo vojo and theme edits for vojo_generic
squiggy rubio [Tue, 10 Apr 2012 23:54:24 +0000 (16:54 -0700)]
record submodule changes: typo vojo and theme edits for vojo_generic

6 years agorecord changes in vojo submodule
squiggy rubio [Tue, 10 Apr 2012 21:15:07 +0000 (14:15 -0700)]
record changes in vojo submodule

6 years agoupdate vojo submodule
squiggy rubio [Tue, 10 Apr 2012 08:07:01 +0000 (01:07 -0700)]
update vojo submodule

6 years agoupdates from vojo_generic theme
squiggy rubio [Tue, 10 Apr 2012 05:55:23 +0000 (22:55 -0700)]
updates from vojo_generic theme

6 years agoupdate vojo submodule to latest changes
squiggy rubio [Sat, 7 Apr 2012 00:10:39 +0000 (17:10 -0700)]
update vojo submodule to latest changes

6 years agoupdated vojo submodule
squiggy rubio [Fri, 6 Apr 2012 00:07:59 +0000 (17:07 -0700)]
updated vojo submodule

6 years agoRevert "work on 0.5.3 release: submodule updates" vojo-0.5.3
Rahul Bhargava [Wed, 4 Apr 2012 18:05:01 +0000 (14:05 -0400)]
Revert "work on 0.5.3 release: submodule updates"

This reverts commit fe5e61786870c65df2ac664edbab15207c2f7f3c.

6 years agoMerge branch 'vojo-dev' into vojo-production
Rahul Bhargava [Wed, 4 Apr 2012 15:55:27 +0000 (11:55 -0400)]
Merge branch 'vojo-dev' into vojo-production

6 years agobackup_migrate module update
Rahul Bhargava [Wed, 4 Apr 2012 15:53:37 +0000 (11:53 -0400)]
backup_migrate module update

6 years agowork on 0.5.3 release: submodule updates
Rahul Bhargava [Wed, 4 Apr 2012 15:26:36 +0000 (11:26 -0400)]
work on 0.5.3 release: submodule updates

6 years agoMerge branch 'release/0.5.4' into production 0.5.4
mark burdett [Tue, 3 Apr 2012 23:23:15 +0000 (16:23 -0700)]
Merge branch 'release/0.5.4' into production

6 years agofixed type in submodule file - probably a bad merge
Rahul Bhargava [Tue, 3 Apr 2012 21:58:53 +0000 (17:58 -0400)]
fixed type in submodule file - probably a bad merge

6 years agomoved vojo-specific modules to their own repository, for easier merging with master...
Rahul Bhargava [Tue, 3 Apr 2012 21:52:13 +0000 (17:52 -0400)]
moved vojo-specific modules to their own repository, for easier merging with master vozmob codebase

6 years agoMerge branch 'master' into vojo-dev
Rahul Bhargava [Tue, 3 Apr 2012 20:38:00 +0000 (16:38 -0400)]
Merge branch 'master' into vojo-dev

6 years agoMerge branch 'master' of gitorious.org:vozmob/vozmob
squiggy rubio [Tue, 3 Apr 2012 19:23:41 +0000 (12:23 -0700)]
Merge branch 'master' of gitorious.org:vozmob/vozmob

6 years agomisc theme fixes. removed idepsca logo from header
squiggy rubio [Tue, 3 Apr 2012 19:22:53 +0000 (12:22 -0700)]
misc theme fixes. removed idepsca logo from header

6 years agoadd group_logo_med imagecache preset, to match theme screenshot thumbnails
squiggy rubio [Tue, 3 Apr 2012 17:38:29 +0000 (10:38 -0700)]
add group_logo_med imagecache preset, to match theme screenshot thumbnails

6 years agoMerge branch 'release/0.5.3' into production 0.5.3
mark burdett [Tue, 3 Apr 2012 17:38:16 +0000 (10:38 -0700)]
Merge branch 'release/0.5.3' into production

6 years agoMerge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev
squiggy rubio [Thu, 29 Mar 2012 18:53:16 +0000 (11:53 -0700)]
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev

6 years agoupdating vojo_generic submodule
squiggy rubio [Thu, 29 Mar 2012 18:52:21 +0000 (11:52 -0700)]
updating vojo_generic submodule

6 years agoupdating vojo submodule to include header logo changes
squiggy rubio [Thu, 29 Mar 2012 18:49:52 +0000 (11:49 -0700)]
updating vojo submodule to include header logo changes

6 years agoupdated voipdrupal to fix a small bug
Rahul Bhargava [Thu, 29 Mar 2012 17:02:00 +0000 (13:02 -0400)]
updated voipdrupal to fix a small bug

6 years agosubmodule update
Rahul Bhargava [Thu, 29 Mar 2012 16:59:07 +0000 (12:59 -0400)]
submodule update

6 years agoadding different footer for vozmob.net vs vozmob_white_label theme
squiggy rubio [Thu, 29 Mar 2012 01:30:02 +0000 (18:30 -0700)]
adding different footer for vozmob.net vs vozmob_white_label theme

6 years agomake media type icons inline
squiggy rubio [Thu, 29 Mar 2012 01:25:11 +0000 (18:25 -0700)]
make media type icons inline

6 years agomake media type icons inline
squiggy rubio [Thu, 29 Mar 2012 01:22:36 +0000 (18:22 -0700)]
make media type icons inline

6 years agoedits to vozmob themes
squiggy rubio [Thu, 29 Mar 2012 01:14:33 +0000 (18:14 -0700)]
edits to vozmob themes

6 years agoMerge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev
squiggy rubio [Tue, 27 Mar 2012 21:17:51 +0000 (14:17 -0700)]
Merge branch 'vojo-dev' of gitorious.org:vozmob/vozmob into vojo-dev

6 years agoadd color picker module
squiggy rubio [Tue, 27 Mar 2012 21:17:03 +0000 (14:17 -0700)]
add color picker module

6 years agoupgrade vbo.
mark burdett [Sat, 24 Mar 2012 07:59:55 +0000 (00:59 -0700)]
upgrade vbo.

6 years agoupgrade views and move into contrib directory.
mark burdett [Sat, 24 Mar 2012 07:34:42 +0000 (00:34 -0700)]
upgrade views and move into contrib directory.

6 years agoupgrade to drupal 6.25
mark burdett [Sat, 24 Mar 2012 04:49:55 +0000 (21:49 -0700)]
upgrade to drupal 6.25

6 years agoinclude test voice scripts
Rahul Bhargava [Fri, 23 Mar 2012 18:59:42 +0000 (14:59 -0400)]
include test voice scripts

6 years agofixed cache bug vojo-0.5.2
Rahul Bhargava [Fri, 23 Mar 2012 18:40:09 +0000 (14:40 -0400)]
fixed cache bug

6 years agowork on localization (issue 897)
Rahul Bhargava [Fri, 23 Mar 2012 16:23:54 +0000 (12:23 -0400)]
work on localization (issue 897)

6 years agoadded big submit button to homepage (issue #922)
Rahul Bhargava [Fri, 23 Mar 2012 14:18:33 +0000 (10:18 -0400)]
added big submit button to homepage (issue #922)